Merge remote-tracking branch 'origin/master' into closure-size

10 files changed, 135 insertions, 262 deletions

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 4f887f511ae1..f4870d7bfbbd 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     homepage = "http://ngspice.sourceforge.net";
     license = with licenses; [ "BSD" gpl2 ];
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 63b757945d29..f0be5258ce45 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -1,24 +1,23 @@
-args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args;
-let version = lib.attrByPath ["version"] "1.1.0" args; in
-rec {
+{ stdenv, fetchurl, libglade, gtk, guile, libxml2, perl
+, intltool, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "drgeo-${version}";
+  version = "1.1.0";
+
   src = fetchurl {
-    url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz;
+    url = "mirror://sourceforge/ofset/${name}.tar.gz";
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
+  patches = [ ./struct.patch ];
 
   buildInputs = [libglade gtk guile libxml2
     perl intltool libtool pkgconfig];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "doConfigure" "doPreBuild" "doMakeInstall"];
-  patches = [ ./struct.patch ];
 
-  doPreBuild = fullDepEntry (''
+  prebuild = ''
     cp drgeo.desktop.in drgeo.desktop
-  '') ["minInit" "doUnpack"];
+  '';
 
-  name = "drgeo-" + version;
   meta = {
     description = "Interactive geometry program";
   };
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
index 2afa18d40a4b..48013bfc4014 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -6,7 +6,7 @@
 {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
-  version = "8.5b2";
+  version = "8.5b3";
   coq-version = "8.5";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   inherit ocaml camlp5;
 
   src = fetchurl {
-    url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz;
-    sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v";
+    url = https://coq.inria.fr/distrib/V8.5beta3/files/coq-8.5beta3.tar.gz;
+    sha256 = "12nnvfz5rsz660j4knhfhfbwq49y2va0rgfrxyiyrr1q4ic84wn6";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index ce6e039c5b1b..505d09ef3903 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -1,48 +1,27 @@
-x@{builderDefsPackage
-  , flex, bison, gmp, perl
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["gmp"];
+{ stdenv, fetchurl, flex, bison, gmp, perl }:
 
-  buildInputs = (map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)))
-    ++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))];
-  sourceInfo = rec {
-    baseName="cvc3";
-    version="2.4.1";
-    name="${baseName}-${version}";
-    url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
-    hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+    name = "cvc3-${version}";
+    version = "2.4.1";
+
+    src = fetchurl {
+      url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
+      sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
+    };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ gmp flex bison perl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixPaths" "doConfigure" "doMakeInstall"];
-  fixPaths = a.fullDepEntry (''
+  preConfigure = ''
     sed -e "s@ /bin/bash@bash@g" -i Makefile.std
     find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'
-  '') ["minInit" "doUnpack"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A prover for satisfiability modulo theory (SMT)";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.free;
+    maintainers = with maintainers;
+      [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.free;
     homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";
   };
   passthru = {
@@ -50,4 +29,4 @@ rec {
       downloadPage = "http://www.cs.nyu.edu/acsys/cvc3/download.html";
     };
   };
-}) x
+}
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index e03b33fa43cc..fe906fbe3578 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,35 +1,19 @@
-x@{builderDefsPackage
-  , ocaml, eprover
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, ocaml, eprover }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="iprover";
-    version="0.8.1";
-    name="${baseName}_v${version}";
-    url="http://${baseName}.googlecode.com/files/${name}.tar.gz";
-    hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "iprover-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz";
+    sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
   };
 
-  name = "${sourceInfo.baseName}-${sourceInfo.version}";
-  inherit buildInputs;
+  buildInputs = [ ocaml eprover ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMake" "doDeploy"];
-  configureCommand = "sh configure";
-  doDeploy = a.fullDepEntry (''
+  preConfigure = ''patchShebangs .'';
+
+  installPhase = ''
     mkdir -p "$out/bin"
     cp iproveropt "$out/bin"
 
@@ -37,22 +21,16 @@ rec {
     cp *.p "$out/share/${name}"
     echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
     chmod a+x  "$out"/bin/iprover
-  '') ["defEnsureDir" "minInit" "doMake"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An automated first-order logic theorem prover";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = with a.lib.licenses;
-      gpl3;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://code.google.com/p/iprover/downloads/list";
-    };
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    downloadPage = "http://code.google.com/p/iprover/downloads/list";
   };
-}) x
+}
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index 62e11651175f..6129eaadc891 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -1,47 +1,25 @@
-x@{builderDefsPackage
-  , automake, libtool, autoconf, intltool, perl
-  , gmpxx, flex, bison
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, automake, libtool, autoconf, intltool, perl
+, gmpxx, flex, bison
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="opensmt";
-    version="20101017";
-    name="${baseName}-${version}";
-    filename="${baseName}_src_${version}";
-    url="http://${baseName}.googlecode.com/files/${filename}.tgz";
-    hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "opensmt-${version}";
+  version = "20101017";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "http://opensmt.googlecode.com/files/opensmt_src_${version}.tgz";
+    sha256 = "0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"];
+  buildInputs = [ automake libtool autoconf intltool perl gmpxx flex bison ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A satisfiability modulo theory (SMT) solver";
-    maintainers = [ a.lib.maintainers.raskin ];
-    platforms = a.lib.platforms.linux;
-    license = a.stdenv.lib.licenses.gpl3;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
     homepage = "http://code.google.com/p/opensmt/";
     broken = true;
+    downloadPage = "http://code.google.com/p/opensmt/downloads/list";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://code.google.com/p/opensmt/downloads/list";
-    };
-  };
-}) x
+}
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
index 5327ed6a42aa..24da52b9d07c 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/applications/science/logic/spass/default.nix
@@ -1,49 +1,27 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="spass";
-    baseVersion="3";
-    minorVersion="7";
-    version="${baseVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="http://www.spass-prover.org/download/sources/${baseName}${baseVersion}${minorVersion}.tgz";
-    hash="1k5a98kr3vzga54zs7slwwaaf6v6agk1yfcayd8bl55q15g7xihk";
-  };
+let
+  baseVersion="3";
+  minorVersion="7";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+stdenv.mkDerivation rec {
+  name = "spass-${version}";
+  version = "${baseVersion}.${minorVersion}";
+
+  src = fetchurl {
+    url = "http://www.spass-prover.org/download/sources/spass${baseVersion}${minorVersion}.tgz";
+    sha256 = "1k5a98kr3vzga54zs7slwwaaf6v6agk1yfcayd8bl55q15g7xihk";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "An automated theorem preover for FOL";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.bsd2;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.spass-prover.org/download/index.html";
-    };
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    downloadPage = "http://www.spass-prover.org/download/index.html";
   };
