From 007f80c1d0440b89970000b92f78ce76186d99a5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 6 Nov 2014 00:44:33 +0000
Subject: Turn more licenses into lib.licenses style

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
---
 pkgs/applications/science/logic/cvc3/default.nix     | 11 +++++------
 pkgs/applications/science/logic/ott/default.nix      |  2 +-
 pkgs/applications/science/logic/satallax/default.nix | 13 ++++++-------
 pkgs/applications/science/logic/twelf/default.nix    |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'pkgs/applications/science/logic')

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;
   };
-- 
cgit 1.4.1