diff options
| author | ajs124 <git@ajs124.de> | 2022-02-08 14:25:19 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2022-02-08 14:25:19 +0100 |
| commit | ce8670619da99c5077a8f12b164e0982b9a7d956 (patch) | |
| tree | 85f1945f6afe515e2637e0b2df19a68d644af175 | |
| parent | 60c52a73f1d5858020ac4f161cd5bf1c9650f8b8 (diff) | |
| download | nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar.gz nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar.bz2 nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar.lz nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar.xz nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.tar.zst nixpkgs-ce8670619da99c5077a8f12b164e0982b9a7d956.zip | |
lvm2: 2.03.14 -> 2.03.15
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/2_03.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/common.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 555ff6b0dc1..73f1e9fbdee 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.14"; - sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa"; + version = "2.03.15"; + sha256 = "17n9xl01by7dcbjwjnr6b4rrkp2frz8hwnjl59svsyp13sjq6llk"; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 0749292531b..0f2e6efe3a2 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + lib.optionalString (lib.versionOlder version "2.03.15") '' substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm # https://github.com/lvmteam/lvm2/issues/36 @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE "<removed>"|g' ./include/configure.h ''; - patches = [ + patches = lib.optionals (lib.versionOlder version "2.03.15") [ # Musl fixes from Alpine. ./fix-stdio-usage.patch (fetchpatch { |