diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-08-27 00:31:55 -0700 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-08-27 00:31:55 -0700 |
| commit | c6f88edebeb6bd32a3363b55736be724b09642ef (patch) | |
| tree | e194bafb91cbee9b1a993b7e16129b2414c592fd /pkgs/os-specific/linux | |
| parent | eba178ad5264b2ce5722ddd841ece2bd233bb002 (diff) | |
| parent | fc101c01a537b087e146ac91defb20464b4edcca (diff) | |
Merge pull request #862 from jcumming/zfs.130823
zfs-0.6.2 and spl-0.6.2
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 75ff28939722b..6a9a4cc963fab 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.1-${kernelDev.version}"; + name = "spl-0.6.2-${kernelDev.version}"; src = fetchurl { - url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz"; - sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz; + sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; }; patches = [ ./install_prefix.patch ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation { --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build ''; + enableParallelBuilding = true; + meta = { description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ac07474d3f4b8..06615d170a17c 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.1-${kernelDev.version}"; + name = "zfs-0.6.2-${kernelDev.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz; - sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz; + sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation { --with-spl=${spl}/libexec/spl ''; + enableParallelBuilding = true; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' |