diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-10-16 11:36:01 +0100 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-10-19 16:06:21 +0100 |
| commit | 485fe616576be7805bcc10222db5e17ea049beb5 (patch) | |
| tree | 2d25b3318f2649b31d069edb5b1b45356770aaf3 /pkgs/os-specific/linux/zfs | |
| parent | d8842199cb4b178e4c2b634dee355b92d524af37 (diff) | |
| download | nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar.gz nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar.bz2 nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar.lz nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar.xz nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.tar.zst nixpkgs-485fe616576be7805bcc10222db5e17ea049beb5.zip | |
zfsUnstable: 2017-09-26 -> 2017-10-16
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index dfcb3896244..bfa8dac72ba 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -2,7 +2,7 @@ , configFile ? "all" # Userspace dependencies -, zlib, libuuid, python, attr +, zlib, libuuid, python, attr, openssl # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null @@ -41,7 +41,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ]; buildInputs = optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ]; + ++ optionals buildUser [ zlib libuuid python attr ] + ++ optionals (buildUser && isUnstable) [ openssl ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -158,10 +159,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-09-26"; + version = "2017-10-16"; - rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0"; - sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; + rev = "7670f721fc82e6cdcdd31f83760a79b6f2f2b998"; + sha256 = "0ask9d9936s7mhs9q5wzvn6c8fd322i76hs2n7fajfk17b1a1lkj"; isUnstable = true; extraPatches = [ |