summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-04 09:54:17 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-04 09:54:17 +0000
commit3d61c49b42ffedcdb87556e244d1648f912548c2 (patch)
tree3188e44601d74cbc1057f790f6821c40eaefaad2 /pkgs/development
parentec3f38712af82cb7cfe3cf7125b3d2628b414526 (diff)
parent855e8f45a4f46e409a911715add088d0a8873274 (diff)
downloadnixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar.gz
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar.bz2
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar.lz
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar.xz
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.tar.zst
nixlib-3d61c49b42ffedcdb87556e244d1648f912548c2.zip
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/mono/default.nix6
-rw-r--r--pkgs/development/interpreters/lua-5/default.nix1
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index ee415e3b07b2..471f0d5b36d1 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}:
 
 stdenv.mkDerivation {
-  name = "mono-2.8";
+  name = "mono-2.10.8.1";
   src = fetchurl {
-    url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2;
-    sha256 = "04bivxg90mmihkp72sjshl4ijbjcbl9f6hdgm476zy794g5rwd78";
+    url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
+    sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl];
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 19a5599347ff..06703e12210d 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation {
         -e "s/ ranlib/$crossConfig-ranlib/" \
         src/Makefile
     '';
+    dontStrip = true;
   };
 
   meta = {