From b2d7f4b1ba937951fefdd026314512ab0be91508 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2015 21:56:04 +0200 Subject: 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. --- pkgs/applications/science/electronics/ngspice/default.nix | 8 ++++---- pkgs/applications/science/math/pari/default.nix | 8 ++++---- pkgs/applications/science/math/speedcrunch/default.nix | 4 ++-- pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 493af97d1567..e64ea909cbb9 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation { configureFlags = [ "--enable-x" "--with-x" "--with-readline" ]; - meta = { + meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; - license = ["BSD" "GPLv2"]; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = with licenses; [ "BSD" gpl2 ]; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } 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. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 879690bc91ed..bb851140b45d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gromacs.org"; - license = "GPLv2"; + license = with licenses; gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, -- cgit 1.4.1