commit 4360a87c45f69f7444c7b87546705de7fbc8681f · pyrox.dev/nixpkgs

+4 -4

nixos/modules/tasks/filesystems/zfs.nix

···

       24
       24
        
         kernel = config.boot.kernelPackages;

     

       25
       25
        
       

     

       26
       26
        
         packages = if config.boot.zfs.enableUnstable then {

     

       27
       27
       -
           spl = kernel.splUnstable;

     

       27
       27
       +
           spl = null;

     

       28
       28
        
           zfs = kernel.zfsUnstable;

     

       29
       29
        
           zfsUser = pkgs.zfsUnstable;

     

       30
       30
        
         } else {

     
···

       325
       325
        
             virtualisation.lxd.zfsSupport = true;

     

       326
       326
        
       

     

       327
       327
        
             boot = {

     

       328
       328
       -
               kernelModules = [ "spl" "zfs" ] ;

     

       329
       329
       -
               extraModulePackages = with packages; [ spl zfs ];

     

       328
       328
       +
               kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl";

     

       329
       329
       +
               extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl;

     

       330
       330
        
             };

     

       331
       331
        
       

     

       332
       332
        
             boot.initrd = mkIf inInitrd {

     

       333
       333
       -
               kernelModules = [ "spl" "zfs" ];

     

       333
       333
       +
               kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl";

     

       334
       334
        
               extraUtilsCommands =

     

       335
       335
        
                 ''

     

       336
       336
        
                   copy_bin_and_libs ${packages.zfsUser}/sbin/zfs

+34 -55

pkgs/os-specific/linux/spl/default.nix

···

       6
       6
        
       

     

       7
       7
        
       with stdenv.lib;

     

       8
       8
        
       

     

       9
       9
       -
       let

     

       10
       10
       -
         common = { version

     

       11
       11
       -
           , sha256

     

       12
       12
       -
           , rev ? "spl-${version}"

     

       13
       13
       -
           , broken ? false

     

       14
       14
       -
           , patches ? []

     

       15
       15
       -
           }: stdenv.mkDerivation rec {

     

       16
       16
       -
             name = "spl-${version}-${kernel.version}";

     

       9
       9
       +
       assert kernel != null;

     

       17
       10
        
       

     

       18
       18
       -
             src = fetchFromGitHub {

     

       19
       19
       -
               owner = "zfsonlinux";

     

       20
       20
       -
               repo = "spl";

     

       21
       21
       -
               inherit rev sha256;

     

       22
       22
       -
             };

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       12
       12
       +
         name = "spl-${version}-${kernel.version}";

     

       23
       13
        
       

     

       24
       24
       -
             inherit patches;

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "zfsonlinux";

     

       16
       16
       +
           repo = "spl";

     

       17
       17
       +
           rev = "spl-0.7.9";

     

       18
       18
       +
           sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";

     

       19
       19
       +
         };

     

       25
       20
        
       

     

       26
       26
       -
             nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;

     

       21
       21
       +
         patches = [ ./install_prefix.patch ];

     

       27
       22
        
       

     

       28
       28
       -
             hardeningDisable = [ "fortify" "stackprotector" "pic" ];

     

       23
       23
       +
         nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;

     

       29
       24
        
       

     

       30
       30
       -
             preConfigure = ''

     

       31
       31
       -
               substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid

     

       32
       32
       -
               substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"

     

       33
       33
       -
               substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       34
       34
       -
               substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       35
       35
       -
             '';

     

       25
       25
       +
         hardeningDisable = [ "fortify" "stackprotector" "pic" ];

     

       36
       26
        
       

     

       37
       37
       -
             configureFlags = [

     

       38
       38
       -
               "--with-config=kernel"

     

       39
       39
       -
               "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"

     

       40
       40
       -
               "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       41
       41
       -
             ];

     

       27
       27
       +
         preConfigure = ''

     

       28
       28
       +
           substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid

     

       29
       29
       +
           substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"

     

       30
       30
       +
           substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       31
       31
       +
           substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"

     

       32
       32
       +
         '';

     

       42
       33
        
       

     

       43
       43
       -
             enableParallelBuilding = true;

     

       34
       34
       +
         configureFlags = [

     

       35
       35
       +
           "--with-config=kernel"

     

       36
       36
       +
           "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"

     

       37
       37
       +
           "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       38
       38
       +
         ];

     

       44
       39
        
       

     

       45
       45
       -
             meta = {

     

       46
       46
       -
               description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";

     

       40
       40
       +
         enableParallelBuilding = true;

     

       47
       41
        
       

     

       48
       48
       -
               longDescription = ''

     

       49
       49
       -
                 This kernel module is a porting layer for ZFS to work inside the linux

     

       50
       50
       -
                 kernel.

     

       51
       51
       -
               '';

     

       42
       42
       +
         meta = {

     

       43
       43
       +
           description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";

     

       52
       44
        
       

     

       53
       53
       -
               inherit broken;

     

       45
       45
       +
           longDescription = ''

     

       46
       46
       +
             This kernel module is a porting layer for ZFS to work inside the linux

     

       47
       47
       +
             kernel.

     

       48
       48
       +
           '';

     

       54
       49
        
       

     

       55
       55
       -
               homepage = http://zfsonlinux.org/;

     

       56
       56
       -
               platforms = platforms.linux;

     

       57
       57
       -
               license = licenses.gpl2Plus;

     

       58
       58
       -
               maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];

     

       59
       59
       -
             };

     

       50
       50
       +
           homepage = http://zfsonlinux.org/;

     

       51
       51
       +
           platforms = platforms.linux;

     

       52
       52
       +
           license = licenses.gpl2Plus;

     

       53
       53
       +
           maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];

     

       60
       54
        
         };

     

       61
       61
       -
       in

     

       62
       62
       -
         assert kernel != null;

     

       63
       63
       -
       {

     

       64
       64
       -
           splStable = common {

     

       65
       65
       -
             version = "0.7.9";

     

       66
       66
       -
             sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";

     

       67
       67
       -
             patches = [ ./install_prefix-0.7.9.patch ];

     

       68
       68
       -
           };

     

       69
       69
       -
       

     

       70
       70
       -
           splUnstable = common {

     

       71
       71
       -
             version = "2018-05-07";

     

       72
       72
       -
             rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602";

     

       73
       73
       -
             sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx";

     

       74
       74
       -
             patches = [ ./install_prefix.patch ];

     

       75
       75
       -
           };

     

       76
       55
        
       }

