Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.

2 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 0dbab841a81b..b97314f02d1d 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
     "--with-gmp=${gmp} " +
     "--with-readline=${readline}";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Computer algebra system for high-performance number theory computations";
     homepage    = "http://pari.math.u-bordeaux.fr/";
-    license     = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ertes raskin];
-    platforms   = stdenv.lib.platforms.linux;
+    license     = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ ertes raskin ];
+    platforms   = platforms.linux;
 
     inherit version;
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index dee33a04be22..e2f34d48de27 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
 
   buildFlags = "VERBOSE=1";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage    = "http://speedcrunch.digitalfanatics.org";
-    license     = "GPLv2+";
+    license     = with licenses; gpl2Plus;
     description = "A fast power user calculator";
     longDescription = ''
       SpeedCrunch is a fast, high precision and powerful desktop calculator.