BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #208801 from LeSuisse/multipath-tools-0.9.4

Browse source 
multipath-tools: 0.9.3 -> 0.9.4
This commit is contained in:
Weijia Wang 2023-01-31 14:57:49 +01:00 committed by GitHub
commit 5f83b5d199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/networking/multipath.nix
View file

@ -516,7 +516,6 @@ in {
${optionalString (!isNull defaults) '' ${optionalString (!isNull defaults) ''
defaults { defaults {
${indentLines 2 defaults} ${indentLines 2 defaults}
multipath_dir ${cfg.package}/lib/multipath
} }
''} ''}
${optionalString (!isNull blacklist) '' ${optionalString (!isNull blacklist) ''

21
pkgs/os-specific/linux/multipath-tools/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, coreutils
, pkg-config , pkg-config
, perl , perl
, lvm2 , lvm2
@ -9,31 +10,28 @@
, systemd , systemd
, liburcu , liburcu
, json_c , json_c
, kmod , linuxHeaders
, cmocka , cmocka
, nixosTests , nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "multipath-tools"; pname = "multipath-tools";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opensvc"; owner = "opensvc";
repo = "multipath-tools"; repo = "multipath-tools";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg=";
}; };
postPatch = '' postPatch = ''
substituteInPlace libmultipath/Makefile \ substituteInPlace create-config.mk \
--replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h --replace /bin/echo ${coreutils}/bin/echo
# systemd-udev-settle.service is deprecated.
substituteInPlace multipathd/multipathd.service \ substituteInPlace multipathd/multipathd.service \
--replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ --replace /sbin/multipathd "$out/bin/multipathd"
--replace /sbin/multipathd "$out/bin/multipathd" \
--replace " systemd-udev-settle.service" ""
sed -i -re ' sed -i -re '
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
@ -45,15 +43,16 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config perl ]; nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ];
makeFlags = [ makeFlags = [
"LIB=lib" "LIB=lib"
"prefix=$(out)" "prefix=$(out)"
"systemd_prefix=$(out)"
"kernel_incdir=${linuxHeaders}/include/"
"man8dir=$(out)/share/man/man8" "man8dir=$(out)/share/man/man8"
"man5dir=$(out)/share/man/man5" "man5dir=$(out)/share/man/man5"
"man3dir=$(out)/share/man/man3" "man3dir=$(out)/share/man/man3"
"SYSTEMDPATH=lib"
]; ];
doCheck = true; doCheck = true;