Merge pull request #224 from jcumming/zfs.121221

zfs-0.6.0-rc13, spl-0.6.0-rc13
This commit is contained in:
David Guibert 2012-12-23 05:37:36 -08:00
commit 4b2e8aa30e
2 changed files with 6 additions and 6 deletions

View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "spl-0.6.0-rc12-${kernel.version}"; name = "spl-0.6.0-rc13-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz; url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk"; sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
}; };
patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zfs-0.6.0-rc12-${kernel.version}"; name = "zfs-0.6.0-rc13-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz; url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y"; sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
}; };
patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];