Skip to content

Commit

Permalink
zfs, spl: 0.7.6 -> 0.7.7
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit f744f83)
  • Loading branch information
fpletz committed Mar 22, 2018
1 parent b8673bc commit 8c3cb02
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 20 deletions.
13 changes: 0 additions & 13 deletions pkgs/os-specific/linux/spl/const.patch

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/spl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let
inherit rev sha256;
};

patches = [ ./const.patch ./install_prefix.patch ];
patches = [ ./install_prefix.patch ];

nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;

Expand Down Expand Up @@ -61,8 +61,8 @@ in
assert kernel != null;
{
splStable = common {
version = "0.7.6";
sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
version = "0.7.7";
sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x";
};

splUnstable = common {
Expand Down
13 changes: 9 additions & 4 deletions pkgs/os-specific/linux/zfs/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
, perl, fetchpatch
, configFile ? "all"

# Userspace dependencies
Expand Down Expand Up @@ -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 ]
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 8c3cb02

Please sign in to comment.