pyrox.dev
Merge pull request #862 from jcumming/zfs.130823
zfs-0.6.2 and spl-0.6.2
+5
-3
pkgs/os-specific/linux/spl/default.nix
+5
-3
pkgs/os-specific/linux/spl/default.nix
···
1
1
{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
2
2
3
3
stdenv.mkDerivation {
4
-
name = "spl-0.6.1-${kernelDev.version}";
4
+
name = "spl-0.6.2-${kernelDev.version}";
5
5
src = fetchurl {
6
-
url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz";
7
-
sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb";
6
+
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz;
7
+
sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
8
8
};
9
9
10
10
patches = [ ./install_prefix.patch ];
···
26
26
--with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
27
27
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
28
28
'';
29
+
30
+
enableParallelBuilding = true;
29
31
30
32
meta = {
31
33
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+5
-3
pkgs/os-specific/linux/zfs/default.nix
+5
-3
pkgs/os-specific/linux/zfs/default.nix
···
1
1
{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
2
2
3
3
stdenv.mkDerivation {
4
-
name = "zfs-0.6.1-${kernelDev.version}";
4
+
name = "zfs-0.6.2-${kernelDev.version}";
5
5
6
6
src = fetchurl {
7
-
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
8
-
sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
7
+
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz;
8
+
sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
9
9
};
10
10
11
11
patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
···
32
32
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
33
33
--with-spl=${spl}/libexec/spl
34
34
'';
35
+
36
+
enableParallelBuilding = true;
35
37
36
38
meta = {
37
39
description = "ZFS Filesystem Linux Kernel module";