aboutsummaryrefslogtreecommitdiff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorIvan Jager <aij+git@mrph.org>2019-01-19 06:22:24 -0600
committerIvan Jager <aij+git@mrph.org>2019-01-19 06:22:24 -0600
commit1f2a3fe040002a638d7c99da3899e088f2947b5f (patch)
tree7e569a9245f184dd1a60688364e50fd801cdeea2 /pkgs/os-specific/linux/zfs
parentd1e838ed23a337f92abe7cbc3b945c84ba33c58e (diff)
zfsUnstable: Fetch source by tag and patch by hash.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index cca7e6ac5a5..f1a2c004a75 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -93,7 +93,7 @@ let
configureFlags = [
"--with-config=${configFile}"
- "--with-python=${python3}/bin/python3"
+ "--with-python=${python3.interpreter}"
] ++ optionals buildUser [
"--with-dracutdir=$(out)/lib/dracut"
"--with-udevdir=$(out)/lib/udev"
@@ -183,13 +183,12 @@ in {
# this package should point to a version / git revision compatible with the latest kernel release
version = "0.8.0-rc3";
- rev = "9b626c126e78cdc36200b66c7cd1dc6a06cf400d";
sha256 = "0wmkis0q2gbj7sgx3ipxngbgzjcf7ay353v3mglf2ay50q4da5i7";
isUnstable = true;
extraPatches = [
(fetchpatch {
- url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch";
+ url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch";
sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw";
})
];