svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
parent 9ee0a9df9b 5fe8b64cea
commit 0c79434ccb
103 changed files with 1256 additions and 357 deletions
@@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "urweb";
-  version = "20111127";
+  version = "20120110";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj";
+    sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j";
  };

  buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];