diff options
Diffstat (limited to 'pkgs/applications/science/math')
13 files changed, 9 insertions, 22 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 25ebee96a103..913fac6ac128 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 -, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false }: diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 07740f4c8aea..fe5c77be8b22 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, cudatoolkit, nvidia_x11 diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 29785363b048..e62df7f11cc7 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 6a49976c86b8..4884ee1f93ab 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib , libxml2 , libuuid }: diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c4fd0c384c14..d60feb54695d 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -7,13 +7,11 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl , unixODBC , xorg -, zlib }: let diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d2a518e9db0b..fa4ff8b00687 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -8,7 +8,6 @@ , freetype , gcc , glib -, libpng , ncurses , opencv , openssl diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 2ed079ab32bc..288ffd6e0e1a 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -1,5 +1,4 @@ -{ stdenv -, writeTextFile +{ writeTextFile , pari_data , pari , singular diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix index ba46850bbc61..f4669a6557e9 100644 --- a/pkgs/applications/science/math/sage/openblas-pc.nix +++ b/pkgs/applications/science/math/sage/openblas-pc.nix @@ -1,5 +1,4 @@ -{ stdenv -, openblasCompat +{ openblasCompat , writeTextFile , name }: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 3d1ebe87c6b7..63b9772b8231 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -3,8 +3,6 @@ , makeWrapper , sage-env , sage-src -, sagelib -, sagedoc , openblasCompat , openblas-blas-pc , openblas-cblas-pc @@ -14,7 +12,6 @@ , singular , libgap , gap-libgap-compatible -, gcc , giac , maxima-ecl , pari diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 7b280e9e0280..a594428a389a 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,7 +1,5 @@ -{ pkgs -, stdenv +{ stdenv , sage-src -, env-locations , sage-with-env , sagelib , python2 diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index a053d997bf9a..abcefba5e260 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -1,5 +1,4 @@ -{ stdenv -, sage-src +{ sage-src , perl , buildPythonPackage , arb diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index fcdbb6b985d6..6063a45a3efb 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, lib, gfortran , ncurses -, Xaw3d, withXaw3d ? false +, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false , gtk2, withGtk ? false # working ? diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index cec1a831c912..8be302f41e5e 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig +{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig , autoreconfHook , file , flint |