-}) x
-
+}
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 79bfef08bb50..7c8e76d676b7 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
 , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
-, imake, which, jdk, openblas
+, imake, which, jdk, openblas, curl
 , withRecommendedPackages ? true
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt
     libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
     texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk openblas
+    which jdk openblas curl
   ];
 
   patches = [ ./no-usr-local-search-paths.patch
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index e810879eba60..dcd0734d85d9 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -1,68 +1,50 @@
-x@{builderDefsPackage
-  , pari ? null
-  , ...}:
-builderDefsPackage
-(a :
+{ stdenv, fetchurl, pari ? null }:
+
 let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+  baseName = "gap";
+  version = "4r4p12";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="gap";
-    version="4r4p12";
-    name="${baseName}-${version}";
-    url="ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/${baseName}${version}.tar.gz";
-    hash="0flap5lbkvpms3zznq1zwxyxyj0ax3fk7m24f3bvhvr37vyxnf40";
-    pkgVer="2012_01_12-10_47_UTC";
-    pkgURL="ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages-${pkgVer}.tar.bz2";
-    pkgHash="0z9ncy1m5gvv4llkclxd1vpcgpb0b81a2pfmnhzvw8x708frhmnb";
+  pkgVer = "2012_01_12-10_47_UTC";
+  pkgSrc = fetchurl {
+    url = "ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages-${pkgVer}.tar.bz2";
+    sha256 = "0z9ncy1m5gvv4llkclxd1vpcgpb0b81a2pfmnhzvw8x708frhmnb";
   };
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
 
-  pkgSrc = a.fetchurl {
-    url=sourceInfo.pkgURL;
-    sha256=sourceInfo.pkgHash;
-  };
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/${baseName}${version}.tar.gz";
+    sha256 = "0flap5lbkvpms3zznq1zwxyxyj0ax3fk7m24f3bvhvr37vyxnf40";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMake" "doDeploy"];
+  buildInputs = [ pari ];
 
-  doDeploy = a.fullDepEntry ''
+  installPhase = ''
     mkdir -p "$out/bin" "$out/share/gap/"
 
     cp -r . "$out/share/gap/build-dir"
 
     tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg"
 
-    ${if a.pari != null then
+    ${if pari != null then
       ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" ''
     else ""}
     sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh"
 
     ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin"
-  '' ["doMake" "minInit" "defEnsureDir"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Computational discrete algebra system";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = with a.lib.licenses;
-      gpl2;
-    homepage = "http://gap-system.org/";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    homepage = http://gap-system.org/;
     broken = true;
   };
-}) x
+}
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 1afb510e9948..8bae1d6206d0 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,55 +1,34 @@
-x@{builderDefsPackage
-  , gmp, bison, perl, autoconf, ncurses, readline
-  , coreutils
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="Singular";
-    version="3-1-2";
-    revision="-1";
-    name="${baseName}-${version}${revision}";
-    url="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/${name}.tar.gz";
-    hash="04f9i1xar0r7qrrbfki1h9rrmx5y2xg4w7rrvlbx05v2dy6s8djv";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "singular-${version}";
+  version="3-1-2";
+
+  src = fetchurl {
+    url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/${name}.tar.gz";
+    sha256 = "04f9i1xar0r7qrrbfki1h9rrmx5y2xg4w7rrvlbx05v2dy6s8djv";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ gmp bison perl autoconf ncurses readline coreutils ];
+
+  preConfigure = ''
+    find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
+    find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
+  '';
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall" "fixInstall"];
-  doFixPaths = a.fullDepEntry (''
-    find . -exec sed -e 's@/bin/rm@${a.coreutils}&@g' -i '{}' ';'
-    find . -exec sed -e 's@/bin/uname@${a.coreutils}&@g' -i '{}' ';'
-  '') ["minInit" "doUnpack"];
-  fixInstall = a.fullDepEntry (''
+  postInstall = ''
     rm -rf "$out/LIB"
     cp -r Singular/LIB "$out"
     mkdir -p "$out/bin"
     ln -s "$out/"*/Singular "$out/bin"
-  '') ["minInit" "defEnsureDir"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A CAS for polynomial computations";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
+    maintainers = with maintainers;
+      [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
     homepage = "http://www.singular.uni-kl.de/index.php";
   };
   passthru = {
@@ -57,4 +36,4 @@ rec {
       downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
     };
   };
-}) x
+}