MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #862 from jcumming/zfs.130823

Browse source 
zfs-0.6.2 and spl-0.6.2
This commit is contained in:
Evgeny Egorochkin 2013-08-27 00:31:55 -07:00
commit c6f88edebe
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/spl/default.nix
View file

@ -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)";

8
pkgs/os-specific/linux/zfs/default.nix
View file

@ -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 = ''