Commit e764c08e authored by ajs124's avatar ajs124
Browse files

lvm2: 2.03.12 -> 2.03.14

parent c6f07eae

pkgs/os-specific/linux/lvm2/2_02.nix

+1 −1
Original line number Diff line number Diff line 
import ./common.nix {

  version = "2.02.187";

  sha256Hash = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE=";

  sha256 = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE=";

}

pkgs/os-specific/linux/lvm2/2_03.nix

+2 −2
Original line number Diff line number Diff line 
import ./common.nix {

  version = "2.03.12";

  sha256Hash = "1shczwfd0888dchjiaqzd48ampm6f8y0ngsqd99fy4nxlbr5q1vn";

  version = "2.03.14";

  sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa";

}

pkgs/os-specific/linux/lvm2/common.nix

+4 −4
Original line number Diff line number Diff line 
{ 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") ''