Merge branch 'master' into x-updates.

This commit is contained in:
Peter Simons
2012-10-10 19:26:31 +02:00
5 changed files with 45 additions and 24 deletions
@@ -1,7 +1,7 @@
rec {
version="2.18";
name="asymptote-2.18";
hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m";
version="2.20";
name="asymptote-2.20";
hash="0ji45v0d9jps8clsl86pvmr22acci3f0ciicmyzak6dbczqyrj80";
url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.20/asymptote-2.20.src.tgz";
}
+3 -3
View File
@@ -7,14 +7,14 @@ let
};
in
stdenv.mkDerivation rec {
name = "smartmontools-5.43";
name = "smartmontools-6.0";
src = fetchurl {
url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
};
patchPhase = "cp ${driverdb} drivedb.h";
# patchPhase = "cp ${driverdb} drivedb.h";
meta = {
description = "Tools for monitoring the health of hard drivers";