commit 7175b2d9bf3e15d9f845fe48120a7290fa1dcd31 · pyrox.dev/nixpkgs

+26 -12
pkgs/tools/filesystems/ceph/default.nix
···

       27
       27
        
         # Runtime dependencies

     

       28
       28
        
         arrow-cpp,

     

       29
       29
        
         babeltrace,

     

       30
       30
       -
         boost186,

     

       30
       30
       +
         # Note when trying to upgrade boost:

     

       31
       31
       +
         # * When upgrading Ceph, it's recommended to check which boost version Ceph uses on Fedora,

     

       32
       32
       +
         #   and default to that.

     

       33
       33
       +
         # * The version that Ceph downloads if `-DWITH_SYSTEM_BOOST:BOOL=ON` is not given

     

       34
       34
       +
         #   is declared in `cmake/modules/BuildBoost.cmake` line `set(boost_version ...)`.

     

       35
       35
       +
         #

     

       36
       36
       +
         # If you want to upgrade to boost >= 1.86, you need a Ceph version that

     

       37
       37
       +
         # has this PR in:

     

       38
       38
       +
         #     https://github.com/ceph/ceph/pull/61312

     

       39
       39
       +
         boost183,

     

       31
       40
        
         bzip2,

     

       32
       41
        
         cryptsetup,

     

       33
       42
        
         cunit,

     
···

       297
       306
        
             };

     

       298
       307
        
         };

     

       299
       308
        
       

     

       300
       300
       -
         boost' = boost186.override {

     

       309
       309
       +
         boost' = boost183.override {

     

       301
       310
        
           enablePython = true;

     

       302
       311
        
           inherit python;

     

       303
       312
        
         };

     
···

       347
       356
        
         );

     

       348
       357
        
         inherit (ceph-python-env.python) sitePackages;

     

       349
       358
        
       

     

       350
       350
       -
         version = "19.2.0";

     

       359
       359
       +
         version = "19.2.1";

     

       351
       360
        
         src = fetchurl {

     

       352
       361
        
           url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";

     

       353
       353
       -
           hash = "sha256-30vkW1j49hFIxyxzkssSKVSq0VqiwLfDtOb62xfxadM=";

     

       362
       362
       +
           hash = "sha256-QEX3LHxySVgLBg21iQga1DnyQsXFi6593e+WSjgT/h8=";

     

       354
       363
        
         };

     

       355
       364
        
       in

     

       356
       365
        
       rec {

     
···

       365
       374
        
               hash = "sha256-21fi5tMIs/JmuhwPYMWtampv/aqAe+EoPAXZLJlOvgo=";

     

       366
       375
        
               stripLen = 1;

     

       367
       376
        
               extraPrefix = "src/s3select/";

     

       368
       368
       -
             })

     

       369
       369
       -
       

     

       370
       370
       -
             (fetchpatch2 {

     

       371
       371
       -
               name = "ceph-gcc-14.patch";

     

       372
       372
       -
               url = "https://github.com/ceph/ceph/commit/0eace4ea9ea42412d4d6a16d24a8660642e41173.patch?full_index=1";

     

       373
       373
       -
               hash = "sha256-v+AExf/npe4NgmVl2j6o8860nwF9YuzC/vR0TWxTrIE=";

     

       374
       377
        
             })

     

       375
       378
        
       

     

       376
       379
        
             ./boost-1.85.patch

     
···

       477
       480
        
             "${placeholder "out"}/${ceph-python-env.sitePackages}"

     

       478
       481
        
           ];

     

       479
       482
        
       

     

       480
       480
       -
           # replace /sbin and /bin based paths with direct nix store paths

     

       481
       481
       -
           # increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters

     

       483
       483
       +
           # * `unset AS` because otherwise the Ceph CMake build errors with

     

       484
       484
       +
           #       configure: error: No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.

     

       485
       485
       +
           #   because the code at

     

       486
       486
       +
           #       https://github.com/intel/isa-l/blob/633add1b569fe927bace3960d7c84ed9c1b38bb9/configure.ac#L99-L191

     

       487
       487
       +
           #   doesn't even consider using `nasm` or `yasm` but instead uses `$AS`

     

       488
       488
       +
           #   from `gcc-wrapper`.

     

       489
       489
       +
           #   (Ceph's error message is extra confusing, because it says

     

       490
       490
       +
           #   `No modern nasm or yasm found` when in fact it found e.g. `nasm`

     

       491
       491
       +
           #   but then uses `$AS` instead.

     

       492
       492
       +
           # * replace /sbin and /bin based paths with direct nix store paths

     

       493
       493
       +
           # * increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters

     

       482
       494
        
           preConfigure = ''

     

       495
       495
       +
             unset AS

     

       496
       496
       +
       

     

       483
       497
        
             substituteInPlace src/common/module.c \

     

       484
       498
        
               --replace "char command[128];" "char command[256];" \

     

       485
       499
        
               --replace "/sbin/modinfo"  "${kmod}/bin/modinfo" \