-162

pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch

···

       1
       1
       -
       diff --git a/Makefile.am b/Makefile.am

     

       2
       2
       -
       index 4977448..ac17217 100644

     

       3
       3
       -
       --- a/Makefile.am

     

       4
       4
       -
       +++ b/Makefile.am

     

       5
       5
       -
       @@ -12,10 +12,10 @@ endif

     

       6
       6
       -
        if CONFIG_KERNEL

     

       7
       7
       -
        SUBDIRS += module

     

       8
       8
       -
        

     

       9
       9
       -
       -extradir = @prefix@/src/spl-$(VERSION)

     

       10
       10
       -
       +extradir = @prefix@/libexec/spl

     

       11
       11
       -
        extra_HEADERS = spl.release.in spl_config.h.in

     

       12
       12
       -
        

     

       13
       13
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)

     

       14
       14
       -
       +kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)

     

       15
       15
       -
        nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)

     

       16
       16
       -
        endif

     

       17
       17
       -
        

     

       18
       18
       -
       diff --git a/include/Makefile.am b/include/Makefile.am

     

       19
       19
       -
       index 3200222..4a47aaa 100644

     

       20
       20
       -
       --- a/include/Makefile.am

     

       21
       21
       -
       +++ b/include/Makefile.am

     

       22
       22
       -
       @@ -13,6 +13,6 @@ USER_H =

     

       23
       23
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       24
       24
       -
        

     

       25
       25
       -
        if CONFIG_KERNEL

     

       26
       26
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include

     

       27
       27
       -
       +kerneldir = @prefix@/libexec/spl/include

     

       28
       28
       -
        kernel_HEADERS = $(KERNEL_H)

     

       29
       29
       -
        endif

     

       30
       30
       -
       diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am

     

       31
       31
       -
       index e0da4b3..d6d7af0 100644

     

       32
       32
       -
       --- a/include/fs/Makefile.am

     

       33
       33
       -
       +++ b/include/fs/Makefile.am

     

       34
       34
       -
       @@ -8,6 +8,6 @@ USER_H =

     

       35
       35
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       36
       36
       -
        

     

       37
       37
       -
        if CONFIG_KERNEL

     

       38
       38
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/fs

     

       39
       39
       -
       +kerneldir = @prefix@/libexec/spl/include/fs

     

       40
       40
       -
        kernel_HEADERS = $(KERNEL_H)

     

       41
       41
       -
        endif

     

       42
       42
       -
       diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am

     

       43
       43
       -
       index 712e94e..4af9fb7 100644

     

       44
       44
       -
       --- a/include/linux/Makefile.am

     

       45
       45
       -
       +++ b/include/linux/Makefile.am

     

       46
       46
       -
       @@ -18,6 +18,6 @@ USER_H =

     

       47
       47
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       48
       48
       -
        

     

       49
       49
       -
        if CONFIG_KERNEL

     

       50
       50
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/linux

     

       51
       51
       -
       +kerneldir = @prefix@/libexec/spl/include/linux

     

       52
       52
       -
        kernel_HEADERS = $(KERNEL_H)

     

       53
       53
       -
        endif

     

       54
       54
       -
       diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am

     

       55
       55
       -
       index cfc8246..4fbd33d 100644

     

       56
       56
       -
       --- a/include/rpc/Makefile.am

     

       57
       57
       -
       +++ b/include/rpc/Makefile.am

     

       58
       58
       -
       @@ -9,6 +9,6 @@ USER_H =

     

       59
       59
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       60
       60
       -
        

     

       61
       61
       -
        if CONFIG_KERNEL

     

       62
       62
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc

     

       63
       63
       -
       +kerneldir = @prefix@/libexec/spl/include/rpc

     

       64
       64
       -
        kernel_HEADERS = $(KERNEL_H)

     

       65
       65
       -
        endif

     

       66
       66
       -
       diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am

     

       67
       67
       -
       index 10e7093..febecdf 100644

     

       68
       68
       -
       --- a/include/sharefs/Makefile.am

     

       69
       69
       -
       +++ b/include/sharefs/Makefile.am

     

       70
       70
       -
       @@ -8,6 +8,6 @@ USER_H =

     

       71
       71
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       72
       72
       -
        

     

       73
       73
       -
        if CONFIG_KERNEL

     

       74
       74
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs

     

       75
       75
       -
       +kerneldir = @prefix@/libexec/spl/include/sharefs

     

       76
       76
       -
        kernel_HEADERS = $(KERNEL_H)

     

       77
       77
       -
        endif

     

       78
       78
       -
       diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am

     

       79
       79
       -
       index 73c4a84..31a9f50 100644

     

       80
       80
       -
       --- a/include/sys/Makefile.am

     

       81
       81
       -
       +++ b/include/sys/Makefile.am

     

       82
       82
       -
       @@ -107,7 +107,7 @@ USER_H =

     

       83
       83
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       84
       84
       -
        

     

       85
       85
       -
        if CONFIG_KERNEL

     

       86
       86
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys

     

       87
       87
       -
       +kerneldir = @prefix@/libexec/spl/include/sys

     

       88
       88
       -
        kernel_HEADERS = $(KERNEL_H)

     

       89
       89
       -
        endif

     

       90
       90
       -
        

     

       91
       91
       -
       diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am

     

       92
       92
       -
       index 2821cbe..a84ce8e 100644

     

       93
       93
       -
       --- a/include/sys/fm/Makefile.am

     

       94
       94
       -
       +++ b/include/sys/fm/Makefile.am

     

       95
       95
       -
       @@ -9,6 +9,6 @@ USER_H =

     

       96
       96
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       97
       97
       -
        

     

       98
       98
       -
        if CONFIG_KERNEL

     

       99
       99
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm

     

       100
       100
       -
       +kerneldir = @prefix@/libexec/spl/include/sys/fm

     

       101
       101
       -
        kernel_HEADERS = $(KERNEL_H)

     

       102
       102
       -
        endif

     

       103
       103
       -
       diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am

     

       104
       104
       -
       index 581083e..0c35fb7 100644

     

       105
       105
       -
       --- a/include/sys/fs/Makefile.am

     

       106
       106
       -
       +++ b/include/sys/fs/Makefile.am

     

       107
       107
       -
       @@ -8,6 +8,6 @@ USER_H =

     

       108
       108
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       109
       109
       -
        

     

       110
       110
       -
        if CONFIG_KERNEL

     

       111
       111
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs

     

       112
       112
       -
       +kerneldir = @prefix@/libexec/spl/include/sys/fs

     

       113
       113
       -
        kernel_HEADERS = $(KERNEL_H)

     

       114
       114
       -
        endif

     

       115
       115
       -
       diff --git a/include/util/Makefile.am b/include/util/Makefile.am

     

       116
       116
       -
       index e2bf09f..3f5d6ce 100644

     

       117
       117
       -
       --- a/include/util/Makefile.am

     

       118
       118
       -
       +++ b/include/util/Makefile.am

     

       119
       119
       -
       @@ -9,6 +9,6 @@ USER_H =

     

       120
       120
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       121
       121
       -
        

     

       122
       122
       -
        if CONFIG_KERNEL

     

       123
       123
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/util

     

       124
       124
       -
       +kerneldir = @prefix@/libexec/spl/include/util

     

       125
       125
       -
        kernel_HEADERS = $(KERNEL_H)

     

       126
       126
       -
        endif

     

       127
       127
       -
       diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am

     

       128
       128
       -
       index 7faab0a..8148b3d 100644

     

       129
       129
       -
       --- a/include/vm/Makefile.am

     

       130
       130
       -
       +++ b/include/vm/Makefile.am

     

       131
       131
       -
       @@ -10,6 +10,6 @@ USER_H =

     

       132
       132
       -
        EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)

     

       133
       133
       -
        

     

       134
       134
       -
        if CONFIG_KERNEL

     

       135
       135
       -
       -kerneldir = @prefix@/src/spl-$(VERSION)/include/vm

     

       136
       136
       -
       +kerneldir = @prefix@/libexec/spl/include/vm

     

       137
       137
       -
        kernel_HEADERS = $(KERNEL_H)

     

       138
       138
       -
        endif

     

       139
       139
       -
       diff --git a/module/Makefile.in b/module/Makefile.in

     

       140
       140
       -
       index d4e62e1..73fa01c 100644

     

       141
       141
       -
       --- a/module/Makefile.in

     

       142
       142
       -
       +++ b/module/Makefile.in

     

       143
       143
       -
       @@ -21,15 +21,15 @@ clean:

     

       144
       144
       -
        modules_install:

     

       145
       145
       -
        	@# Install the kernel modules

     

       146
       146
       -
        	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \

     

       147
       147
       -
       -		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \

     

       148
       148
       -
       +		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \

     

       149
       149
       -
        		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \

     

       150
       150
       -
        		KERNELRELEASE=@LINUX_VERSION@

     

       151
       151
       -
        	@# Remove extraneous build products when packaging

     

       152
       152
       -
       -	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \

     

       153
       153
       -
       -	if [ -n "$(DESTDIR)" ]; then \

     

       154
       154
       -
       +	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \

     

       155
       155
       -
       +	if [ -n "@prefix@" ]; then \

     

       156
       156
       -
        		find $$kmoddir -name 'modules.*' | xargs $(RM); \

     

       157
       157
       -
        	fi

     

       158
       158
       -
       -	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \

     

       159
       159
       -
       +	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \

     

       160
       160
       -
        	if [ -f $$sysmap ]; then \

     

       161
       161
       -
        		depmod -ae -F $$sysmap @LINUX_VERSION@; \

     

       162
       162
       -
        	fi

