public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
This commit is contained in:
Yury G. Kudryashov
2012-01-02 14:12:40 +00:00
parent f77741e018 7928d532a2
commit 08761e83fc
83 changed files with 866 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/clean/default.nix
+5 -5
View File
@@ -1,16 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "clean-2.3";
name = "clean-2.4";
src =
if stdenv.system == "i686-linux" then (fetchurl {
url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz";
sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h";
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
})
else if stdenv.system == "x86_64-linux" then (fetchurl {
url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz";
sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj";
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
})
else throw "Architecture not supported";
pkgs/development/compilers/ghc/head.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
version = "7.3.20111212";
version = "7.4.0.20111219";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
};
buildInputs = [ghc perl gmp ncurses] ++