diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 20:40:45 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-08-14 14:12:07 +0200 |
| commit | 4360a87c45f69f7444c7b87546705de7fbc8681f (patch) | |
| tree | 321157050a1e1e1ecccce78ae497ff179daa6503 /pkgs/os-specific/linux/zfs | |
| parent | 43595c7884533769a68f92359ca13f06dd62af97 (diff) | |
| download | nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.gz nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.bz2 nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.lz nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.xz nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.zst nixpkgs-4360a87c45f69f7444c7b87546705de7fbc8681f.zip | |
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
spl was merged into zfs master
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 9a1baf8f7b9..776842da1dc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null +, kernel ? null, spl ? null }: with stdenv.lib; @@ -51,7 +51,7 @@ let ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -93,7 +93,7 @@ let configureFlags = [ "--with-config=${configFile}" - ] ++ optionals buildUser [ + ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" @@ -103,10 +103,11 @@ let "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" + ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] ++ optionals (buildKernel && spl != null) [ + "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -179,19 +180,19 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-05-22"; + version = "2018-08-13"; - rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20"; - sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0"; + rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c"; + sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch"; + sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; }) ]; - spl = splUnstable; + spl = null; }; } |