+12 -11

pkgs/os-specific/linux/zfs/default.nix

···

       9
       9
        
       , gawk, gnugrep, gnused, systemd

     

       10
       10
        
       

     

       11
       11
        
       # Kernel dependencies

     

       12
       12
       -
       , kernel ? null, spl ? null, splUnstable ? null

     

       12
       12
       +
       , kernel ? null, spl ? null

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       with stdenv.lib;

     
···

       51
       51
        
             '';

     

       52
       52
        
       

     

       53
       53
        
             nativeBuildInputs = [ autoreconfHook nukeReferences ]

     

       54
       54
       -
                ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);

     

       54
       54
       +
               ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);

     

       55
       55
        
             buildInputs =

     

       56
       56
        
                  optionals buildKernel [ spl ]

     

       57
       57
        
               ++ optionals buildUser [ zlib libuuid python attr ]

     
···

       93
       93
        
       

     

       94
       94
        
             configureFlags = [

     

       95
       95
        
               "--with-config=${configFile}"

     

       96
       96
       -
               ] ++ optionals buildUser [

     

       96
       96
       +
             ] ++ optionals buildUser [

     

       97
       97
        
               "--with-dracutdir=$(out)/lib/dracut"

     

       98
       98
        
               "--with-udevdir=$(out)/lib/udev"

     

       99
       99
        
               "--with-systemdunitdir=$(out)/etc/systemd/system"

     
···

       103
       103
        
               "--sysconfdir=/etc"

     

       104
       104
        
               "--localstatedir=/var"

     

       105
       105
        
               "--enable-systemd"

     

       106
       106
       -
               ] ++ optionals buildKernel [

     

       107
       107
       -
               "--with-spl=${spl}/libexec/spl"

     

       106
       106
       +
             ] ++ optionals buildKernel [

     

       108
       107
        
               "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"

     

       109
       108
        
               "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       109
       109
       +
             ] ++ optionals (buildKernel && spl != null) [

     

       110
       110
       +
               "--with-spl=${spl}/libexec/spl"

     

       110
       111
        
             ];

     

       111
       112
        
       

     

       112
       113
        
             enableParallelBuilding = true;

     
