diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/applications/science | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
download | nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/applications/science')
7 files changed, 18 insertions, 20 deletions
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 07b87e3cf073..ce6e039c5b1b 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , flex, bison, gmp, perl , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["gmp"]; buildInputs = (map (n: builtins.getAttr n x) @@ -33,7 +33,7 @@ rec { 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 = { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with a.lib.maintainers; @@ -42,7 +42,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { @@ -51,4 +51,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index afe827f3ad98..293381d2888b 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { target-system terms. ''; homepage = http://www.cl.cam.ac.uk/~pes20/ott; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 2126a4d76d63..89a214c3f474 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , sbcl, zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,11 +47,11 @@ rec { sbcl --load make.lisp ! ( ./test | grep ERROR ) - + mkdir -p "$out/bin" cp bin/satallax "$out/bin" '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; - + meta = { description = "A higher-order logic prover"; maintainers = with a.lib.maintainers; @@ -60,7 +60,7 @@ rec { ]; platforms = with a.lib.platforms; unix; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; }; passthru = { @@ -69,4 +69,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index f9680b475797..4d97f0480bb3 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Standard ML. ''; homepage = http://twelf.org/wiki/Main_Page; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 75448b6965cd..06eceea65c95 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "13.04.2"; + version = "14.09.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz"; - sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99"; + url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; + sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 4c93eef2b1c0..7a534fce4f67 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 2e25ff582ee9..42c72fa47d41 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { homepage = http://vite.gforge.inria.fr/; - license = "CeCILL-A"; + license = stdenv.lib.licenses.cecill20; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice |