diff options
| author | ajs124 <git@ajs124.de> | 2021-11-30 01:28:52 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-12-07 13:17:42 +0100 |
| commit | e764c08e81b14f3a903986b422bb262e7d5fe51a (patch) | |
| tree | 7d35fa49f651885f95d086bcdf367932c9c02eff | |
| parent | c6f07eae0b0e07dd4a75880aa2f4db369b5e3c17 (diff) | |
| download | nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar.gz nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar.bz2 nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar.lz nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar.xz nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.tar.zst nixpkgs-e764c08e81b14f3a903986b422bb262e7d5fe51a.zip | |
lvm2: 2.03.12 -> 2.03.14
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/2_02.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/2_03.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/common.nix | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/lvm2/2_02.nix b/pkgs/os-specific/linux/lvm2/2_02.nix index 3566a01178b..56ab613afd2 100644 --- a/pkgs/os-specific/linux/lvm2/2_02.nix +++ b/pkgs/os-specific/linux/lvm2/2_02.nix @@ -1,4 +1,4 @@ import ./common.nix { version = "2.02.187"; - sha256Hash = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE="; + sha256 = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE="; } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index d6456b46e51..555ff6b0dc1 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.12"; - sha256Hash = "1shczwfd0888dchjiaqzd48ampm6f8y0ngsqd99fy4nxlbr5q1vn"; + version = "2.03.14"; + sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa"; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 2d09c48073d..2c8014d700a 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash }: +{ version, sha256 }: { lib, stdenv , fetchpatch @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = sha256Hash; + inherit sha256; }; nativeBuildInputs = [ pkg-config ]; @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { 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 - substituteInPlace udev/69-dm-lvm-metad.rules.in \ - --replace "(BINDIR)/systemd-run" /run/current-system/systemd/bin/systemd-run + substituteInPlace udev/69-dm-lvm.rules.in \ + --replace "/usr/bin/systemd-run" /run/current-system/systemd/bin/systemd-run substituteInPlace make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system" '' + lib.optionalString (lib.versionAtLeast version "2.03") '' |