commit 5f83b5d19967dbe960e6865b0b8ef09a47e5badf · pyrox.dev/nixpkgs

-1

nixos/modules/services/networking/multipath.nix

···

       516
       516
        
               ${optionalString (!isNull defaults) ''

     

       517
       517
        
                 defaults {

     

       518
       518
        
                 ${indentLines 2 defaults}

     

       519
       519
       -
                   multipath_dir ${cfg.package}/lib/multipath

     

       520
       519
        
                 }

     

       521
       520
        
               ''}

     

       522
       521
        
               ${optionalString (!isNull blacklist) ''

+10 -11

pkgs/os-specific/linux/multipath-tools/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , coreutils

     

       4
       5
        
       , pkg-config

     

       5
       6
        
       , perl

     

       6
       7
        
       , lvm2

     
···

       9
       10
        
       , systemd

     

       10
       11
        
       , liburcu

     

       11
       12
        
       , json_c

     

       12
       12
       -
       , kmod

     

       13
       13
       +
       , linuxHeaders

     

       13
       14
        
       , cmocka

     

       14
       15
        
       , nixosTests

     

       15
       16
        
       }:

     

       16
       17
        
       

     

       17
       18
        
       stdenv.mkDerivation rec {

     

       18
       19
        
         pname = "multipath-tools";

     

       19
       19
       -
         version = "0.9.3";

     

       20
       20
       +
         version = "0.9.4";

     

       20
       21
        
       

     

       21
       22
        
         src = fetchFromGitHub {

     

       22
       23
        
           owner = "opensvc";

     

       23
       24
        
           repo = "multipath-tools";

     

       24
       25
        
           rev = "refs/tags/${version}";

     

       25
       25
       -
           sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0=";

     

       26
       26
       +
           sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg=";

     

       26
       27
        
         };

     

       27
       28
        
       

     

       28
       29
        
         postPatch = ''

     

       29
       29
       -
           substituteInPlace libmultipath/Makefile \

     

       30
       30
       -
             --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h

     

       30
       30
       +
           substituteInPlace create-config.mk \

     

       31
       31
       +
             --replace /bin/echo ${coreutils}/bin/echo

     

       31
       32
        
       

     

       32
       32
       -
           # systemd-udev-settle.service is deprecated.

     

       33
       33
        
           substituteInPlace multipathd/multipathd.service \

     

       34
       34
       -
             --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \

     

       35
       35
       -
             --replace /sbin/multipathd "$out/bin/multipathd" \

     

       36
       36
       -
             --replace " systemd-udev-settle.service" ""

     

       34
       34
       +
             --replace /sbin/multipathd "$out/bin/multipathd"

     

       37
       35
        
       

     

       38
       36
        
           sed -i -re '

     

       39
       37
        
             s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",

     
···

       45
       43
        
         '';

     

       46
       44
        
       

     

       47
       45
        
         nativeBuildInputs = [ pkg-config perl ];

     

       48
       48
       -
         buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];

     

       46
       46
       +
         buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ];

     

       49
       47
        
       

     

       50
       48
        
         makeFlags = [

     

       51
       49
        
           "LIB=lib"

     

       52
       50
        
           "prefix=$(out)"

     

       51
       51
       +
           "systemd_prefix=$(out)"

     

       52
       52
       +
           "kernel_incdir=${linuxHeaders}/include/"

     

       53
       53
        
           "man8dir=$(out)/share/man/man8"

     

       54
       54
        
           "man5dir=$(out)/share/man/man5"

     

       55
       55
        
           "man3dir=$(out)/share/man/man3"

     

       56
       56
       -
           "SYSTEMDPATH=lib"

     

       57
       56
        
         ];

     

       58
       57
        
       

     

       59
       58
        
         doCheck = true;