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/spl | |
| parent | ab5f98a77e14c1245033cd7df36b78318f8c7702 (diff) | |
| download | nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.gz nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.bz2 nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.lz nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.xz nixlib-f744f83072b28a7db8d94f83a60b46d4ae16ebb4.tar.zst nixlib-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/spl')
| -rw-r--r-- | pkgs/os-specific/linux/spl/const.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 6 |
2 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch deleted file mode 100644 index 932e8a9eb1c4..000000000000 --- a/pkgs/os-specific/linux/spl/const.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c -index eb00505..6f38cef 100644 ---- a/module/spl/spl-proc.c -+++ b/module/spl/spl-proc.c -@@ -36,7 +36,7 @@ - #include <linux/uaccess.h> - #include <linux/version.h> - --#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+#if defined(CONSTIFY_PLUGIN) - typedef struct ctl_table __no_const spl_ctl_table; - #else - typedef struct ctl_table spl_ctl_table; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 57698b5ad455..9460ee46c0f0 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -20,7 +20,7 @@ let inherit rev sha256; }; - patches = [ ./const.patch ./install_prefix.patch ]; + patches = [ ./install_prefix.patch ]; nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; @@ -61,8 +61,8 @@ in assert kernel != null; { splStable = common { - version = "0.7.6"; - sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb"; + version = "0.7.7"; + sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x"; }; splUnstable = common { |