diff options
| author | Ben Wolsieffer <lopsided98@users.noreply.github.com> | 2018-05-28 16:05:05 -0400 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-28 22:05:05 +0200 |
| commit | c5a088bf2b1b03081d64c5a2949e79d8f50e357f (patch) | |
| tree | a420641972a05adb111d3e4038733abb22d7930a /pkgs/os-specific/linux/spl | |
| parent | 9317c05cb388190b1764e520722b7f526ff4cd5e (diff) | |
| download | nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar.gz nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar.bz2 nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar.lz nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar.xz nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.tar.zst nixlib-c5a088bf2b1b03081d64c5a2949e79d8f50e357f.zip | |
spl, zfs: 0.7.8 -> 0.7.9, unstable to latest (#41093)
Diffstat (limited to 'pkgs/os-specific/linux/spl')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch (renamed from pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch) | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 7c37d18c8684..778f00d2a95d 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -62,15 +62,15 @@ in assert kernel != null; { splStable = common { - version = "0.7.8"; - sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi"; - patches = [ ./install_prefix-0.7.8.patch ]; + version = "0.7.9"; + sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + patches = [ ./install_prefix-0.7.9.patch ]; }; splUnstable = common { - version = "2018-04-10"; - rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8"; - sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri"; + version = "2018-05-07"; + rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602"; + sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; patches = [ ./install_prefix.patch ]; }; diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch index dc91392bd2fe..114ca1231470 100644 --- a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch +++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch @@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644 +kerneldir = @prefix@/libexec/spl/include/sys/fs kernel_HEADERS = $(KERNEL_H) endif -diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am -index 63d9af3..de1aa18 100644 ---- a/include/sys/sysevent/Makefile.am -+++ b/include/sys/sysevent/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -+kerneldir = @prefix@/libexec/spl/include/sys/sysevent - kernel_HEADERS = $(KERNEL_H) - endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am |