mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
multipath-tools: 0.9.8 -> 0.11.1
Diff: https://github.com/opensvc/multipath-tools/compare/refs/tags/0.9.8...refs/tags/0.11.1
This commit is contained in:
parent
50dd5a5327
commit
be16ca643f
1 changed files with 10 additions and 26 deletions
|
@ -2,8 +2,6 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
coreutils,
|
|
||||||
|
|
||||||
perl,
|
perl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
|
@ -21,37 +19,22 @@
|
||||||
nixosTests,
|
nixosTests,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "multipath-tools";
|
pname = "multipath-tools";
|
||||||
version = "0.9.8";
|
version = "0.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opensvc";
|
owner = "opensvc";
|
||||||
repo = "multipath-tools";
|
repo = "multipath-tools";
|
||||||
tag = version;
|
tag = finalAttrs.version;
|
||||||
sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk=";
|
hash = "sha256-H5DY15On3mFwUHQhmC9s2thm0TUUIZbXM/Ot2FPL41Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Backport build fix for musl libc 1.2.5
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch";
|
|
||||||
hash = "sha256-3Qt8zfrWi9aOdqMObZQaNAaXDmjhvSYrXK7qycC9L1Q=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace create-config.mk \
|
|
||||||
--replace-fail /bin/echo ${coreutils}/bin/echo
|
|
||||||
|
|
||||||
substituteInPlace multipathd/multipathd.service.in \
|
|
||||||
--replace-fail /sbin/multipathd "$out/bin/multipathd"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
perl
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
json_c
|
json_c
|
||||||
libaio
|
libaio
|
||||||
|
@ -62,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
systemd
|
systemd
|
||||||
util-linuxMinimal # for libmount
|
util-linuxMinimal # for libmount
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
|
@ -83,10 +67,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Tools for the Linux multipathing storage driver";
|
description = "Tools for the Linux multipathing storage driver";
|
||||||
homepage = "http://christophe.varoqui.free.fr/";
|
homepage = "http://christophe.varoqui.free.fr/";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue