diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:44:33 +0000 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:48:16 +0000 |
commit | 007f80c1d0440b89970000b92f78ce76186d99a5 (patch) | |
tree | 4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/applications/science | |
parent | d91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff) | |
download | nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2 nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst nixpkgs-007f80c1d0440b89970000b92f78ce76186d99a5.zip |
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/cvc3/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/science/logic/ott/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/logic/satallax/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/science/logic/twelf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/misc/fityk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/misc/vite/default.nix | 2 |
6 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 07b87e3cf07..ce6e039c5b1 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 afe827f3ad9..293381d2888 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 2126a4d76d6..89a214c3f47 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 f9680b47579..4d97f0480bb 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/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 4c93eef2b1c..7a534fce4f6 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 2e25ff582ee..42c72fa47d4 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 |