diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-11 23:31:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-11 23:31:33 +0200 |
| commit | 8249695b618204efe142e2de9db289f989d270ad (patch) | |
| tree | dad41af95ba4d16bc6640503d003d36d9e1debf2 /pkgs/development/compilers | |
| parent | 7d9607f1511bfe496fcd77ef735e7fc7f1c6eb9f (diff) | |
| parent | 6640000cb7148ba39bbdcca8e0cd7f5c224bce57 (diff) | |
| download | nixlib-8249695b618204efe142e2de9db289f989d270ad.tar nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.gz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.bz2 nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.lz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.xz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.zst nixlib-8249695b618204efe142e2de9db289f989d270ad.zip | |
Merge branch 'master' into x-updates
Needed that to fix the tarball.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/mono/default.nix | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d95e161ba238..6713dd12b3cd 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -333,6 +333,7 @@ stdenv.mkDerivation ({ crossAttrs = { patches = patches ++ [ ./hurd-sigrtmin.patch ]; + postPatch = ""; AR = "${stdenv.cross.config}-ar"; LD = "${stdenv.cross.config}-ld"; CC = "${stdenv.cross.config}-gcc"; diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index f59bb2cac403..47b13700b8ac 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}: -stdenv.mkDerivation { - name = "mono-2.10.8.1"; +stdenv.mkDerivation rec { + name = "mono-2.11.4"; src = fetchurl { - url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz; - sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x"; + url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr"; }; buildInputs = [bison pkgconfig glib gettext perl libgdiplus]; |