Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra
2013-01-17 14:19:14 +01:00
120 changed files with 2870 additions and 471 deletions

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libuuid }:
stdenv.mkDerivation rec {
name = "jfsutils-1.1.12";
name = "jfsutils-1.1.15";
src = fetchurl {
url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz";
sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50";
};
buildInputs = [ libuuid ];

View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "reiserfsprogs-3.6.21";
src = fetchurl {
url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2";
url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
};