···

       179
       180
        
           incompatibleKernelVersion = null;

     

       180
       181
        
       

     

       181
       182
        
           # this package should point to a version / git revision compatible with the latest kernel release

     

       182
       182
       -
           version = "2018-05-22";

     

       183
       183
       +
           version = "2018-08-13";

     

       183
       184
        
       

     

       184
       184
       -
           rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20";

     

       185
       185
       -
           sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0";

     

       185
       185
       +
           rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c";

     

       186
       186
       +
           sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf";

     

       186
       187
        
           isUnstable = true;

     

       187
       188
        
       

     

       188
       189
        
           extraPatches = [

     

       189
       190
        
             (fetchpatch {

     

       190
       190
       -
               url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch";

     

       191
       191
       -
               sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";

     

       191
       191
       +
               url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch";

     

       192
       192
       +
               sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw";

     

       192
       193
        
             })

     

       193
       194
        
           ];

     

       194
       195
        
       

     

       195
       195
       -
           spl = splUnstable;

     

       196
       196
       +
           spl = null;

     

       196
       197
        
         };

     

       197
       198
        
       }

+1 -4

pkgs/top-level/all-packages.nix

···

       14023
       14023
        
       

     

       14024
       14024
        
           sch_cake = callPackage ../os-specific/linux/sch_cake { };

     

       14025
       14025
        
       

     

       14026
       14026
       -
           inherit (callPackage ../os-specific/linux/spl {})

     

       14027
       14027
       -
             splStable splUnstable;

     

       14028
       14028
       -
       

     

       14029
       14029
       -
           spl = splStable;

     

       14026
       14026
       +
           spl = callPackage ../os-specific/linux/spl { };

     

       14030
       14027
        
       

     

       14031
       14028
        
           sysdig = callPackage ../os-specific/linux/sysdig {};

     

       14032
       14029