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 | |
| 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
187 files changed, 835 insertions, 791 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 46fa783b4bd..75a8149b7b9 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -14,6 +14,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { * add it to this list. The URL mentioned above is a good source for inspiration. */ + afl21 = spdx { + spdxId = "AFL-2.1"; + fullName = "Academic Free License"; + }; + agpl3 = spdx { spdxId = "AGPL-3.0"; fullName = "GNU Affero General Public License v3.0"; @@ -40,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Apple Public Source License 2.0"; }; + artistic1 = spdx { + spdxId = "Artistic-1.0"; + fullName = "Artistic License 1.0"; + }; + artistic2 = spdx { spdxId = "Artistic-2.0"; fullName = "Artistic License 2.0"; @@ -72,7 +82,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { cc0 = spdx { spdxId = "CC0-1.0"; - fullName = ''Creative Commons Zero v1.0 Universal''; + fullName = "Creative Commons Zero v1.0 Universal"; }; cc-by-30 = spdx { @@ -124,11 +134,21 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Unspecified free software license"; }; + gpl1Plus = spdx { + spdxId = "GPL-1.0+"; + fullName = "GNU General Public License v1.0 or later"; + }; + gpl2 = spdx { spdxId = "GPL-2.0"; fullName = "GNU General Public License v2.0 only"; }; + gpl2ClasspathPlus = { + fullName = "GNU General Public License v2.0 or later (with Classpath exception)"; + url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; + }; + gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; url = http://www.mysql.com/about/legal/licensing/foss-exception; @@ -154,6 +174,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; + # Intel's license, seems free + iasl = { + fullName = "iASL"; + url = http://www.calculate-linux.org/packages/licenses/iASL; + }; + inria = { fullName = "INRIA Non-Commercial License Agreement"; url = "http://compcert.inria.fr/doc/LICENSE"; @@ -219,6 +245,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { url = http://opensource.franz.com/preamble.html; }; + lppl12 = spdx { + spdxId = "LPPL-1.2"; + fullName = "LaTeX Project Public License v1.2"; + }; + lpl-102 = spdx { spdxId = "LPL-1.02"; fullName = "Lucent Public License v1.02"; @@ -261,6 +292,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; + php301 = spdx { + spdxId = "PHP-3.01"; + fullName = "PHP License v3.01"; + }; + postgresql = spdx { spdxId = "PostgreSQL"; fullName = "PostgreSQL License"; @@ -276,6 +312,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Public Domain"; }; + qpl = spdx { + spdxId = "QPL-1.0"; + fullName = "Q Public License 1.0"; + }; + + qwt = { + fullName = "Qwt License, Version 1.0"; + url = http://qwt.sourceforge.net/qwtlicense.html; + }; + + ruby = spdx { + spdxId = "Ruby"; + fullName = "Ruby License"; + }; + + sgi-b-20 = spdx { + spdxId = "SGI-B-2.0"; + fullName = "SGI Free Software License B v2.0"; + }; + sleepycat = spdx { spdxId = "Sleepycat"; fullName = "Sleepycat License"; @@ -307,11 +363,26 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "The Unlicense"; }; + vsl10 = spdx { + spdxId = "VSL-1.0"; + fullName = "Vovida Software License v1.0"; + }; + + w3c = spdx { + spdxId = "W3C"; + fullName = "W3C Software Notice and License"; + }; + wadalab = { fullName = "Wadalab Font License"; url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; }; + wtfpl = spdx { + spdxId = "WTFPL"; + fullName = "Do What The F*ck You Want To Public License"; + }; + zlib = spdx { spdxId = "Zlib"; fullName = "zlib License"; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index de5ef055125..ebe847353dd 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { for you. Listen directly on your computer or on your mobile devices. ''; homepage = "http://gpodder.org/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.skeidel ]; }; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index b1970a998d5..08d91498cc0 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; homepage = http://sourceforge.net/projects/mp3splt/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bosu ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 3e365cae8e9..717262dbcb5 100755 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; homepage = https://github.com/boysetsfrog/vimpc; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index e1d2ad69b1d..0850dd0e7be 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://elvis.vi-editor.org/; description = "A vi clone for Unix and other operating systems"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix index 32a036805ed..96d7619d387 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { interactive theorem provers), based on the customizable text editor Emacs. ''; homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 6901aed774b..45a527c7484 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 81e0dd35db9..ee9b775453c 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.bostic.com/vi/; description = "The Berkeley Vi Editor"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 41a4b102a6f..f1ca27eed80 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cinepaint.org/; - license = "free"; + license = stdenv.lib.licenses.free; description = "Image editor which supports images over 8bpp and ICC profiles"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bd155c59c6b..9f7643ad1c0 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7139bc71f3c..c5350228dcf 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,7 +59,7 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license @@ -174,10 +174,10 @@ rec { sourceRoot = "${name}/src"; buildPhase = "make gimp"; installPhase = "installPlugins gmic_gimp"; - meta = { + meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; - license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; + license = stdenv.lib.licenses.cecill20; /* The purpose of this Free Software license agreement is to grant users the right to modify and redistribute the software governed by this @@ -197,7 +197,7 @@ rec { # --enable-dst-correction - enable DST correction for file timestamps. # --enable-contrast - enable the contrast setting option. # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. + # --with-lensfun: use the lensfun library - experimental feature, read this before using it. # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index cc42e1c4046..40f8d441d7e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric guibert]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 66fceec9a51..3c146249dd0 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "d4x-2.5.7.1"; - + inherit boost; src = fetchurl { @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ gtk glib pkgconfig openssl boost ]; - meta = { + meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 542f11f6e67..5133ad3c29e 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre, unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -32,11 +32,11 @@ rec { doDeploy = a.fullDepEntry '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${a.stdenv.shell}' >> "$out/bin/vue" - echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" + echo '#!${a.stdenv.shell}' >> "$out/bin/vue" + echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" '' ["addInputs" "defEnsureDir"]; - + meta = { description = "Visual Understanding Environment - mind mapping software"; maintainers = with a.lib.maintainers; @@ -45,7 +45,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; # Apache License fork, actually + license = a.lib.licenses.free; # Apache License fork, actually }; }) x - diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 2bb05fe44e0..15d054c2be2 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Allows testing the fonts available in an X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 06b09154ba5..7584ebf72fb 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Lists the fonts available in the X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 47f0c2f6455..7aa362c613f 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation { installPhase = "make PREFIX=$out install"; - meta = { + meta = { description = "cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = with stdenv.lib.licenses; [ libpng zlib ]; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e1bcbf92367..d0fe7e91989 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; description = "Web browser"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix index 8935aeb2771..fdf11adfb6c 100644 --- a/pkgs/applications/networking/cluster/rq/default.nix +++ b/pkgs/applications/networking/cluster/rq/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.codeforpeople.com/lib/ruby/rq/"; description = "Simple cluster queue runner"; longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions."; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8785837fbb9..092e6f53e49 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } 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 diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index dcfcce1fcf6..562917ec073 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation { done ''; - # usage: + # usage: meta = { description = "import svn, mercurial into git"; homepage = "http://repo.or.cz/w/fast-export.git"; - license = "?"; # the .py file is GPLv2 + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 0fdd78fe106..3fa426d9f6f 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 68b61fc453d..cdc53367d11 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 65a930a261c..f7bddc50ef8 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xbmc.org/; description = "Media center"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.iElectric maintainers.titanous ]; }; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e3fa4f9fc71..c88603892b5 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://larswm.fnurt.net/; description = "9wm-like tiling window manager"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index a56efa35c7c..d6b4829d730 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; homepage = http://delubrum.org/; - license = "SIL"; + license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 2e0f3d5df2a..946efa00b9a 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://en.wikipedia.org/wiki/Open_Sans"; - license = "Apache"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index cc6f9c6b5cc..e3d2cfe0226 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; }; - + installPhase = '' mkdir -p $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; # See `License.txt' for details. - license = "GPLv2 + exception"; + license = stdenv.lib.licenses.gpl2Oss; homepage = https://fedorahosted.org/liberation-fonts/; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 0f29f166d36..f8dca0fd5a3 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; }; - + buildInputs = [fontforge python pythonPackages.fonttools]; installPhase = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # See `License.txt' for details. - license = "GPLv2 + exception"; + license = stdenv.lib.licenses.gpl2Oss; homepage = https://fedorahosted.org/liberation-fonts/; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 8fde0c6ef03..dc5bcb5b9a7 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -37,6 +37,6 @@ rec { maintainers = with a.lib.maintainers; [ relrod ]; platforms = with a.lib.platforms; all; homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/"; - license = "OFL"; + license = a.lib.licenses.ofl; }; }) x diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 130aeef88ab..d64a8883d32 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = http://font.ubuntu.com/; - license = "free"; + license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 52e9ebf0617..94a65f6e63e 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Mobile broadband service provider database"; homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; platforms = stdenv.lib.platforms.all; - license = "CC-PD"; + license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 5bf86ea6b32..59dd4da792b 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = stdenv.lib.platforms.all; - license = "free"; # more free licenses combined + license = stdenv.lib.licenses.free; # more free licenses combined maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 55f64234a32..c3a960388bb 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. ''; - license = "free"; # public domain + license = stdenv.lib.licenses.free; # public domain homepage = http://www.cons.org/cmucl/; }; } diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 3eb9aef528c..a8180947f4a 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten-fastcomp; description = "emscripten llvm"; maintainers = with maintainers; [ bosu ]; - license = "University of Illinois/NCSA Open Source License"; + license = stdenv.lib.licenses.ncsa; }; } diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 09245ba6d4b..973a07b1295 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "Intel ACPI Compiler"; homepage = http://www.acpica.org/; - license = "iasl"; # FIXME: is this a free software license? + license = stdenv.lib.licenses.iasl; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 1b9e9118d56..e098f48a24c 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; - license = "free"; # Combination of LGPL/X11/GPL ? + license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 1d68585d93a..69a6a1f5f67 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "ocaml-3.10.0"; - + src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; }; diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 4313dcd7537..9b340f69e90 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { - + name = "metaocaml-3.09-alpha-30"; - + src = fetchurl { url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.metaocaml.org/; - license = "QPL, LGPL2 (library part)"; + license = with stdenv.lib.licenses; [ qpl lgpl2 ]; desctiption = "A compiled, type-safe, multi-stage programming language"; }; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index a29c0de65b8..dea7d3cd6e8 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; - license = "artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 0f52e879863..19ec3a3a2fb 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.eclipse.org/jdt/core/index.php; # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = "EPLv1.0"; + license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index f70fb164623..ab559aa9e65 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; - license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those + license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index cec0d35bde5..2a8f7ca2c30 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , fetchgit , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["fetchgit"]; buildInputs = map (n: builtins.getAttr n x) @@ -31,7 +31,7 @@ rec { prepareOut = a.fullDepEntry '' mkdir -p "$out/bin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An interpreter of K, APL-like programming language"; maintainers = with a.lib.maintainers; @@ -40,7 +40,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -48,4 +48,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 0edf5e60801..79363f189d0 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. Xdebug could be put in its own derivation. - * / - meta = { - description = "debugging support for PHP"; - homepage = http://xdebug.org; - license = "based on the PHP license - as is"; - }; */ }; @@ -255,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) meta = { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; - license = "PHP-3"; + license = stdenv.lib.licenses.php301; }; patches = [ ./fix-5.4.patch ]; diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 9b43368c617..9f2945dfb76 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; }; diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix index 4c3344f7672..6e85d6c0330 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index afe4cbef79d..39884745635 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index d87526b1570..eb8239086ea 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index e2ee74fac2d..2cefa6b002a 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix index 0f8b2512322..9609a8758f9 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index d7a8708e540..5309d32382c 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -45,7 +45,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -55,4 +55,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index f03dd5b548c..5f67e959230 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -44,7 +44,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -54,4 +54,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 213b086c3cc..6d31087968c 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -43,7 +43,7 @@ rec { meta = { branch = "4"; description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 699030b8fe5..813dd2d8687 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "asio-1.10.4"; - + src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://asio.sourceforge.net/; description = "Cross-platform C++ library for network and low-level I/O programming"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fdfc8b45a68..ea2710c8e56 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; - license = "boost-license"; + license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ simons wkennington ]; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index f489e95f5d4..a520ffd9c0f 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; branch = "0.5.1"; }; passthru = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 35cfae9ebb1..db4c0821336 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "CELT - low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; branch = "0.7"; }; passthru = { @@ -45,4 +45,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index ca25be90504..03eba5a8d25 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -44,4 +44,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix index 3eab580c6a8..818e28b0a76 100644 --- a/pkgs/development/libraries/cppnetlib/default.nix +++ b/pkgs/development/libraries/cppnetlib/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://cpp-netlib.github.com/; description = "Provides application layer network support at boost style"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 3b517d60b27..c326fb7fd38 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = http://cryptopp.com/; - license = "Boost 1.0"; + license = stdenv.lib.licenses.boost; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 9c774e802fc..80afcb343dd 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dbus.freedesktop.org; - license = "AFL-2.1 or GPL-2"; + license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 2c4f8da7783..a058fb9cfa2 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.audiocoding.com/faac.html; # Incompatible with GPL. Some changes to the base code, included in faac, # are under LGPL though. - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 5b1dc6fc0a4..bf690c020cb 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, fast run-time speech synthesis engine"; homepage = http://www.festvox.org/flite/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 04fbb01a3bf..31be86ee13e 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -40,7 +40,7 @@ rec { ''INSTALL_ROOT="$out"'' ''GSM_INSTALL_INC="$out/include/gsm"'' ]; - + meta = { description = "A GSM codec library"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index eff52cc177b..898813be7f8 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/classpath/; # The exception makes it similar to LGPLv2+ AFAICS. - license = "GPLv2+ + exception"; + license = stdenv.lib.licenses.gpl2ClasspathPlus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index ecd63e98f19..ae5d49f2850 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { description = "Image processing and analysis library"; homepage = http://www.leptonica.org/; # Its own license: http://www.leptonica.org/about-the-license.html - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8e68e10d940..de2ab0ff3b1 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; - + src = fetchurl { url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; }; - + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; - + propagatedBuildInputs = [ncurses]; meta = { homepage = http://libcaca.zoy.org/; description = "A graphics library that outputs text instead of pixels"; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 51c23451fec..853786c3404 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { description = "USB CEC adapter communication library"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index da5a080521c..6810c8665a7 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -46,10 +46,9 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/libffi/; # See http://github.com/atgreen/libffi/blob/master/LICENSE . - license = "free, non-copyleft"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 11b3bf4f6d5..eb617ed6b9e 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index caeb87ee694..cbe9e20f0b1 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://libs.suckless.org/libixp; description = "stand-alone client/server 9P library"; - license = "MIT / LPL"; + license = with stdenv.lib.licenses; [ mit lpl-102 ]; }; } diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index bf27e074dd5..07f3d65ffc1 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index d7a1bcb4638..bf2ebb27f37 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, static ? false }: +{ stdenv, fetchurl, static ? false }: with stdenv.lib; stdenv.mkDerivation { name = "libjpeg-8d"; - + src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; configureFlags = optional static "--enable-static --disable-shared"; - + meta = { homepage = http://www.ijg.org/; description = "A library that implements the JPEG image file format"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index b58e2dd257d..234f56863c0 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; - license = "zlib/libpng"; + license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index 2d736411780..1452ec61606 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dnielectronico.es/descargas/; description = "Opensc plugin to access the Spanish national ID smartcard"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index dd19d3f179f..ef194bb0b1e 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sed -e '/curl\/types/d' -i src/*.c src/*.h ''; - meta = { + meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 500acdfb2ec..8c748447ae1 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 1acc7c1d73c..551b31d416e 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index dcef77d5919..af3d03cc661 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Version of NaCl with harwdare tests at runtime, not build time"; - license = "ISC"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 2346e4b7501..3d52fa3ac9d 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools and library for the WebP image format"; /* It has its own licence, google-related, but that looks like BSD */ - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 502329226ff..0ea73a3a57f 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; - license = "bsd"; # SGI-B-2.0, which seems BSD-like + license = stdenv.lib.licenses.sgi-b-20; }; } diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 852d72cb9aa..78932259841 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of cuda-enabled texture tools and compressors"; homepage = "http://developer.nvidia.com/object/texture_tools.html"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 16fb46d1698..78cfeb13a2c 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 3111f71369a..745626e76b0 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; homepage = http://cmusphinx.sourceforge.net; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index a82acd2745d..76ceb12b401 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.qhull.org/; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index c1386277526..8d31978657d 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index fe73e0beabd..aa4f45243e0 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 1bc7eff3181..fa8412ccb6d 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Basic Linear Algebra Subprograms"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; }; } diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index f18107c48a5..1b0039952d7 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -4,7 +4,7 @@ assert stdenv ? gcc && stdenv.gcc.libc != null; stdenv.mkDerivation rec { name = "scmccid-5.0.11"; - + src = if stdenv.system == "i686-linux" then (fetchurl { url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 4c615b81552..02e7dc24159 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = http://people.csail.mit.edu/jaffer/SLIB; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 48168ceb92d..79a633c6541 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , gawk, alsaLib, ncurses , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -28,7 +28,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"]; - + killUsrBin = a.fullDepEntry '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index f1c8a84fee2..5588646e53a 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; homepage = http://sourceforge.net/projects/stlport/; - license = "free"; # seems BSD-like + license = stdenv.lib.licenses.free; # seems BSD-like }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index e1cc1f27c1d..7f0a343eba2 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,20 +4,20 @@ let version = "2.6.2"; in stdenv.mkDerivation { name = "tinyxml-${version}"; - + src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc"; }; - + patches = [ # add pkgconfig file ./2.6.2-add-pkgconfig.patch - + # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 ./2.6.2-entity.patch ]; - + buildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) @@ -26,13 +26,13 @@ in stdenv.mkDerivation { # build xmltest make - + # build the lib as a shared library g++ -Wall -O2 -shared -fpic tinyxml.cpp \ tinyxmlerror.cpp tinyxmlparser.cpp \ tinystr.cpp -o libtinyxml.so ''; - + doCheck = true; checkPhase = '' ./xmltest @@ -41,25 +41,25 @@ in stdenv.mkDerivation { exit $result fi ''; - + installPhase = '' mkdir -pv $out/include/ mkdir -pv $out/lib/pkgconfig/ mkdir -pv $out/share/doc/tinyxml/ - + cp -v libtinyxml.so $out/lib/ cp -v *.h $out/include/ - + substituteInPlace tinyxml.pc --replace "@out@" "$out" substituteInPlace tinyxml.pc --replace "@version@" "${version}" cp -v tinyxml.pc $out/lib/pkgconfig/ - + cp -v docs/* $out/share/doc/tinyxml/ ''; - + meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 3544e984077..d07c1d55047 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://www.cs.unc.edu/Research/vrpn/; - license = "BSL1.0"; # Boost Software License, + license = stdenv.lib.licenses.boost; # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html> }; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 73f543f5b62..9de4df9288b 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; - license = "CeCILL-B_V1"; + license = stdenv.lib.licenses.cecill-b; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 98747e2a193..c7427558314 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlgraph.lri.fr/; description = "Graph library for Objective Caml"; - license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE"; + license = stdenv.lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.kkallio diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index a8e0f28628a..dc5d191f75a 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "OCaml native toplevel"; homepage = http://benediktmeurer.de/ocamlnat/; - license = "QPL"; + license = stdenv.lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel ocamlnat, which is mostly compatible to the byte code toplevel ocaml, diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2a1ed3a624..ad1bc97d2f7 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { rev = "refs/tags/0.6.2"; sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662"; }; - + buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp]; configurePhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 93cef5d844c..20362a51a7b 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 619f2f14b96..f6c8bcc2e2f 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { meta = { homepage = http://search.cpan.org/dist/DBD-Pg/; description = "DBI PostgreSQL interface"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index d4461788381..e83cc9ad1f4 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { to the gpodder.net web services. ''; homepage = "https://thp.io/2010/mygpoclient/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.skeidel ]; }; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 3bf45900034..e3fd1306cec 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - license = "free"; /* OSL, see http://www.opensource.org */ + license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 62182d0b845..e21ae8e9273 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; homepage = http://spinroot.com/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with maintainers; [ mornfall pSub ]; }; } diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 5538eae4104..723219336bb 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.boost.org/boost-build2/; - license = "boost-license"; + license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index e7e4b6d0909..b01d22b524b 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , lua5, python , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -43,7 +43,7 @@ rec { mkdir -p "$out/bin" cp bam "$out/bin" '' ["minInit" "defEnsureDir" "build"]; - + meta = { description = "Yet another build manager"; maintainers = with a.lib.maintainers; @@ -52,7 +52,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -60,4 +60,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 434e23d9b99..8f56577de32 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://public.perforce.com/wiki/Jam; - license = "free"; + license = stdenv.lib.licenses.free; description = "Just Another Make"; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 69db7da17bc..7a7755ab2b0 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://leiningen.org/; description = "Project automation for Clojure"; - license = "EPL"; + license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index d923fea8b59..48d04fd48ab 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; - license = "Public Domain"; + license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [viric joelteon]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index c91d826e3b3..a7298214926 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation { # patch made by Joe Khoobyar copied from gentoo bugs patches = ./cproto_patch; - meta = { + meta = { description = "Tool to generate C function prototypes from C source code"; homepage = http://cproto.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 8842c8723b1..5be797507c0 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c"; }; - meta = { + meta = { description = "Berkeley YACC"; homepage = http://dickey.his.com/byacc/byacc.html; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index da806a77fa4..1fd70730265 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { and more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 61e8571c476..42a1b19c4d7 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/blackshades/; description = "Protect the VIP"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 882f5f3cde6..0709692552c 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index ca348592d1d..ab8c76680d4 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dxx-rebirth.com/; description = "Source Port of the Descent 1 engine"; - license = "BSD"; # Parallax license, like BSD I think + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index 644c2703599..58df972257e 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dxx-rebirth.com/; description = "Source Port of the Descent 2 engine"; - license = "BSD"; # Parallax license, like BSD I think + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 6e53aff65a5..c9d421eac9b 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = { description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; homepage = http://www.bay12games.com/dwarves; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = [stdenv.lib.maintainers.roconnor]; }; } diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix index 64a3e5bc975..406c45d3414 100644 --- a/pkgs/games/dwarf-fortress/df2014.nix +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { meta = { description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; homepage = http://www.bay12games.com/dwarves; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = [stdenv.lib.maintainers.roconnor]; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 4f1b126ac47..1d93b24d38a 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "eduke32-20130303-3542"; - + src = fetchurl { url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc"; }; - + buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s"; - + desktopItem = makeDesktopItem { name = "eduke32"; exec = "eduke32-wrapper"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared ''; - + buildPhase = '' make OPTLEVEL=0 ''; @@ -34,34 +34,34 @@ stdenv.mkDerivation rec { installPhase = '' # Install binaries mkdir -p $out/bin - cp eduke32 mapster32 $out/bin - + cp eduke32 mapster32 $out/bin + # Make wrapper script cat > $out/bin/eduke32-wrapper <<EOF #!/bin/sh - + if [ "$EDUKE32_DATA_DIR" = "" ] - then + then EDUKE32_DATA_DIR=/var/lib/games/eduke32 fi if [ "$EDUKE32_GRP_FILE" = "" ] then EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP fi - + cd \$EDUKE32_DATA_DIR - eduke32 -g \$EDUKE32_GRP_FILE + eduke32 -g \$EDUKE32_GRP_FILE EOF chmod 755 $out/bin/eduke32-wrapper - + # Install desktop item mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = "GPLv2+ and BUILD license"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix index c97ba4d5bf4..9e8d3ce0b8e 100644 --- a/pkgs/games/hexen/default.nix +++ b/pkgs/games/hexen/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.libsdl.org/projects/hexen/; description = "Port of Raven Software's popular Hexen 3-D shooter game"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 70bda820e2e..3198ad785f0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "A sandbox-building game"; homepage = http://www.minecraft.net; maintainers = [ stdenv.lib.maintainers.page ]; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 403fc88cb4a..e913b0bb2a8 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index a61d2f370d0..7fd13ccab3b 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , mesa, SDL, cmake, eigen , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,8 +35,8 @@ rec { setVars = a.noDepEntry '' export EIGENDIR=${a.eigen}/include/eigen2 - ''; - + ''; + meta = { description = "A physics-based puzzle game"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; broken = true; }; passthru = { diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index b94633d8d3a..d7b1c188076 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -1,8 +1,8 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "2.7.3" a; + version = a.lib.attrByPath ["version"] "2.7.3" a; buildInputs = with a; [ ncurses flex bison autoconf automake m4 ]; @@ -17,7 +17,7 @@ rec { configureFlags = []; preConfigure = a.fullDepEntry ('' - chmod a+rwX -R . + chmod a+rwX -R . sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in sed -e '/FIXED_PATHS/d' -i src/z-config.h ./bootstrap @@ -42,7 +42,7 @@ rec { done mkdir -p lib/user lib/save for i in lib/*/*.raw; do - test -L "$i" && rm "$i"; + test -L "$i" && rm "$i"; done for i in $(find lib -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done; export ANGBAND_PATH="$PWD" @@ -53,10 +53,10 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"]; - + name = "zangband-" + version; meta = { description = "rogue-like game"; - license = "non-free"; # Basically "not for commercial profit" + license = a.lib.licenses.unfree; }; } diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 15ab18495d2..12c76c89790 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation { name = "darcnes-9b0401"; src = fetchurl { url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = http://www.dridus.com/~nyef/darcnes/; description = "Multi-System emulator, specially for NES"; /* Prohibited commercial use, credit required. */ - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix index ec539cb43f9..3ff15aa1258 100644 --- a/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/xbmc-advanced-launchers.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { anglescry advanced launcher for XBMC since device input is caught by both XBMC and the retroarch process. ''; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 1f0674c9bca..e88b41a36ae 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = http://www.broadcom.com/support/802.11/linux_sta.php; - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ phreedom vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 9d31fde2f0f..a01d5d38e93 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } - diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index c9893031495..690b7dcc40f 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -18,10 +18,10 @@ in stdenv.mkDerivation { cp -R hardfp/opt/vc/* $out cp opt/vc/LICENCE $out/share/raspberrypi ''; - + meta = { description = "Firmware for the Raspberry Pi board"; homepage = https://github.com/raspberrypi; - license = "non-free"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 2a796c1b3a9..30943d8cd41 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index bf6dafae10a..99e6c4ff380 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { filesystem in Linux kernel versions 2.5+ that exposes a system's device tree. ''; - license = "GPL-v2 / LGPL-v2.1"; + license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; }; } diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 9f99d5e9f20..2dfc8f1b520 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A tool to associate udisks events to user-defined actions"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index c220d2d2dd0..0455c2b8626 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://linuxtv.org/projects.php; description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; - license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL. + license = stdenv.lib.licenses.free; # The libs are of LGPLv2.1+, some other pieces are GPL. maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 9c88a646214..e88f62a1337 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "brickd-${version}"; - + src = fetchgit { url = "git://github.com/Tinkerforge/brickd.git"; rev = "refs/tags/v${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb pkgconfig pmutils udev ]; - + # shell thing didn't work so i replaced it using nix prePatch = '' substituteInPlace src/brickd/Makefile --replace 'PKG_CONFIG := $(shell which pkg-config 2> /dev/null)' "PKG_CONFIG := $pkgconfig/bin/pkg_config"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://www.tinkerforge.com/; description = "The Brick Daemon is a daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages."; maintainers = [ stdenv.lib.maintainers.qknight ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 88837f9bb42..cab91409654 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://storm-project.net"; description = "Distributed realtime computation system"; - license = "Eclipse Public License 1.0"; + license = stdenv.lib.licenses.epl10; maintainers = [ lib.maintainers.vizanto ]; }; } diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index f42ae81a700..59f9fd8624d 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,13 +47,13 @@ rec { phaseNames = ["doDeploy" "fixScripts"]; fixScripts = a.doPatchShebangs ''$TARGET/bin''; - + doDeploy = a.fullDepEntry ('' ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)} for i in */; do cp -rTf $i merged; done cd merged - - for i in "lib/"jsp-*/*.jar; do + + for i in "lib/"jsp-*/*.jar; do ln -s "''${i#lib/}" "lib" || true done @@ -67,7 +67,7 @@ rec { ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2 ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2 - ) | + ) | xargs -I @@ mv @@ lib/obsolete mv lib/slf4j-simple-*.jar lib/obsolete @@ -106,8 +106,7 @@ rec { raskin ]; hydraPlatforms = []; # Builder is just unpacking/mixing what is needed - license = "free"; # mix of packages under different licenses + license = a.lib.licenses.free; # mix of packages under different licenses homepage = "http://openjena.org/"; }; }) x - diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a1d9940c887..c4a5fcc4284 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = http://freeswitch.org/; - license = "MPL1.1"; + license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index bc1ebf4eb43..b9cedfc4679 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://unichrome.sourceforge.net/"; description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index c841f8431de..34e67e171f4 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; homepage = http://xinetd.org; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index 3ae0920b9a7..ceeadbaafaa 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = "free"; # many parts under different free licenses + license = stdenv.lib.licenses.free; # many parts under different free licenses }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 52ddb5a0f6b..a0b3283bb04 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xdg-utils-1.1.0-rc1"; - + src = fetchurl { url = "http://portland.freedesktop.org/download/${name}.tar.gz"; sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file ''; - + meta = { homepage = http://portland.freedesktop.org/wiki/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index d8c60c0ec3c..41c83344c14 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://simple-evcorr.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 0852674e8c8..546f398bec3 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "unarj-2.63a"; - + src = fetchurl { url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz; sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Unarchiver of ARJ files"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index f939c968c44..f19a2f0c5d3 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation ({ name = "unzip-6.0"; - + src = fetchurl { url = mirror://sourceforge/infozip/unzip60.tar.gz; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; @@ -27,7 +27,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://www.info-zip.org; description = "An extraction utility for archives compressed in .zip format"; - license = "free"; # http://www.info-zip.org/license.html + license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; }; } // (if enableNLS then { diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 937cf987513..3d3ad80e25d 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ncompress.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 3732e5b1756..4606d5bf79b 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 72b50bd4e77..5dcac6a0215 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cybercom.net/~dcoffin/dcraw/; description = "Decoder for many camera raw picture formats"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 531e17b92cb..ea729d71be2 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://johnst.org/sw/exiftags/; description = "Displays EXIF data from JPEG files"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index c497d60aef9..ee44ff975bb 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 0419732949d..79902582ff4 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 79ca54fe0ed..2ee419a0512 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; - + meta = { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 23c5ec11aaa..3d1a2aa5bdc 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["jre"]; buildInputs = map (n: builtins.getAttr n x) @@ -39,7 +39,7 @@ rec { sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh" chmod a+x "$out/bin/welkin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An RDF visualizer"; maintainers = with a.lib.maintainers; @@ -47,7 +47,7 @@ rec { raskin ]; hydraPlatforms = []; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index d2d29aae785..4db4f3b1672 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; - + src = fetchurl { url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ + license = stdenv.lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 1cbbb9720c9..54edaaa033a 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE + license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f22a35e8de..99c7a056051 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; - meta = { + meta = { description = "Program for making large letters out of ordinary text"; homepage = http://www.figlet.org/; - license = "AFL-2.1"; + license = stdenv.lib.licenses.afl21; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index c4e74359b15..2d22bdcd302 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.funfunctor ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 08e012128c2..02b80493654 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = https://github.com/carlesso/i3minator; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ iElectric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 2fa71223931..08fbba873e5 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 + license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 0dad6c2d33f..ce4f8728a80 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { mv {,$out/bin/}mysql2psql ''; - meta = { + meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 909ed0856bb..3501090c63c 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; #MicroChip-PK2 + license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 0af7143a320..a94cdea1339 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "Artistic-2"; + license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index f08fe87202f..3c7aa5261a2 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: -let +let sources = [ (fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation { homepage = http://dev.w3.org/cvsweb/2002/css-validator/; # dependencies ship their own license files # I think all .java files are covered by this license (?) - license = "w3c"; # http://www.w3.org/Consortium/Legal/ + license = stdenv.lib.licenses.w3c; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index df1a7eedeff..7d731650288 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , libSM, libXext , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,7 +35,7 @@ rec { '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; - + meta = { description = "A clock application that morphs digits when they are changed"; maintainers = with a.lib.maintainers; @@ -44,7 +44,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; #TODO BSD on Gentoo, looks like MIT + license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT downloadPage = "http://www.jwz.org/xdaliclock/"; inherit version; updateWalker = true; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index f6be163bb83..6b07d5bd2f1 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.kryo.se/iodine/; description = "Tool to tunnel IPv4 data through a DNS server"; - license = "ISC"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index dbf393094c8..0f75bd44d69 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/netboot/${name}.tar.gz"; sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; - + buildInputs = [ yacc lzo db4 ]; meta = with stdenv.lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; - license = "free-noncopyleft"; + license = stdenv.lib.licenses.free; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 7288bb7e39b..858683e3374 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 9050423cfaf..9a9d41ed6a4 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a894de64758..453b6d8623f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; # multi BSD GPL-2 + license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; }; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8390c70a4d3..1ab3e062ca0 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "s3sync-1.2.6"; - + src = fetchurl { url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!! sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; # some custom as-is in file headers + license = stdenv.lib.licenses.free; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 795c0cfc8cc..ce7a4dd6434 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Stun server and test client"; homepage = http://sourceforge.net/projects/stun/; - license = "Vovida 1.0"; # See any header file. + license = stdenv.lib.licenses.vsl10; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 41e227cee7e..e88c8b7db1f 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://code.google.com/p/volatility; description = "advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 016e2ccda37..872dbf0c20e 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A forensic/data recovery tool"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "IBM Public License"; + license = stdenv.lib.licenses.ipl10; inherit version; }; } diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 3c0af0157a5..235dcfe7458 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; homepage = http://wgetpaste.zlin.dk/; - license = "publicDomain"; + license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight iElectric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index fd5a5dc5f8e..cabb931c447 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; #TODO W3C + license = stdenv.lib.licenses.w3c; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index efce7d4de81..ffd275069da 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e05e4d16a06..ff3bad12bc5 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "a tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix index 28bcfcd97fe..cbbc3844fef 100644 --- a/pkgs/tools/typesetting/tex/disser/default.nix +++ b/pkgs/tools/typesetting/tex/disser/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip, texLive, texLiveCMSuper, texLiveAggregationFun , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["texLive" "texLiveCMSuper" "texLiveAggregationFun"]; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { ''; makeFlags = ["DESTDIR=$out/share/texmf-dist"]; - + meta = { description = "Russian PhD thesis LaTeX package"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; # platform-independent - license = "free"; # LaTeX Project Public License + license = a.lib.licenses.free; # LaTeX Project Public License }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 69d02a275b3..e3e19d82b4e 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL-1.2"; # LaTeX Project Public License + license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 34cfa662c91..5ffba07087a 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; #Amazon + license = stdenv.lib.licenses.amazonsl; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c549332d2fa..23c4773c8fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -61,7 +61,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -125,7 +125,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { description = "Communicate with the i3 window manager"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -139,7 +139,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -164,7 +164,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; description = "Compile a log format string to perl-code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -188,7 +188,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -215,7 +215,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; meta = { description = "Manage perl installations in your $HOME"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -295,7 +295,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -323,7 +323,7 @@ let self = _self // overrides; _self = with self; { ''; homepage = http://www.aarontrevena.co.uk/opensource/autodia/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; @@ -337,7 +337,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Replace functions with ones that succeed or die with lexical scope"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -352,7 +352,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/autovivification/; description = "Lexically disable autovivification"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -371,7 +371,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -384,7 +384,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -424,7 +424,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/boolean-pm/tree; description = "Boolean support for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -446,7 +446,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BusinessISBNData URI ]; meta = { description = "Parse and validate ISBNs"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -458,7 +458,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Data pack for Business::ISBN"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -471,7 +471,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -483,7 +483,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Work with International Standard Serial Numbers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -580,7 +580,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Capture-Tiny; description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; }; }; @@ -592,7 +592,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Warns and dies noisily with stack backtraces"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -615,7 +615,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpAssert TestException ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -628,7 +628,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -651,7 +651,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; meta = { description = "Automated REST Method Dispatching"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -666,7 +666,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; meta = { description = "HTTP Basic and Digest authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -692,7 +692,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -731,7 +731,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -745,7 +745,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose TextSimpleTable ]; meta = { description = "Regex DispatchType"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -775,7 +775,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "The Catalyst developer's manual"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -789,7 +789,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -805,7 +805,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -820,7 +820,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Request logging from within Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -835,7 +835,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -858,7 +858,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -873,7 +873,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { description = "Flexible caching support for Catalyst."; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -889,7 +889,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -927,7 +927,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; meta = { description = "Unicode aware Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -952,7 +952,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -991,7 +991,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; meta = { description = "Display a stack trace on the debug screen"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1005,7 +1005,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; meta = { description = "Make serving static pages painless"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1029,7 +1029,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; meta = { description = "JSON view for your data"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1043,7 +1043,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { description = "Template View Class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1088,7 +1088,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { description = "Replace the development server with Starman"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -1141,7 +1141,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1165,7 +1165,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1185,7 +1185,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1201,7 +1201,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1230,7 +1230,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algortihm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1245,7 +1245,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1258,7 +1258,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1294,7 +1294,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Get information about a class and its structure"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1333,7 +1333,7 @@ let self = _self // overrides; _self = with self; { preConfigure = "patchShebangs ."; meta = { description = "A module for creating generic methods"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1347,7 +1347,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/sartak/Class-Method-Modifiers/tree; description = "Provides Moose-like method modifiers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1389,7 +1389,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A working (require \"Class::Name\") and more"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1404,7 +1404,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "XS implementation of parts of Class::Load"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -1425,7 +1425,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1437,7 +1437,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively copy Perl datatypes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1467,7 +1467,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Low-Level Interface to bzip2 compression library"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1504,7 +1504,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "A module to implement some of AutoConf macros in pure perl."; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1515,7 +1515,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1529,7 +1529,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1544,7 +1544,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/config-mvp; description = "Multivalue-property package-oriented configuration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1558,7 +1558,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1649,7 +1649,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Read and write Changes files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1663,7 +1663,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; description = "The distribution metadata for a CPAN dist"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1677,7 +1677,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; meta = { description = "Verify requirements in a CPAN::Meta object"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1690,7 +1690,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/CPAN-Meta-Requirements; description = "A set of version requirements for a CPAN dist"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1705,7 +1705,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1718,7 +1718,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bingos/cpan-perl-releases; description = "Mapping Perl releases on CPAN to the location of the tarballs"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1732,7 +1732,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1809,7 +1809,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1912,7 +1912,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Temporary changing working directory (chdir)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1925,7 +1925,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1948,7 +1948,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Pretty printing of data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2004,7 +2004,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rjbs/data-optlist; description = "Parse and validate simple name/value option pairs"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2027,7 +2027,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2039,7 +2039,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules that serialize data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2054,7 +2054,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2086,7 +2086,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = "apache_2_0"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2149,7 +2149,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; meta = { description = "A date and time object"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2184,7 +2184,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2197,7 +2197,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; meta = { description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2210,7 +2210,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2223,7 +2223,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2236,7 +2236,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2252,7 +2252,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2265,7 +2265,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2280,7 +2280,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; meta = { description = "Parse and format strp and strf time patterns"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2294,7 +2294,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://datetime.perl.org/; description = "Localization support for DateTime.pm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2321,7 +2321,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; meta = { description = "Time zone object base class and factory"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2335,7 +2335,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; meta = { description = "Parse a date/time string using the best method available"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2348,7 +2348,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2361,7 +2361,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C<caller>"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2384,7 +2384,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bingos/devel-patchperl; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2398,7 +2398,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/timbunce/devel-sizeme; description = "Unknown"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2410,7 +2410,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Print out each line before it is executed (like sh -x)"; - license = "Public Domain"; + license = stdenv.lib.licenses.publicDomain; }; }; @@ -2443,7 +2443,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2458,7 +2458,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2471,7 +2471,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ]; meta = { description = "Sugar for your favorite ORM, DBIx::Class"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2485,7 +2485,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2507,7 +2507,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ]; meta = { description = "Simplify the common case stuff for DBIx::Class."; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2520,7 +2520,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2534,7 +2534,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2549,7 +2549,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2592,7 +2592,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2608,7 +2608,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2621,7 +2621,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2655,7 +2655,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Devel-StackTrace; description = "An object representing a stack trace"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2668,7 +2668,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2699,7 +2699,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2711,7 +2711,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2749,7 +2749,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2764,7 +2764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2779,7 +2779,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; }; @@ -2795,7 +2795,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2808,7 +2808,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2822,7 +2822,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2836,7 +2836,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests; description = "Release tests making sure hard tabs aren't used"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2851,7 +2851,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2866,7 +2866,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2881,7 +2881,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2896,7 +2896,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2911,7 +2911,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2926,7 +2926,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; description = "Common tests to check syntax of your modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2941,7 +2941,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2956,7 +2956,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2971,7 +2971,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2986,7 +2986,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3001,7 +3001,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3015,7 +3015,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3030,7 +3030,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3045,7 +3045,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3060,7 +3060,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3075,7 +3075,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -3087,7 +3087,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailSimple MROCompat ]; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3100,7 +3100,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "RFC 2822 Address Parsing"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3112,7 +3112,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Produce RFC 8822 date strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3125,7 +3125,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3139,7 +3139,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3153,7 +3153,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Parse a MIME Content-Type Header"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3166,7 +3166,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3194,7 +3194,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/email-sender; description = "A library for sending email"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3207,7 +3207,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailDateFormat ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3237,7 +3237,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3249,7 +3249,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Extra sets of Chinese encodings"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -3302,7 +3302,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3367,7 +3367,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3380,7 +3380,7 @@ let self = _self // overrides; _self = with self; { sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3401,7 +3401,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A wrapper for perl's configuration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3421,7 +3421,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3435,7 +3435,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Various portability utilities for module builders"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3448,7 +3448,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3460,7 +3460,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A tool to build C libraries."; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3475,7 +3475,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; description = "Create a module Makefile"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3578,7 +3578,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3669,7 +3669,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3682,7 +3682,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; preCheck = "export HOME=$TMPDIR"; }; @@ -3743,7 +3743,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/File-pushd; description = "Change directory temporarily for a limited scope"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3767,7 +3767,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3782,7 +3782,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3794,7 +3794,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Install shared files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3808,7 +3808,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and dumb file system watcher"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3822,7 +3822,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -3875,7 +3875,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3922,7 +3922,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3954,7 +3954,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3982,7 +3982,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ]; meta = { description = "Simple interface to Google Protocol Buffers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4066,7 +4066,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4078,7 +4078,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Store multiple values per key"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4145,7 +4145,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; meta = { description = "Class that represents an HTML form element"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4181,7 +4181,7 @@ let self = _self // overrides; _self = with self; { description = "HTML forms using Moose"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4194,7 +4194,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTagset ]; meta = { description = "HTML parser class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4274,7 +4274,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4287,7 +4287,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4317,7 +4317,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4330,7 +4330,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4343,7 +4343,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; meta = { description = "A simple http server class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4355,7 +4355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Date conversion routines"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4384,7 +4384,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style messages"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4397,7 +4397,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4439,7 +4439,7 @@ let self = _self // overrides; _self = with self; { }; doCheck = false; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4468,7 +4468,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Import packages into other packages"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4482,7 +4482,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4506,7 +4506,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; doCheck = !stdenv.isDarwin; @@ -4530,7 +4530,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Open an HTML file with automatic charset detection"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4542,7 +4542,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Utilities for interactive I/O"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4582,7 +4582,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/noxxi/p5-io-socket-ssl; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -4614,7 +4614,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4638,7 +4638,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -4711,7 +4711,7 @@ let self = _self // overrides; _self = with self; { for immediate access from Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ ]; }; @@ -4735,7 +4735,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Write Perl Subroutines in C"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4765,7 +4765,7 @@ let self = _self // overrides; _self = with self; { available to the Perl program as if they had been written in Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.artistic2; maintainers = [ ]; }; @@ -4788,7 +4788,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4801,7 +4801,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4815,7 +4815,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSONPP ]; meta = { description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4827,7 +4827,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4839,7 +4839,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4919,7 +4919,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; meta = { description = "Part-of-speech tagger for English natural language processing"; - license = "gpl_3"; + license = stdenv.lib.licenses.gpl3; }; }; @@ -4950,7 +4950,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4972,7 +4972,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Provide the stuff missing in List::Util"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5045,7 +5045,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Create and use a local lib/ for perl modules with PERL5LIB"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5067,7 +5067,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { description = "Simple logging interface with a contextual log"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5082,7 +5082,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { description = "Dispatches messages to one or more outputs"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5115,7 +5115,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatch-array; description = "Log events to an array (reference)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5130,7 +5130,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/log-dispatchouli; description = "A simple wrapper around Log::Dispatch"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5144,7 +5144,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to start a daemon meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -5157,7 +5157,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Guess media type for a file or a URL"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5174,7 +5174,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -5188,7 +5188,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = { description = "The World-Wide Web library for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5369,7 +5369,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5392,7 +5392,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FennecLite TestException ]; meta = { description = "Tools for creating Meta objects to track custom metrics"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5407,7 +5407,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5446,7 +5446,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Charset Information for MIME"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5467,7 +5467,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Definition of MIME types"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5481,7 +5481,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5495,7 +5495,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5508,7 +5508,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5522,7 +5522,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ]; meta = { description = "A tiny replacement for Module::Build"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5544,7 +5544,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; meta = { description = "A Module::Build class for building XS modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5557,7 +5557,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.perl.org/; description = "What modules shipped with versions of perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5569,7 +5569,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find and use installed modules in a (sub)category"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5584,7 +5584,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Loads one of several alternate underlying implementations for a module"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5597,7 +5597,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5611,7 +5611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5624,7 +5624,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5639,7 +5639,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5655,7 +5655,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5677,7 +5677,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DevelFindPerl ]; meta = { description = "Get the full path to a locally installed module"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5693,7 +5693,7 @@ let self = _self // overrides; _self = with self; { ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5715,7 +5715,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5730,7 +5730,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; description = "Provide information on conflicts for Module::Runtime"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5742,7 +5742,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively scan Perl code for dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5755,7 +5755,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5781,7 +5781,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://mojolicio.us; description = "Real-time web framework"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -5795,7 +5795,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ImportInto ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5810,7 +5810,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://moose.perl.org/; description = "A postmodern object system for Perl 5"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; @@ -5835,7 +5835,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5850,7 +5850,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5877,7 +5877,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5902,7 +5902,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5931,7 +5931,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; meta = { description = "An abstract Moose role for setting attributes from a configfile"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5947,7 +5947,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; meta = { description = "Role for daemonizing your Moose based application"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5961,7 +5961,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5976,7 +5976,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5991,7 +5991,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6008,7 +6008,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6023,7 +6023,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; description = "Required attributes which fail only when trying to use them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6038,7 +6038,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; - license = "lgpl_2_1"; + license = stdenv.lib.licenses.lgpl21; }; }; @@ -6053,7 +6053,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6067,7 +6067,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6082,7 +6082,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6106,7 +6106,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; meta = { description = "An extension of Params::Validate using Moose's types"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6121,7 +6121,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6136,7 +6136,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6196,7 +6196,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6232,7 +6232,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Organise your Moose types in libraries"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6273,7 +6273,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; meta = { description = "Extensions to MooseX::Types::DateTime"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6290,7 +6290,7 @@ let self = _self // overrides; _self = with self; { platforms = stdenv.lib.platforms.unix; homepage = https://github.com/moose/MooseX-Types-LoadableClass; description = "ClassName type constraint with coercion to load the class"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6303,7 +6303,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6318,7 +6318,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6333,7 +6333,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; meta = { description = "Moose types that check against Perl syntax"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6348,7 +6348,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6406,7 +6406,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyMoose ]; meta = { description = "Extend attribute interfaces for Mouse"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6430,7 +6430,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6469,7 +6469,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/moose/namespace-autoclean; description = "Keep imports out of your namespace"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6483,7 +6483,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/namespace-clean; description = "Keep imports and functions out of your namespace"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6556,7 +6556,7 @@ let self = _self // overrides; _self = with self; { [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; @@ -6570,7 +6570,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6587,7 +6587,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6601,7 +6601,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.bjornfor ]; }; @@ -6618,7 +6618,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6651,7 +6651,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Low-level HTTP connection (client)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6685,7 +6685,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; meta = { description = "An implementation of the OAuth protocol"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6699,7 +6699,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; meta = { description = "An Asynchronous and multi channel Perl AMQP client"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6780,7 +6780,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://github.com/semifor/Net-Twitter-Lite; description = "A perl interface to the Twitter API"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6809,7 +6809,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6860,7 +6860,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Manage deprecation warnings for your distribution"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6875,7 +6875,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6889,7 +6889,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6911,7 +6911,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Simple, compact and correct param-checking functions"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6926,7 +6926,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Validate method/function parameters"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -6959,7 +6959,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; description = "Parse META.yml and META.json CPAN metadata files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6979,7 +6979,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cross-platform path specification manipulation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6994,7 +6994,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7027,7 +7027,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7108,7 +7108,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7122,7 +7122,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir ModuleVersions Plack TextMicroTemplate ]; meta = { description = "Display information about the current request/response"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7139,7 +7139,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; description = "Plack::Middleware which sets body for redirect response, if it's not already set"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7153,7 +7153,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Plack-Middleware-MethodOverride/; description = "Override REST methods to Plack apps via POST"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7168,7 +7168,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7181,7 +7181,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7194,7 +7194,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ]; meta = { description = "Run HTTP tests on external live servers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7208,7 +7208,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; }; @@ -7222,7 +7222,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { description = "Parse regular expressions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7236,7 +7236,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; meta = { description = "Extensions to L<PPI|PPI>"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7285,7 +7285,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; meta = { description = "Find a minimum required version of perl for Perl code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7300,7 +7300,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/perl-prereqscanner; description = "A tool to scan your Perl code for its prerequisites"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7313,7 +7313,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Parse and manipulate Perl version strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7336,7 +7336,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-coverage-trustpod; description = "Allow a module's pod to contain Pod::Coverage hints"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7351,7 +7351,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental; description = "Work with nestable Pod elements"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7366,7 +7366,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-elemental-perlmunger; description = "A thing that takes a string of Perl and rewrites its documentation"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7387,7 +7387,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MixinLinewise TestDeep ]; meta = { description = "Read a POD document as a series of trivial events"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7415,7 +7415,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rwstauner/Pod-Markdown; description = "Convert POD to Markdown"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7447,7 +7447,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7489,7 +7489,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7542,7 +7542,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7576,7 +7576,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; meta = { description = "A thing with a message method"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7590,7 +7590,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7603,7 +7603,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal ]; meta = { description = "Roles, like a nouvelle cuisine portion size slice of Moose"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7629,7 +7629,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Call isa, can, does and DOES safely on things that may not be objects"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7649,7 +7649,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lexically-scoped resource management"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7662,7 +7662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; description = "Act on upper scopes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7692,7 +7692,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7715,7 +7715,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7740,7 +7740,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/software-license; description = "Packages that provide templated software licenses"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7781,7 +7781,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7843,7 +7843,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7870,7 +7870,7 @@ let self = _self // overrides; _self = with self; { meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7900,7 +7900,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://plackperl.org; description = "Temporary buffer to save bytes"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7913,7 +7913,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; description = "Turn on strict and make all warnings fatal"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7947,7 +7947,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; meta = { description = "A simple sprintf-like dialect"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7973,7 +7973,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/string-flogger; description = "String munging for loggers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8016,7 +8016,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Rewrite strings based on a set of known prefixes"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8051,7 +8051,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { description = "A module for when strings are too long to be displayed in.."; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8065,7 +8065,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8079,7 +8079,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "String::Util -- String processing utilities"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8093,7 +8093,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8106,7 +8106,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporter SubName ]; meta = { description = "Helper routines for using Sub::Exporter to build methods"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8120,7 +8120,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter-globexporter; description = "Export shared globs with Sub::Exporter collectors"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8133,7 +8133,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Only use Sub::Exporter if you need it"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8147,7 +8147,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8168,7 +8168,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Install subroutines into packages easily"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8201,7 +8201,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/sub-uplevel; description = "Apparently run a function in a higher stack frame"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8274,7 +8274,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/phaylon/syntax/wiki; description = "Activate syntax extensions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8287,7 +8287,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ]; meta = { description = "Perl6 style Junction operators in Perl5"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8312,7 +8312,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/; description = "Stream TAP from pgTAP test scripts"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ ocharles ]; }; @@ -8359,7 +8359,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ensure that a platform has weaken support"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8386,7 +8386,7 @@ let self = _self // overrides; _self = with self; { meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8438,7 +8438,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8450,7 +8450,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Detect encoding of the current terminal"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8464,7 +8464,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8477,7 +8477,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; meta = { description = ""; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8586,7 +8586,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8601,7 +8601,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/Test-CleanNamespaces; description = "Check for uncleaned imports"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8613,7 +8613,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Validate your CPAN META.yml files"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -8638,7 +8638,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8653,7 +8653,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; description = "Author test that validates a package MANIFEST"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8666,7 +8666,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8691,7 +8691,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/Test-FailWarnings; description = "Add test failures if warnings are caught"; - license = "apache"; + license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8707,7 +8707,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/test-fatal; description = "Incredibly simple helpers for testing code with exceptions"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8722,7 +8722,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8736,7 +8736,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://testanything.org/; description = "Run Perl standard test scripts with statistics"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8761,7 +8761,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Traces memory leaks"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8843,7 +8843,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/creaktive/Test-Mojibake; description = "Check your source for encoding misbehavior"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8858,7 +8858,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; meta = { description = "Most commonly needed test functions and features"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8870,7 +8870,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check the presence of tabs in your project"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8926,7 +8926,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod/; description = "Check for POD errors in files"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8950,7 +8950,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8962,7 +8962,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check file names portability"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8974,7 +8974,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Checks to see if the module can be loaded"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8989,7 +8989,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9023,7 +9023,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PackageStash TestDeep TestTrap TieIxHash ]; meta = { description = "Write tests in a declarative specification style"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9044,7 +9044,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test your SYNOPSIS code"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9056,7 +9056,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Write tests, not scripts that run them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9071,7 +9071,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9091,7 +9091,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unit testing without external dependencies"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9120,7 +9120,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9134,7 +9134,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9146,7 +9146,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test fallback behaviour in absence of modules"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9162,7 +9162,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9176,7 +9176,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9203,7 +9203,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9240,7 +9240,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interface to read and parse BibTeX files"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9261,7 +9261,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9281,7 +9281,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Framework for more readable interactive test scripts"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9304,7 +9304,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9320,7 +9320,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ]; meta = { description = "Does your code require newer perl than you think?"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9332,7 +9332,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Micro template engine with Perl5 language"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9370,7 +9370,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple eyecandy ASCII tables"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9421,7 +9421,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc."; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9434,7 +9434,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/gfx/p5-Test-Vars; description = "Detects unused variables"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9449,7 +9449,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Test-Version/; description = "Check to see that version's in modules are sane"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9461,7 +9461,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9517,7 +9517,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cycle through a list of values via a scalar"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9529,7 +9529,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered associative arrays for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9541,7 +9541,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered hashes for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9571,7 +9571,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9585,7 +9585,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9607,7 +9607,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9620,7 +9620,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9644,7 +9644,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Try-Tiny; description = "Minimal try/catch with proper preservation of $@"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -9665,7 +9665,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9677,7 +9677,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Require() modules from a variable"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9700,7 +9700,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unicode Collation Algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9712,7 +9712,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Wrapper around ICU collation services"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9728,7 +9728,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9748,7 +9748,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9762,7 +9762,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/URI-Find; description = "Find URIs in arbitrary text"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9775,7 +9775,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsValidate URI ]; meta = { description = "Build a URI from a set of named parameters"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9798,7 +9798,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9867,7 +9867,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; - license = "perl5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9897,7 +9897,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9952,7 +9952,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # requires an X server meta = { description = "XCB bindings for X"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9966,7 +9966,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLTokeParser ]; meta = { description = "Recursive descent XML parsing"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9999,7 +9999,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10100,7 +10100,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLParser ]; meta = { description = "Simplified interface to XML::Parser"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10131,7 +10131,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; meta = { description = "XS pointer backed objects using sv_magic"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10144,7 +10144,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; description = "YAML Ain't Markup Language (tm)"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10157,7 +10157,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/YAML-Syck; description = "Fast, lightweight YAML loader and dumper"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index bb6be68fa9a..3876476623b 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -62,7 +62,7 @@ in Zope Version Control ''; homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -764,7 +764,7 @@ in PlonePAS adapts the PluggableAuthService for use by Plone. ''; homepage = "http://pypi.python.org/pypi/Products.PlonePAS"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -1487,7 +1487,7 @@ in installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - + ''; homepage = "https://code.google.com/p/feedparser/"; license = ""; @@ -1550,7 +1550,7 @@ in Automatically include ZCML ''; homepage = "http://pypi.python.org/pypi/z3c.autoinclude"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -2552,7 +2552,7 @@ in CMFDynamicViewFTI is a product for dynamic views in CMF. ''; homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -2674,7 +2674,7 @@ in Python-PostgreSQL Database Adapter ''; homepage = "http://initd.org/psycopg/"; - license = "GPL with exceptions or ZPL"; + license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ]; }; }; @@ -3078,7 +3078,7 @@ in Global way of retrieving the currently active request. ''; homepage = "http://pypi.python.org/pypi/zope.globalrequest"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -3198,7 +3198,7 @@ in Caching infrastructure for web apps ''; homepage = "UNKNOWN"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -3758,7 +3758,7 @@ in Zope 2 integration for zope.globalrequest ''; homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -4486,7 +4486,7 @@ in Easily hook into the ZCML processing machinery ''; homepage = "UNKNOWN"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -4526,7 +4526,7 @@ in Add test information to .egg-info ''; homepage = "http://pypi.python.org/pypi/eggtestinfo"; - license = "PSF or ZPL"; + license = with stdenv.lib.licenses; [ psfl zpt20 ]; }; }; @@ -4928,7 +4928,7 @@ in SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements. ''; homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk"; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a05ac2742ac..5377ab20d6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1342,7 +1342,7 @@ let meta = { homepage = "http://click.pocoo.org/"; description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary."; - license = "bsd, 3-clause"; + license = stdenv.lib.licenses.bsd3; }; }; @@ -4909,7 +4909,7 @@ let meta = { description = "A documentation builder"; homepage = http://pypi.python.org/pypi/manuel; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -5008,7 +5008,7 @@ let meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; }; @@ -6477,7 +6477,7 @@ let meta = { description = "PostgreSQL database adapter for the Python programming language"; - license = "GPLv2/ZPL"; + license = with stdenv.lib.licenses; [ gpl2 zpt20 ]; }; }; @@ -7638,7 +7638,7 @@ let meta = { description = "The next generation YAML parser and emitter for Python"; homepage = http://pyyaml.org; - license = "free"; # !? + license = stdenv.lib.licenses.free; # !? }; }); @@ -8156,21 +8156,21 @@ let runsnakerun = buildPythonPackage rec { name = "runsnakerun-2.0.4"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz"; md5 = "3220b5b89994baee70b1c24d7e42a306"; }; - + propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; - + meta = with stdenv.lib; { description = "GUI Viewer for Python profiling runs"; homepage = http://www.vrplumber.com/programming/runsnakerun/; license = licenses.bsd3; }; }; - + rtslib_fb = buildPythonPackage rec { version = "2.1.fb43"; name = "rtslib-fb-${version}"; @@ -9359,7 +9359,7 @@ let meta = { description = "Transaction management"; homepage = http://pypi.python.org/pypi/transaction; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -9397,7 +9397,7 @@ let meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; }; }; @@ -10005,7 +10005,7 @@ let meta = { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10023,7 +10023,7 @@ let meta = { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10046,7 +10046,7 @@ let meta = { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10097,7 +10097,7 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10124,7 +10124,7 @@ let meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10349,7 +10349,7 @@ let meta = { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10369,7 +10369,7 @@ let meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10584,7 +10584,7 @@ let meta = { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10606,7 +10606,7 @@ let meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -10644,7 +10644,7 @@ let meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; - license = "ZPL"; + license = stdenv.lib.licenses.zpt20; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; |