diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-21 18:56:24 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-22 01:05:32 +0100 |
| commit | f744f83072b28a7db8d94f83a60b46d4ae16ebb4 (patch) | |
| tree | 06f93ac4f74ee3a0940179ea0b014f59043801d9 /pkgs/os-specific/linux/zfs | |
| parent | ab5f98a77e14c1245033cd7df36b78318f8c7702 (diff) | |
| download | nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.gz nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.bz2 nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.lz nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.xz nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.zst nixpkgs-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.zip | |
zfs, spl: 0.7.6 -> 0.7.7
Remove spl patch that was introduced for grsecurity which we don't support anymore. ZFS now needs perl for some scripts that are call in the configure script.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 868e354c7b5..aac1576261d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils +, perl, fetchpatch , configFile ? "all" # Userspace dependencies @@ -39,8 +40,12 @@ let patches = extraPatches; + postPatch = optionalString buildKernel '' + patchShebangs scripts + ''; + nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel kernel.moduleBuildDependencies; + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -142,9 +147,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.6"; + version = "0.7.7"; - sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h"; + sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r"; extraPatches = [ (fetchpatch { |