commit 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-1709.xml

···

       157
        
             module where user Fontconfig settings are available.

     

       158
        
           </para>

     

       159
        
         </listitem>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       160
        
       

     

       161
        
       </itemizedlist>

     

       162

···

       157
        
             module where user Fontconfig settings are available.

     

       158
        
           </para>

     

       159
        
         </listitem>

     

       160
       +
         <listitem>

     

       161
       +
           <para>

     

       162
       +
             ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>

     

       163
       +
             have therefore been removed.

     

       164
       +
           </para>

     

       165
       +
         </listitem>

     

       166
        
       

     

       167
        
       </itemizedlist>

     

       168

nixos/modules/rename.nix

···

       204
        
             "Set the option `services.xserver.displayManager.sddm.package' instead.")

     

       205
        
           (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")

     

       206
        
           (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")

     

       0
        
       
     

       207
        
       

     

       208
        
           # ZSH

     

       209
        
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

···

       204
        
             "Set the option `services.xserver.displayManager.sddm.package' instead.")

     

       205
        
           (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")

     

       206
        
           (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")

     

       207
       +
           (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")

     

       208
        
       

     

       209
        
           # ZSH

     

       210
        
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

+1 -18

nixos/modules/tasks/filesystems/zfs.nix

···

       24
        
       

     

       25
        
         kernel = config.boot.kernelPackages;

     

       26
        
       

     

       27
       -
         packages = if config.boot.zfs.enableUnstable then {

     

       28
       -
           spl = kernel.splUnstable;

     

       29
       -
           zfs = kernel.zfsUnstable;

     

       30
       -
           zfsUser = pkgs.zfsUnstable;

     

       31
       -
         } else {

     

       32
        
           spl = kernel.spl;

     

       33
        
           zfs = kernel.zfs;

     

       34
        
           zfsUser = pkgs.zfs;

     
···

       62
        
       

     

       63
        
         options = {

     

       64
        
           boot.zfs = {

     

       65
       -
             enableUnstable = mkOption {

     

       66
       -
               type = types.bool;

     

       67
       -
               default = false;

     

       68
       -
               description = ''

     

       69
       -
                 Use the unstable zfs package. This might be an option, if the latest

     

       70
       -
                 kernel is not yet supported by a published release of ZFS. Enabling

     

       71
       -
                 this option will install a development version of ZFS on Linux. The

     

       72
       -
                 version will have already passed an extensive test suite, but it is

     

       73
       -
                 more likely to hit an undiscovered bug compared to running a released

     

       74
       -
                 version of ZFS on Linux.

     

       75
       -
               '';

     

       76
       -
             };

     

       77
       -
       

     

       78
        
             extraPools = mkOption {

     

       79
        
               type = types.listOf types.str;

     

       80
        
               default = [];

···

       24
        
       

     

       25
        
         kernel = config.boot.kernelPackages;

     

       26
        
       

     

       27
       +
         packages = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
           spl = kernel.spl;

     

       29
        
           zfs = kernel.zfs;

     

       30
        
           zfsUser = pkgs.zfs;

     
···

       58
        
       

     

       59
        
         options = {

     

       60
        
           boot.zfs = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       61
        
             extraPools = mkOption {

     

       62
        
               type = types.listOf types.str;

     

       63
        
               default = [];

+40 -50

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

···

       6
        
       }:

     

       7
        
       

     

       8
        
       with stdenv.lib;

     

       0
        
       
     

       9
        
       let

     

       10
        
         buildKernel = any (n: n == configFile) [ "kernel" "all" ];

     

       11
        
         buildUser = any (n: n == configFile) [ "user" "all" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
       -
         common = { version, sha256 } @ args : stdenv.mkDerivation rec {

     

       14
       -
           name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
       -
           src = fetchFromGitHub {

     

       17
       -
             owner = "zfsonlinux";

     

       18
       -
             repo = "spl";

     

       19
       -
             rev = "spl-${version}";

     

       20
       -
             inherit sha256;

     

       21
       -
           };

     

       22
        
       

     

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

     

       24
       -
       

     

       25
       -
           nativeBuildInputs = [ autoreconfHook ];

     

       26
        
       

     

       27
       -
           hardeningDisable = [ "pic" ];

     

       28
        
       

     

       29
       -
           preConfigure = ''

     

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

     

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

     

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

     

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

     

       34
       -
           '';

     

       35
        
       

     

       36
       -
           configureFlags = [

     

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

     

       38
       -
           ] ++ optionals buildKernel [

     

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

     

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

     

       41
       -
           ];

     

       42
        
       

     

       43
       -
           enableParallelBuilding = true;

     

       44
        
       

     

       45
       -
           meta = {

     

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

     

       47
        
       

     

       48
       -
             longDescription = ''

     

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

     

       50
       -
                 kernel.

     

       51
       -
             '';

     

       52
        
       

     

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

     

       54
       -
             platforms = platforms.linux;

     

       55
       -
             license = licenses.gpl2Plus;

     

       56
       -
             maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];

     

       57
       -
           };

     

       58
        
         };

     

       59
       -
       

     

       60
       -
       in

     

       61
       -
         assert any (n: n == configFile) [ "kernel" "user" "all" ];

     

       62
       -
         assert buildKernel -> kernel != null;

     

       63
       -
         {

     

       64
       -
           splStable = common {

     

       65
       -
             version = "0.6.5.11";

     

       66
       -
             sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";

     

       67
       -
           };

     

       68
       -
           splUnstable = common {

     

       69
       -
             version = "0.7.0-rc5";

     

       70
       -
             sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";

     

       71
       -
           };

     

       72
       -
         }

···

       6
        
       }:

     

       7
        
       

     

       8
        
       with stdenv.lib;

     

       9
       +
       

     

       10
        
       let

     

       11
        
         buildKernel = any (n: n == configFile) [ "kernel" "all" ];

     

       12
        
         buildUser = any (n: n == configFile) [ "user" "all" ];

     

       13
       +
       in

     

       14
       +
         assert any (n: n == configFile) [ "kernel" "user" "all" ];

     

       15
       +
         assert buildKernel -> kernel != null;

     

       16
       +
       stdenv.mkDerivation rec {

     

       17
       +
         name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

     

       18
       +
         version = "0.7.0";

     

       19
        
       

     

       20
       +
         src = fetchFromGitHub {

     

       21
       +
           owner = "zfsonlinux";

     

       22
       +
           repo = "spl";

     

       23
       +
           rev = "spl-${version}";

     

       24
       +
           sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";

     

       25
       +
         };

     

       26
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
       

     

       29
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       0
        
       
     

       0
        
       
     

       30
        
       

     

       31
       +
         hardeningDisable = [ "pic" ];

     

       32
        
       

     

       33
       +
         preConfigure = ''

     

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

     

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

     

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

     

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

     

       38
       +
         '';

     

       39
        
       

     

       40
       +
         configureFlags = [

     

       41
       +
           "--with-config=${configFile}"

     

       42
       +
         ] ++ optionals buildKernel [

     

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

     

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

     

       45
       +
         ];

     

       46
        
       

     

       47
       +
         enableParallelBuilding = true;

     

       48
        
       

     

       49
       +
         meta = {

     

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

     

       51
        
       

     

       52
       +
           longDescription = ''

     

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

     

       54
       +
             kernel.

     

       55
       +
           '';

     

       56
        
       

     

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

     

       58
       +
           platforms = platforms.linux;

     

       59
       +
           license = licenses.gpl2Plus;

     

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

     

       0
        
       
     

       61
        
         };

     

       62
       +
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

+87 -127

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

···

       12
        
       let

     

       13
        
         buildKernel = any (n: n == configFile) [ "kernel" "all" ];

     

       14
        
         buildUser = any (n: n == configFile) [ "user" "all" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
       -
         common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:

     

       17
       -
           if buildKernel &&

     

       18
       -
              (incompatibleKernelVersion != null) &&

     

       19
       -
              versionAtLeast kernel.version incompatibleKernelVersion then

     

       20
       -
             throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."

     

       21
       -
           else stdenv.mkDerivation rec {

     

       22
       -
             name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

     

       23
        
       

     

       24
       -
             src = fetchFromGitHub {

     

       25
       -
               owner = "zfsonlinux";

     

       26
       -
               repo = "zfs";

     

       27
       -
               rev = "zfs-${version}";

     

       28
       -
               inherit sha256;

     

       29
       -
             };

     

       30
        
       

     

       31
       -
             patches = extraPatches;

     

       0
        
       
     

       0
        
       
     

       32
        
       

     

       33
       -
             buildInputs = [ autoreconfHook nukeReferences ]

     

       34
       -
             ++ optionals buildKernel [ spl ]

     

       35
       -
             ++ optionals buildUser [ zlib libuuid python attr ];

     

       36
        
       

     

       37
       -
             # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work

     

       38
       -
             NIX_CFLAGS_LINK = "-lgcc_s";

     

       39
        
       

     

       40
       -
             hardeningDisable = [ "pic" ];

     

       41
       -
       

     

       42
       -
             preConfigure = ''

     

       43
       -
               substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"

     

       44
       -
               substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"

     

       45
       -
               substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"

     

       46
       -
               substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"

     

       47
       -
               substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"

     

       48
       -
               substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"

     

       49
       -
               substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"

     

       50
       -
               substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

     

       51
       -
               substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"

     

       52
       -
               substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"

     

       53
       -
               substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"

     

       54
       -
               substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"

     

       55
       -
               substituteInPlace ./etc/systemd/system/zfs-share.service.in \

     

       56
       -
                 --replace "@bindir@/rm " "${coreutils}/bin/rm "

     

       57
       -
               ./autogen.sh

     

       58
       -
             '';

     

       59
       -
       

     

       60
       -
             configureFlags = [

     

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

     

       62
       -
               ] ++ optionals buildUser [

     

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

     

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

     

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

     

       66
       -
               "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"

     

       67
       -
               "--with-mounthelperdir=$(out)/bin"

     

       68
       -
               "--sysconfdir=/etc"

     

       69
       -
               "--localstatedir=/var"

     

       70
       -
               "--enable-systemd"

     

       71
       -
               ] ++ optionals buildKernel [

     

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

     

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

     

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

     

       75
       -
             ];

     

       76
       -
       

     

       77
       -
             enableParallelBuilding = true;

     

       78
       -
       

     

       79
       -
             installFlags = [

     

       80
       -
               "sysconfdir=\${out}/etc"

     

       81
       -
               "DEFAULT_INITCONF_DIR=\${out}/default"

     

       82
       -
             ];

     

       83
       -
       

     

       84
       -
             postInstall = ''

     

       85
       -
               # Prevent kernel modules from depending on the Linux -dev output.

     

       86
       -
               nuke-refs $(find $out -name "*.ko")

     

       87
       -
             '' + optionalString buildUser ''

     

       88
       -
               # Remove provided services as they are buggy

     

       89
       -
               rm $out/etc/systemd/system/zfs-import-*.service

     

       90
        
       

     

       91
       -
               sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       92
        
       

     

       93
       -
               for i in $out/etc/systemd/system/*; do

     

       94
       -
               substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"

     

       95
       -
               done

     

       96
        
       

     

       97
       -
               # Fix pkgconfig.

     

       98
       -
               ln -s ../share/pkgconfig $out/lib/pkgconfig

     

       0
        
       
     

       0
        
       
     

       99
        
       

     

       100
       -
               # Remove tests because they add a runtime dependency on gcc

     

       101
       -
               rm -rf $out/share/zfs/zfs-tests

     

       102
       -
             '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       103
        
       

     

       104
       -
             meta = {

     

       105
       -
               description = "ZFS Filesystem Linux Kernel module";

     

       106
       -
               longDescription = ''

     

       107
       -
                 ZFS is a filesystem that combines a logical volume manager with a

     

       108
       -
                 Copy-On-Write filesystem with data integrity detection and repair,

     

       109
       -
                 snapshotting, cloning, block devices, deduplication, and more.

     

       110
       -
               '';

     

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

     

       112
       -
               license = licenses.cddl;

     

       113
       -
               platforms = platforms.linux;

     

       114
       -
               maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];

     

       115
       -
             };

     

       116
       -
           };

     

       117
       -
       in

     

       118
       -
         assert any (n: n == configFile) [ "kernel" "user" "all" ];

     

       119
       -
         assert buildKernel -> kernel != null && spl != null;

     

       120
       -
         {

     

       121
       -
           # also check if kernel version constraints in

     

       122
       -
           # ./nixos/modules/tasks/filesystems/zfs.nix needs

     

       123
       -
           # to be adapted

     

       124
       -
           zfsStable = common {

     

       125
       -
             # comment/uncomment if breaking kernel versions are known

     

       126
       -
             incompatibleKernelVersion = "4.12";

     

       127
        
       

     

       128
       -
             version = "0.6.5.11";

     

       0
        
       
     

       0
        
       
     

       129
        
       

     

       130
       -
             # this package should point to the latest release.

     

       131
       -
             sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";

     

       132
       -
             extraPatches = [

     

       133
       -
               (fetchpatch {

     

       134
       -
                 url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";

     

       135
       -
                 sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";

     

       136
       -
               })

     

       137
       -
             ];

     

       138
       -
             inherit spl;

     

       139
       -
           };

     

       140
       -
           zfsUnstable = common {

     

       141
       -
             # comment/uncomment if breaking kernel versions are known

     

       142
       -
             incompatibleKernelVersion = null;

     

       143
        
       

     

       144
       -
             version = "0.7.0-rc5";

     

       0
        
       
     

       0
        
       
     

       145
        
       

     

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

     

       147
       -
             sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n";

     

       148
       -
             extraPatches = [

     

       149
       -
               (fetchpatch {

     

       150
       -
                 url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";

     

       151
       -
                 sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";

     

       152
       -
               })

     

       153
       -
             ];

     

       154
       -
             spl = splUnstable;

     

       155
       -
           };

     

       156
       -
         }

     

       0
        
       
     

       0

···

       12
        
       let

     

       13
        
         buildKernel = any (n: n == configFile) [ "kernel" "all" ];

     

       14
        
         buildUser = any (n: n == configFile) [ "user" "all" ];

     

       15
       +
       in stdenv.mkDerivation rec {

     

       16
       +
         name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

     

       17
       +
         version = "0.7.0";

     

       18
        
       

     

       19
       +
         src = fetchFromGitHub {

     

       20
       +
           owner = "zfsonlinux";

     

       21
       +
           repo = "zfs";

     

       22
       +
           rev = "zfs-${version}";

     

       23
       +
           sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall";

     

       24
       +
         };

     

       0
        
       
     

       25
        
       

     

       26
       +
         patches = [

     

       27
       +
           (fetchpatch {

     

       28
       +
             url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";

     

       29
       +
             sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";

     

       30
       +
           })

     

       31
       +
         ];

     

       32
        
       

     

       33
       +
         buildInputs = [ autoreconfHook nukeReferences ]

     

       34
       +
         ++ optionals buildKernel [ spl ]

     

       35
       +
         ++ optionals buildUser [ zlib libuuid python attr ];

     

       36
        
       

     

       37
       +
         # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work

     

       38
       +
         NIX_CFLAGS_LINK = "-lgcc_s";

     

       0
        
       
     

       39
        
       

     

       40
       +
         hardeningDisable = [ "pic" ];

     

       0
        
       
     

       41
        
       

     

       42
       +
         preConfigure = ''

     

       43
       +
           substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"

     

       44
       +
           substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"

     

       45
       +
           substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"

     

       46
       +
           substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"

     

       47
       +
           substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"

     

       48
       +
           substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"

     

       49
       +
           substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"

     

       50
       +
           substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

     

       51
       +
           substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"

     

       52
       +
           substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"

     

       53
       +
           substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"

     

       54
       +
           substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"

     

       55
       +
           substituteInPlace ./etc/systemd/system/zfs-share.service.in \

     

       56
       +
             --replace "@bindir@/rm " "${coreutils}/bin/rm "

     

       57
       +
           ./autogen.sh

     

       58
       +
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
       

     

       60
       +
         configureFlags = [

     

       61
       +
           "--with-config=${configFile}"

     

       62
       +
           ] ++ optionals buildUser [

     

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

     

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

     

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

     

       66
       +
           "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"

     

       67
       +
           "--with-mounthelperdir=$(out)/bin"

     

       68
       +
           "--sysconfdir=/etc"

     

       69
       +
           "--localstatedir=/var"

     

       70
       +
           "--enable-systemd"

     

       71
       +
           ] ++ optionals buildKernel [

     

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

     

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

     

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

     

       75
       +
         ];

     

       76
        
       

     

       77
       +
         enableParallelBuilding = true;

     

       0
        
       
     

       0
        
       
     

       78
        
       

     

       79
       +
         installFlags = [

     

       80
       +
           "sysconfdir=\${out}/etc"

     

       81
       +
           "DEFAULT_INITCONF_DIR=\${out}/default"

     

       82
       +
         ];

     

       83
        
       

     

       84
       +
         postInstall = ''

     

       85
       +
           # Prevent kernel modules from depending on the Linux -dev output.

     

       86
       +
           nuke-refs $(find $out -name "*.ko")

     

       87
       +
         '' + optionalString buildUser ''

     

       88
       +
           # Remove provided services as they are buggy

     

       89
       +
           rm $out/etc/systemd/system/zfs-import-*.service

     

       90
        
       

     

       91
       +
           sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       92
        
       

     

       93
       +
           for i in $out/etc/systemd/system/*; do

     

       94
       +
           substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"

     

       95
       +
           done

     

       96
        
       

     

       97
       +
           # Fix pkgconfig.

     

       98
       +
           ln -s ../share/pkgconfig $out/lib/pkgconfig

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       99
        
       

     

       100
       +
           # Remove tests because they add a runtime dependency on gcc

     

       101
       +
           rm -rf $out/share/zfs/zfs-tests

     

       102
       +
         '';

     

       103
        
       

     

       104
       +
         meta = {

     

       105
       +
           description = "ZFS Filesystem Linux Kernel module";

     

       106
       +
           longDescription = ''

     

       107
       +
             ZFS is a filesystem that combines a logical volume manager with a

     

       108
       +
             Copy-On-Write filesystem with data integrity detection and repair,

     

       109
       +
             snapshotting, cloning, block devices, deduplication, and more.

     

       110
       +
           '';

     

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

     

       112
       +
           license = licenses.cddl;

     

       113
       +
           platforms = platforms.linux;

     

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

     

       115
       +
         };

     

       116
       +
       }

+6 -12

pkgs/top-level/all-packages.nix

···

       12250
        
       

     

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

     

       12252
        
       

     

       12253
       -
           inherit (callPackage ../os-specific/linux/spl {

     

       12254
        
             configFile = "kernel";

     

       12255
        
             inherit kernel;

     

       12256
       -
           }) splStable splUnstable;

     

       12257
       -
       

     

       12258
       -
           spl = splStable;

     

       12259
        
       

     

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

     

       12261
        
       

     
···

       12279
        
       

     

       12280
        
           x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };

     

       12281
        
       

     

       12282
       -
           inherit (callPackage ../os-specific/linux/zfs {

     

       12283
        
             configFile = "kernel";

     

       12284
        
             inherit kernel spl;

     

       12285
       -
           }) zfsStable zfsUnstable;

     

       12286
       -
       

     

       12287
       -
           zfs = zfsStable;

     

       12288
        
         });

     

       12289
        
       

     

       12290
        
         # The current default kernel / kernel modules.

     
···

       12593
        
       

     

       12594
        
         statifier = callPackage ../os-specific/linux/statifier { };

     

       12595
        
       

     

       12596
       -
         inherit (callPackage ../os-specific/linux/spl {

     

       12597
        
           configFile = "user";

     

       12598
       -
         }) splStable splUnstable;

     

       12599
       -
       

     

       12600
       -
         spl = splStable;

     

       12601
        
       

     

       12602
        
         sysdig = callPackage ../os-specific/linux/sysdig {

     

       12603
        
           kernel = null;

···

       12250
        
       

     

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

     

       12252
        
       

     

       12253
       +
           spl = callPackage ../os-specific/linux/spl {

     

       12254
        
             configFile = "kernel";

     

       12255
        
             inherit kernel;

     

       12256
       +
           };

     

       0
        
       
     

       0
        
       
     

       12257
        
       

     

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

     

       12259
        
       

     
···

       12277
        
       

     

       12278
        
           x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };

     

       12279
        
       

     

       12280
       +
           zfs = callPackage ../os-specific/linux/zfs {

     

       12281
        
             configFile = "kernel";

     

       12282
        
             inherit kernel spl;

     

       12283
       +
           };

     

       0
        
       
     

       0
        
       
     

       12284
        
         });

     

       12285
        
       

     

       12286
        
         # The current default kernel / kernel modules.

     
···

       12589
        
       

     

       12590
        
         statifier = callPackage ../os-specific/linux/statifier { };

     

       12591
        
       

     

       12592
       +
         spl = callPackage ../os-specific/linux/spl {

     

       12593
        
           configFile = "user";

     

       12594
       +
         };

     

       0
        
       
     

       0
        
       
     

       12595
        
       

     

       12596
        
         sysdig = callPackage ../os-specific/linux/sysdig {

     

       12597
        
           kernel = null;