diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2020-01-25 10:37:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-25 10:37:19 -0500 |
commit | d004a3c22110f6fd4d967c604dd474fd66c60952 (patch) | |
tree | 167957fb5be050185a4fe739f362ff24b4390643 /pkgs | |
parent | 03af480425c43bd8fb79b4fb35cec58166495a90 (diff) | |
parent | 88de34b160cec2915cb8ee4f5cd08542874eeaa6 (diff) | |
download | nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar.gz nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar.bz2 nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar.lz nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar.xz nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.tar.zst nixpkgs-d004a3c22110f6fd4d967c604dd474fd66c60952.zip |
Merge pull request #78415 from sjau/zfs-0.8.3
zfs: 0.8.2 -> 0.8.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ae72aad6c07..738171bb5ec 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -56,6 +56,22 @@ let substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" + + substituteInPlace ./contrib/initramfs/hooks/Makefile.am \ + --replace "/usr/share/initramfs-tools/hooks" "$out/usr/share/initramfs-tools/hooks" + substituteInPlace ./contrib/initramfs/Makefile.am \ + --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" + substituteInPlace ./contrib/initramfs/scripts/Makefile.am \ + --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts" + substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \ + --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top" + substituteInPlace ./contrib/initramfs/scripts/Makefile.am \ + --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts" + substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \ + --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top" + substituteInPlace ./etc/systemd/system/Makefile.am \ + --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " @@ -163,9 +179,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.2"; + version = "0.8.3"; - sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni"; + sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; }; zfsUnstable = common { @@ -173,9 +189,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.2"; + version = "0.8.3"; - sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni"; + sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; isUnstable = true; }; } |