From 1f2a3fe040002a638d7c99da3899e088f2947b5f Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Sat, 19 Jan 2019 06:22:24 -0600
Subject: zfsUnstable: Fetch source by tag and patch by hash.

---
 pkgs/os-specific/linux/zfs/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific/linux/zfs')

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";
       })
     ];
-- 
cgit 1.4.1