summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorsjau <github.com@sjau.ch>2020-01-24 14:52:44 +0100
committersjau <github.com@sjau.ch>2020-01-24 14:52:44 +0100
commit88de34b160cec2915cb8ee4f5cd08542874eeaa6 (patch)
tree12fad9f18856f45362619f2c6f88ac8c5fc8d053 /pkgs
parentee28f38a4805fe22e37f4eb0a54df09eae43bcc5 (diff)
downloadnixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar.gz
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar.bz2
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar.lz
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar.xz
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.tar.zst
nixpkgs-88de34b160cec2915cb8ee4f5cd08542874eeaa6.zip
zfs: 0.8.2 -> 0.8.3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix24
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;
   };
 }