Merging from trunk.

I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251

pkgs/tools/misc/less/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
  
 stdenv.mkDerivation {
-  name = "less-418";
+  name = "less-436";
  
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-418.tar.gz;
-    sha256 = "1d03n4wx8y1gmf2m8yawzg6ixmfrixcai5l14p9pj8q13gbgqcpm";
+    url = http://www.greenwoodsoftware.com/less/less-436.tar.gz;
+    sha256 = "1lilcx6qrfr2dqahv7r10j9h2v86w5sb7m8wrx2sza9ifkq6z8ap";
   };
  
   buildInputs = [ncurses];

pkgs/tools/misc/remind/default.nix

@@ -1,15 +1,17 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation {
-  name = "remind-3.1.6";
+  name = "remind-3.1.8";
   src = fetchurl {
-    url = http://www.roaringpenguin.com/files/download/remind-03.01.06.tar.gz;
-    sha256 = "acdf73904c95de55b615d80c7c007abe58d75e41978a16a43333a22583ac7738";
+    url = http://www.roaringpenguin.com/files/download/remind-03.01.08.tar.gz;
+    sha256 = "0gvizrpkbanm515bhd6mq9xxs4g4ji9pplswaj4plaqsk3yw0qjw";
   };
 
   meta = {
     homepage = http://www.roaringpenguin.com/products/remind;
     description = "Sophisticated calendar and alarm program for the console";
     license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/misc/screen/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "screen-4.0.2";
+  name = "screen-4.0.3";
   src = fetchurl {
-    url = mirror://gnu/screen/screen-4.0.2.tar.gz;
-    md5 = "ed68ea9b43d9fba0972cb017a24940a1";
+    url = mirror://gnu/screen/screen-4.0.3.tar.gz;
+    sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q";
   };
 
   buildInputs = [ncurses];