diff options
1010 files changed, 1578 insertions, 1619 deletions
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 031b0fe93b59..1978fcf18749 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -61,7 +61,7 @@ in meta = { homepage = "http://lly.org/~rcw/abcde/page/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command-line audio CD ripper"; longDescription = '' diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 890497b0c992..7308d84e0984 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 1e19a3ac5c39..41edd51e5f26 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = http://www.jpj.net/~trevor/aumix.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index c67830a94e77..1646f944a830 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -19,7 +19,7 @@ in meta = { homepage = http://lly.org/~rcw/cd-discid/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; longDescription = '' diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index d47d82497ab6..0faf4841c71b 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 0e59a42614fd..524a95bcca06 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoneme editor for espeak"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index e75be3e2c2be..f23ba66a3b51 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://wejp.k.vu/projects/gmu; description = "Open source music player for portable gaming consoles and handhelds"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 90e27c12ce3b..95a602312970 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index a7835f020d14..b96872c7ef0c 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 8557bc31c445..74d98184d9dd 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; homepage = http://www.aelius.com/njh/jackmeter/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 4b8ba4dbc242..4b07c84b0be8 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Not a Guitar-Only tuner"; homepage = http://www.nongnu.org/lingot/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index a86e09278c3c..f38ff4697313 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d5a8138a5001..0f33726eaeed 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = http://www.ibiblio.org/mp3info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index ae6d9e0c7e60..54ae5476efdd 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 2f00638961c3..cd4343b1beb4 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "mpc123, a Musepack (.mpc) audio player"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ffec1a5736c3..e58397350cb1 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "mpg321, a command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 02a27bedb67f..ca08624e98f3 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b8a283125fc4..4859377ab52a 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; - license = "GPLv2+"; # Has some 3rd-party code in it though + license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59bea8fc1944..b823ef02ef8f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; description = "Spotify for Linux allows you to play music from the Spotify music service"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 5db7cc30cf8c..e4e5b7ff81a3 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 84b810bf4602..e598fa19c5ea 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 88b539d29f5f..d3e9a4c46794 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ed/; diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix index 75f484d295b5..40f172316efc 100644 --- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix +++ b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 8934238ffa3a..83c9ddebe818 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A calendar framework for Emacs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 779fc8a146e1..e350dc08e71c 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Development Environment), and COGRE (COnnected GRaph Editor). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://cedet.sourceforge.net/; }; diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix index a0ba61431655..495b1aca4b53 100644 --- a/pkgs/applications/editors/emacs-modes/coffee/default.nix +++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for CoffeeScript, unfancy JavaScript"; homepage = https://github.com/defunkt/coffee-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix index bad277d61ce3..a3d76a307c74 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs-lisp mode for skinning your Emacs"; homepage = http://www.nongnu.org/color-theme; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix index cf2bcc6e30b9..349146dbdd89 100644 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A pcl-cvs like interface for managing darcs patches."; homepage = "http://hub.darcs.net/simon/darcsum"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.falsifian ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 33f0299f5f00..807bb91f850c 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { navigation and overview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecb.sourceforge.net/; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index b23c6da6123c..9a84fbb77483 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -20,7 +20,6 @@ clangStdenv.mkDerivation { meta = { homepage = "https://github.com/Golevka/emacs-clang-complete-async"; description = "An emacs plugin to complete C and C++ code using libclang"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } - diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 3ba848affc0d..26f313f038df 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { developed a simple Emacs interface to w3m. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://emacs-w3m.namazu.org/; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index d8bbb83c4e58..078907d7bb59 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emms/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix index 28773e97c409..dca84a7936d7 100644 --- a/pkgs/applications/editors/emacs-modes/gh/default.nix +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A (very early) GitHub client library for Emacs"; homepage = https://github.com/sigma/gh.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix index 21a2137dd392..08471247f081 100644 --- a/pkgs/applications/editors/emacs-modes/gist/default.nix +++ b/pkgs/applications/editors/emacs-modes/gist/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs integration for gist.github.com"; homepage = https://github.com/sigma/gist.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 614a37030510..28375dcb68df 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for Idris"; homepage = https://github.com/idris-hackers/idris-mode; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix index ab0e3512ef28..925fa54c735f 100644 --- a/pkgs/applications/editors/emacs-modes/jade/default.nix +++ b/pkgs/applications/editors/emacs-modes/jade/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; homepage = https://github.com/brianc/jade-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 89d908826b1c..4c347f27e681 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -89,7 +89,7 @@ in * Java source interpreter (Pat Neimeyer's BeanShell) ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index 09161ec80678..a47f04472ec7 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "tiny logging framework for Emacs"; homepage = https://github.com/sigma/logito; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix index 72086e54fece..b75c51d3bd74 100644 --- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Insert dummy pseudo Latin text for Emacs"; homepage = http://www.emacswiki.org/emacs/LoremIpsum; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4e2601cc106c..076caf5235b2 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/magit/magit"; description = "Magit, an Emacs interface to Git"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' With Magit, you can inspect and modify your Git repositories with diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index b6b043fb7b8d..57c2b2890be7 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Emacs mode for the programming language Maude"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix index 2a35c6ef6950..77bfedf62748 100644 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "an emacs library to access metaweblog based weblogs"; homepage = https://github.com/punchagan/metaweblog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ba2437f1a2b8..f55fe564ef3d 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { than that found in GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix index d2e9e305bffb..5c1aec7e02b7 100644 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Publish directly from Emacs’ org-mode to WordPress blogs"; homepage = https://github.com/punchagan/org2blog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix index c0aa07726788..f4dcf03dee84 100644 --- a/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Persistent caching for Emacs"; homepage = https://github.com/sigma/pcache.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix index 0dea1a13977e..c026d058b4e3 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { s|/sbin/install-info|install-info|g" - # Workaround for bug #458 + # Workaround for bug #458 # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 sed -i "Makefile" \ @@ -48,7 +48,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/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index bef1ebe5859b..95634a24ded4 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced Emacs support for editing and running Scheme code"; homepage = http://www.neilvandyke.org/quack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 896dbdac71be..1f218439a5ff 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Mark a rectangle of text with highlighting"; homepage = http://emacswiki.org/emacs/RectangleMark; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/remember/default.nix b/pkgs/applications/editors/emacs-modes/remember/default.nix index ea17a9b792ae..7c0bc517755a 100644 --- a/pkgs/applications/editors/emacs-modes/remember/default.nix +++ b/pkgs/applications/editors/emacs-modes/remember/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gna.org/projects/remember-el/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index e942189714ea..aa27e302e5d6 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index c6563605464a..d196c3fee804 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { homepage = https://github.com/bnbeckwith/writegood-mode; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix index cee0f0ca5534..661430516b70 100644 --- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Elisp implementation of clientside XML-RPC"; homepage = https://launchpad.net/xml-rpc-el; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index a18bfd8b2c65..d9f62216fac9 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "WYSIWYG PostScript annotator"; homepage = "http://http://flpsed.org/flpsed.html"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 4d48ba69086e..5ef198745312 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index c7867ce22af2..0c967e05ba11 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 088d76f48687..3ef557cef4b3 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,6 @@ in stdenv.mkDerivation { meta = { description = "Sophisticated text editor for code, markup and prose"; maintainers = stdenv.lib.maintainers.wmertens; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } - diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 1c6d86a2f3da..ce863312251c 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { collaborative authoring are planned for later. ''; homepage = http://texmacs.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 4166bc1e9e3e..32d30cd47450 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/zile/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index be3cfc5935c7..6d26dafae623 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 68910e67e25a..2796a5535a03 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = http://comical.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index f832513a8241..4ded807cb29a 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; inherit (qt4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 44ca66ac5b9d..b170b784aaa4 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { initially based on GQview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://geeqie.sourceforge.net; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3810006103df..7139bc71f3c1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -236,7 +236,7 @@ rec { homepage = http://lensfun.sebastiankraft.net/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 8b2c45398d9e..2e9d55a3f3f2 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 15a8ab713dba..919b9fcc4c3c 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a9ff7ef25c32..a98e60d6fea0 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index df50dd5bd793..53df14f8704f 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = http://ipe7.sourceforge.net; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7629c57a2b86..c997f5c343fd 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = http://mcomix.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 4e2075ff4714..9352ae092be4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; homepage = http://meshlab.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index e3c6deddb295..e354837f4b87 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index def22804bb65..20f7460f7a16 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = http://mirageiv.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 482b57d03d2d..4c20a41061ae 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { backend to other programs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 17e1b2e8b146..8e5204ac6382 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://panotools.sourceforge.net/; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b54d73b4964f..6958c94f7e18 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 365f88b19b4c..f58fe0e28c1d 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 95d7acca36c5..cd8c76dc42cf 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { aims to provide a workflow for high dynamic range (HDR) imaging. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 3d95dcd81ee8..28d2f1e200b2 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 9e73a08e0967..a0f6e5bac509 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 7b1ffb1f2be4..221a4340dce2 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 83f3c7510298..083fde359029 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 8500fa9faba2..30513577d04b 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index e67d202dcae6..eaf6dd4ba248 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = http://code.google.com/p/tesseract-ocr/; - license = "Apache2.0"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 070244d67d2c..783832abd003 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { the camera's tone curves. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # needs GTK+ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index aa09fb705f1c..dd8e01298ff4 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { in mind (follows Gnome HIG2). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://xsisqox.github.com/Viewnior; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index cddbc212c190..88c189d9bbbe 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -29,6 +29,6 @@ rec { meta = { homepage = http://xaos.sourceforge.net/; description = "XaoS - fractal viewer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 3d187d92f5c6..77e48e49dd89 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index a186f5f5ee0d..85bc89f77559 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index a8dd26ab6095..73cdbb37616a 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = http://soxr.sourceforge.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cdaeb49f14c6..1976ea5ce135 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A Qt4 Bible study tool"; homepage = http://www.bibletime.info/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 118b56c55b07..1a25a233c0de 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.bitcoin.org/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 4eb4c441c99d..ce53045a15a9 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3fecddcb316c..1ba3ee5268f7 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "a generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; } - diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 6941e8df626a..d79162289c3c 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index b070b629282c..5ad82c9239c8 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index f2dadd2e5e8b..638f254364e8 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for input event debugging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 33d8585bb2dd..65265fc07a5a 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Peer-to-peer currency with demurrage fee"; homepage = "http://freicoi.in/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 3b8f8b1cc680..81f74847c2f0 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 08b868bca926..ea577beb5929 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 29d5b1ee7cc8..bf44f91056d7 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { homepage = http://www.gpsbabel.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 141476a6b406..9a59329871e6 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://freefoote.dview.net/linux_gpscorr.html; }; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 0c2b957bc7ca..39621536e688 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK+-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index efd9cf263e7c..4867bef1f719 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix index befa8d252100..e8274418ae16 100644 --- a/pkgs/applications/misc/htmldoc/default.nix +++ b/pkgs/applications/misc/htmldoc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.htmldoc.org/; description = "Converts HTML files to indexed HTML, PS or PDF"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b347f971ee0f..fab492d5c099 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fe4c0287fdd2..d722367d1b49 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index 2f140db93973..59d25a980404 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index b225519f4868..be3fa4128b66 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 1ea4f06c9273..36b2f84aab54 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = "http://www.lyx.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e6636415b5ef..932e5bb48300 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric urkud]; inherit (qt4.meta) platforms; }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a56460827f50..aa7c14634d13 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com/; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF viewer and toolkit written in portable C"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; inherit version; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index a526774d48ec..6d990831a369 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index ef1e777f55fd..1be39c666421 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 74f657ee02a7..8a68bd7ccfb9 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index d6711c82968e..cc26a74802b4 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 88d6e7a7cf94..abf55aa22b97 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.linux; maintainers = maintainers.mornfall; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index e1492a476914..151b8a077d5d 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9c57fbd19a77..1dcdf78456d2 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 9eb3e1123421..1ca8ec045d61 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "stardict"; homepage = "A international dictionary supporting fuzzy and glob style matching"; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; } - diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 651cfcca4067..983fbde0c459 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { surf to another URI by setting its XProperties. ''; homepage = http://surf.suckless.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 609849166d16..aa1df2c9d1a6 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 77acc511fe42..e1e047714603 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix index e16767d4c261..720240d0d797 100644 --- a/pkgs/applications/misc/vanitygen/default.nix +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { and will run about 30% faster. ''; homepage = "https://github.com/samr7/vanitygen"; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 70ac055db098..6508b12e1de8 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = http://viking.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 417d4a5ae683..0f71a53075f9 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "http://tools.suckless.org/wmname"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 9b1385d9d6ad..9a35cef08243 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "http://sourceforge.net/projects/xfe/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 4f6e3342f588..cc08436fa033 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; homepage = http://xneur.ru; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 61db2656a409..0e4fd4db1ba8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 617d307b7835..d39dfe3582e9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; maintainers = with stdenv.lib.maintainers; [ wizeman ]; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index e1bc4e977f6a..afe0600d6f7e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.google.com/chat/video/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cf01a3c6d5f5..07184bfd9f2c 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -42,7 +42,7 @@ rec { meta = { description = "HTML5 compliant parsing library, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; @@ -63,7 +63,7 @@ rec { meta = { description = "implementation of the W3C DOM, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix index 7ad39ee4ec9c..ede053aeca3f 100644 --- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix +++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libcss/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index fec93c39ab9d..32bede76e432 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibParserUtils is a library for building efficient parsers, written in C"; homepage = http://www.netsurf-browser.org/projects/libparserutils/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 462d532cb9c4..9c16ff9b89c5 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsbmp/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 5894e5c1c033..a4502d2354de 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index a90e6fa193cd..300e9965092d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "implementation of SVG Tiny, written in C"; homepage = http://www.netsurf-browser.org/projects/libsvgtiny/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index c4e4a60fbd68..8d19d1c1ef24 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibWapcaplet is a string internment library, written in C"; homepage = http://www.netsurf-browser.org/projects/libwapcaplet/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 92175bb23e9c..36571809a370 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index b674f3a83fb2..858e99c245ba 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 457d3441b3ab..ec614bf4b8c1 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.bitlbee.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index d746d54974af..54e2d813be8a 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.centerim.org/; description = "Fork of CenterICQ, a curses instant messaging program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 68973b4e47f5..64021c93bc83 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = http://gtmess.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 4e176ec56dcb..be24878259fb 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; homepage = http://www.kadu.net/w/English:Main_Page; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c3af0ad0e340..be12c7e8e2ae 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index cf42dd5700ba..7cbc38ea0dc0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cypherpunks.ca/otr; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 544aa06877ad..6402e7154de4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/novas0x2a/skype4pidgin; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index b87db662f45e..348802fe16eb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index a31a682abf88..fb14782ef9f6 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -14,7 +14,7 @@ let meta = { homepage = http://sflphone.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Free software enterprise-class softphone for GNU/Linux"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index a4035604168f..4ce098e6ca46 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 2fa82e1251bc..713aa8f03744 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://atdot.ch/scr/; description = "Open source tool to record your Skype calls on Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index f1ac10639344..32755306cc76 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { meta = { description = "A proprietary voice-over-IP (VoIP) client"; homepage = http://www.skype.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 51639f6050dc..b0302ba8e0bf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface for Telegram messenger"; homepage = https://telegram.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index ded2bbf92500..4527d981a9f0 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference CLI for Tox"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index f0a6dbbe7e77..db1f2011f113 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://iptraf.seul.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 537897c13b4a..224f639cc150 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tools.suckless.org/ii/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 98d5afa0ba9f..eb21f34838e7 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/falsovsky/FiSH-irssi; - license = "unfree"; # I can't find any mention of license + license = stdenv.lib.licenses.unfree; # I can't find any mention of license maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 988320dd61fc..4841aa8070e0 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/cryptodotis/irssi-otr; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 2a5be53619d7..432dbddb97c0 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -55,10 +55,9 @@ in with stdenv; mkDerivation rec { combination of screen and a text-based IRC client such as WeeChat, but graphical (based on Qt4/KDE4). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom ]; repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } - diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dbd5a41afd34..9c397f27c46f 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -55,9 +55,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ the-kenny ]; }; } - diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 4c74c2c32de0..013694d259cb 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index bcd0eb503f60..6c28840f7e5f 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index ed6c348706b9..25a51b3c9365 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5fa19c71d9a1..5bc228f9a6b9 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 558394199f45..4d08e1cc60a1 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "SIP stack and media stack for presence, im, and multimedia communication"; homepage = http://pjsip.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 24bc20af6528..8fb929d53e10 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 619925354f06..f142395aa57b 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VNC viewer that adds encryption security to VNC connections"; homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 440eb90390ae..459ae9fab82b 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6802782bcb5d..65ddd7305c83 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index a51f65cbccb0..f5104665562d 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://etherape.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 744c8c01efa5..4ac5e8300ca8 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; description = "Bidirectional file synchronizer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 57afefd7dcdd..6d4306044a41 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://humdi.net/vnstat/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 752a7824e6f0..2e60b9aa3228 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://www.yafc-ftp.com; maintainers = [ stdenv.lib.maintainers.page ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index f126d6bfba65..c260220aad4d 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Incidences can be filtered, added, edited, deleted via context menu. ''; homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ee0475d45ec0..9c255f493d3f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { accounting principles to ensure balanced books and accurate reports. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnucash.org/; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 014aa5bf0fd2..2b2fd87cf430 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5e5c98e82601..007e093378da 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index de6517923b6e..fad2167fb7ac 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -71,7 +71,7 @@ in homepage = http://impressive.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 419d761b0959..409da36b2640 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -17,6 +17,6 @@ buildPythonPackage { meta = { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index d56f4bed0ce9..2940569ef659 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -28,7 +28,7 @@ in meta = { description = "Easy-to-use personal finance software"; homepage = http://www.codelathe.com/mmex; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 250ce163e4f5..4026031de084 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = http://www.scribus.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index a2cc07b0a61c..696890f95f1e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; description = "A beautiful OpenGL-based gravity simulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index fa6dcaa82ede..4396ab463c6d 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = "GNUv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 142519c30ed5..a6a5f68755a4 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = http://www.gnu.org/software/archimedes; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index d135fb094345..404ffc5010b4 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = http://caneda.tuxfamily.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 0bc6b60e7210..c761f6196424 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Wave viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0e81616a0069..1fc97abef927 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; homepage = "http://www.kicad-pcb.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index e434c97db2b0..dd3eaecc7441 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = http://qucs.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 1feac0b31c17..30e882a7f38e 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index 25c6a309cf37..108986ddefe4 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index f2c9d2e646f0..e68d2a4ab91a 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; repositories.git = https://github.com/steveicarus/iverilog.git; homepage = http://www.icarus.com; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [winden]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 54aae9e7d3bf..df7d053d93bd 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = http://xoscope.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d14fa08bbb57..ddfb92def958 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 2fb9678b8329..b1f48fdf04b9 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -47,7 +47,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ab46efa9a961..c71ed73a9925 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index f77e9d34a2a8..9e98c8db3947 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 0713ff09e929..f601f97de62e 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 1f29b3aa1a11..f8b4fc73100f 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = "http://minisat.se/"; }; passthru = { @@ -54,4 +54,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 430537fd57ff..065d1dd9e02c 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -39,7 +39,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; }; passthru = { @@ -48,4 +48,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 970daf739fca..6c2cce0ea4b1 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 55ea4c6216c6..fdf5c1bd8315 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index f76640567f60..49a46e0c8b27 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -60,8 +60,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://gap-system.org/"; }; }) x - diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 997080ee303c..d4d352c95bbb 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 7123b476f356..096796a859d0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Maxima computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 5c5dfae8200f..f4b3447e3b61 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; # Or GPLv2 at your option - but not GPLv4 + license = stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { @@ -58,4 +58,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 8471c46c8d75..66609fa58341 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 01be4ba7e6c6..75448b6965cd 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform GUI for the computer algebra system Maxima"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index acc4740eb6b4..2c9d63be1b4d 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = http://yacas.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index f4b79c8d236f..7020de0bca88 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://boinc.berkeley.edu/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a380f05b0915..c0b7936edea7 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -35,7 +35,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; }) x - diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5fdede1abcdf..d402a48c815c 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = http://simgrid.gforge.inria.fr/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index e58183a4f40b..da6e0cb2805d 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://tulip.labri.fr/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index a6b3ac7ccfdf..3a9df1505742 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 1be797fea966..9bc4401e0681 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = http://www.cobite.com/cvsps/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index d92b49b9ef6c..a7e6a62ce5f5 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-2.5"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; inherit (qt.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index c3b3469ca1ad..590e090de48c 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-git"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 5290a12a54ac..195f6f3a4635 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/greenrd/topgit"; description = "TopGit manages large amount of interdependent topic branches"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ]; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 73b21728e165..29094f1efce4 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meld.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5fdafe8ac2aa..fb3e115e125f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "http://www.selenic.com/mercurial/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index e89cea6aadce..29fafc4db74c 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { offline, so they can be retried when it comes back online. ''; homepage = http://joeyh.name/code/mr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 264340b48262..843fe9ad3230 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 90bca9b07124..e71d23132aca 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco simons ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 569c442f9838..b3bfe8a22e68 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation meta = { homepage = http://www.twobarleycorns.net/tkcvs.html; description = "TCL/TK GUI for cvs and subversion"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 70dcad49c978..a9a2ec46397f 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/avxsynth/avxsynth/wiki; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 1058243c0e08..f962b52dd627 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { media collection management, playlists and statistics. ''; homepage = http://bangarangkde.wordpress.com/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index ce8bbde2ecd1..8287cb9121ea 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index f4be54ae23ec..e3c288534035 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 74e3d58553a7..5e8e63564f4f 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "Linux DVB API applications and utilities"; homepage = http://linuxtv.org/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 2e8b7e63cb82..06122619066a 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { supports most SWF v7 features and some SWF v8 and v9. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 30e0bdfb197a..16bd57bef34a 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { meta = { description = "Kino is a non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 1b3acd2c2ff3..6e7b874841fc 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 43482bd97624..bec9d85aefd8 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = "unfree"; + license = stdenv.lib.licenses.unfree; homepage = http://makemkv.com; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6a385786eff3..f3cef6db69f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -72,7 +72,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index f0830f007d91..d8ada6372b10 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -60,7 +60,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats (MPlayer fork)"; homepage = "http://mplayer2.org"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 11a16e3a79d2..82077e4d3ddd 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = http://www.bunkus.org/videotools/ogmtools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index b3880067cac4..811fb7a78dbf 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/huceke/omxplayer; description = "Commandline OMX player for the Raspberry Pi"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 807e3954d6fe..29bb439dcf66 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { 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 ]; }; } - diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 9d7f8a6ac992..83b5c778f866 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 84600884e7b6..8e2da5c3b764 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://virt-manager.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; }; diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index b21f73ddc549..3db2bde6540d 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://awesome.naquadah.org/; description = "Highly configurable, dynamic window manager for X"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index b69dd9d8a492..626a0926a676 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "www.suckless.org"; description = "Dynamic window manager for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 33acd0002705..6830e3a1c010 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index ed2637eff6e5..08c1be9f963d 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 56a5f0e3e2ce..fad5b8010ea4 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index d1419fc22258..65264c20db35 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Ratpoison is a simple window manager with no fat library diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 92f617888921..e1d9e1614f38 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/freefont/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index e216f4b0278d..db4d13b890fd 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/miscfiles/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; }; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 30c8bf07d418..5932caf9e97d 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 371382b2607d..045f60e8b606 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GConf"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 55f0e0ae1a3b..ee08975b9daa 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { OpenGL drawing for standard and custom GTK+ widgets. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 46218c8f601b..4ce51844a51e 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GtkGLExt"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix index 4b50840534cf..76cfacb0d776 100644 --- a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix index 12518c634c4f..47b958002a39 100644 --- a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index c916be6c9a72..b9ffcffafbdc 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.35"; versionMinor = "90"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix index 0390fc133687..fd16d2d4985f 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index ca983258d956..2a585d78f4e5 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix index 12518c634c4f..47b958002a39 100644 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 70c860849e08..41597e47fa54 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.36"; versionMinor = "2"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index 0390fc133687..fd16d2d4985f 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index 63bfa12c4bb4..f5b74af1a8dd 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 0db47fb2d7c4..5fd745644468 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index c2a256646786..6d22fc425f5f 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -6,6 +6,6 @@ kde { meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 39e9c10a0fbe..9e4e8eaad051 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -41,6 +41,6 @@ kde { meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index a80574ff67ab..6646718ddc96 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -8,6 +8,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 72b267e43c5e..06025a106185 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -10,6 +10,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index b6fd701ac129..6839a367aac6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -10,6 +10,6 @@ kde { meta = { description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 70904b17c232..58edc86b4291 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE camera interface library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186bb..3084d16faef2 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 2c2ba3796a2c..3a5dca63e0fd 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 35af39aa611d..85a52c7d3d53 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 18c6534eb5c9..50bcc61bfbe3 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -8,6 +8,6 @@ kde { meta = { description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 28d9252187e0..419bdc67eeba 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE monitor calibration tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 5276ec09f462..6a999b9b3db2 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE paint program"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index c5c2c6e05d7c..3ce749dd7d8f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE screen ruler"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 1381ed7dd266..6ff2466f4b61 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -5,6 +5,6 @@ kde { meta = { description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index f01a609e20de..508ce2c10d18 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -5,6 +5,6 @@ kde { meta = { description = "KDE screenshot utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index e7c01f98a8c8..ede5e6ff1ada 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -8,6 +8,6 @@ kde { meta = { description = "Library for decoding RAW images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index 096b0a6e957b..fca746e05f19 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Exiv2 support library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6b16265e7a3e..6734ab015d75 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -5,6 +5,6 @@ kde { meta = { description = "Interface library to kipi-plugins"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index b539eab38992..4d0bab676a26 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -5,6 +5,6 @@ kde { meta = { description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index aca1691eace6..2b8d9231bfe8 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -12,6 +12,6 @@ kde { meta = { description = "Okular, the KDE document viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index a344cc4b4b46..984665b2f4be 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -5,6 +5,6 @@ kde { meta = { description = "SVG KPart"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 7e29eebf3b79..2d1a174eda52 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -15,6 +15,6 @@ kde { meta = { description = "NEPOMUK core"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index 0d29a4f97de5..febbaf61b4d5 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -6,6 +6,6 @@ kde { meta = { description = "NEPOMUK Widgets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 5248d6567d24..1e1ef0cf8468 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index a42e882710a7..64e3c34453ee 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index d891ad98fdc5..15d90be31314 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 972442dc56bb..2b0f729c0a35 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index d39778c93717..a447812f9a78 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "Notification daemon for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 6e0d9d3e7e71..8181b809c83f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 3131ea679b01..694db49f589e 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 33b64cd878ed..44f5a95224e4 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 5004f2aaf478..360e4a0a2503 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 5675c09fed81..cb2975d8214f 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index e30fcf223571..32a320c779bf 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix index 4776af3be324..62a90578bd30 100644 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 94fc0e369e5c..5ce88921fa83 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 919d19a23025..fdf4211f099a 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 8988d072e2c8..fab6152c99a4 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index b4c9c790ac1b..df218190357a 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index e56eb3f0a713..671f57faeb35 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; description = "Tools and M4 macros for Xfce4 developers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index a5edb8dd560f..e654b2f7dfbe 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 7740af438d9c..45e213473f84 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a419f076b6e0..d965c296490e 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 2e76b22510f9..ee5ae15fca1a 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index e608d4591069..9ed2be4a7402 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8067e1841caa..697ff2bfb8ae 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index bb235911ba4a..4b190889c850 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index fc4511d896e2..69557019f15d 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b7dcb806b017..16dfa580a193 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4446876ab1f8..45040c2f3753 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 99c342da780f..be2f323fde1c 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}"; longDescription = '' @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9713164711f1..fbeea0768ad3 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ef75cf71f581..8528be077295 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -438,7 +438,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 58732f1a0be2..62dbad747584 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -500,7 +500,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ab7732a68eb2..8b185d00bcc0 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -495,7 +495,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index cd33d3d79a70..8b14dbc5cbfa 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Free VHDL simulator, mcode flavour"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1de0c88a6bc7..3cab8379720e 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://gentoo.org; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 4c3845f9ee56..070f29e16f64 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Ikarus - a Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 577533c2e528..a34fa965f066 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dragonegg.llvm.org/; description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 29950aa9e3dd..f6a52b52e1d5 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index bab8e66799b7..19f8eab482cb 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b1ee1d000c4c..e4bdcf7889bb 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6fd7ad9d65b1..6a07c7af69e2 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://openjdk.java.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 90a64ecd5217..657d18070e96 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -180,6 +180,6 @@ let result = stdenv.mkDerivation rec { passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305c..9b384c5ae460 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -80,5 +80,5 @@ stdenv.mkDerivation { mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b488308f5c4e..faa281efc7a6 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.purdue.edu/~qobi/software.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; maintainers = [ ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ad7348925b5..1e82e03f16c0 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6663e00c36ee..7617e5fb1cd9 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming environment. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; homepage = http://home.gna.org/guile-cairo/; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 30480844a414..90012bb3ddd4 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/guile-gnome/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 310c0e923805..2f77c273af7d 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/guile-lib/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 1eca6b3a3025..175c656859e5 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { form, panel, and menu. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index f44f71020b4c..55f1b1840fa0 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/guile/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 38fdcd2a0a6c..f08d1d2ec7e0 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index 8e7914afb616..fc1f01cb3730 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 13f7964769ca..51ddcd8f2906 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index eae2d82d5d0a..5ae5b4156a87 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 303ea1d74711..8fefcb0ec6db 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 3bcc85fb4342..eeb447e0e619 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 65badeae1dde..e112a5ae43d4 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maude is a high-performance reflective language and system diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index eb7e925561c8..72c0e2d53759 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f44efb943587..797fff584f6a 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation ({ meta = { description = "High-level interactive language for numerical computations"; homepage = http://www.octave.org; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } // ( if config.octave.devVersion or false then { diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index ccaa45c6c338..4b5f3bd8b3bd 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 693b7bf8fe19..bc4b1a778fc2 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 49f5fec1da3f..3a7fa7072849 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cbc4e0b8c89b..8c9c6a5b9ef9 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; - license = "LGPL-v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 59124f011dd4..48e96aeea26c 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.antigrain.com/; }; } diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 7790f8e124b2..c5514acd1d43 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index fc8d0415c36b..2b5da8de423d 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 6b054aaf44b1..734bcc0797cc 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 2dca2a8e1ec5..ce7f92a20354 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://library.gnome.org/devel/atk/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix index 2464a09f51aa..3983816a8b44 100644 --- a/pkgs/development/libraries/babl/0_0_22.nix +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 41280e87253d..473df8819c0a 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 808310e326f0..823eac145485 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; broken = true; }; } diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 78bf7a678ac7..5105bd298762 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index daf36e28919b..2111e1b4a55a 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a0e1bcfa6121..4e75cda0c239 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://check.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 909e8ba7bf26..6c673a7dc028 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.cs.wisc.edu/condor/classad/; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index a6ebbf8dfdc0..d84baedf96e0 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index c3878ef4b789..205f4d83693a 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 8297dc9d5da3..59c64b0de9f7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index 00a4edd2a988..e5f5a455c899 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 3614d149489d..1d085222341a 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix index 898c931f354a..7a9d114ce8e3 100644 --- a/pkgs/development/libraries/clutter/1.18.nix +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 808e67cd852b..027b90d8e11c 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f866b2299c1f..034d7d658e17 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 0b834a5ddb32..348f7bdfb66f 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/commoncpp/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 9a71393badde..2c22af1684d3 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "A configuration parser library"; homepage = http://www.azzit.de/dotconf/; - license = "LGPLv21+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index 123b53783a68..63afd22bcf88 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index fb13e0b8c6f5..02349bc0267b 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index fc489f9eb665..99177578c779 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = http://www.audiocoding.com/faad2.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 92146c12e302..c394fd070286 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/ffmpegsource/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 87e47e1b046e..0cd161251c95 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 1d9862755630..2fe104e849fd 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a641040187a8..7c78ca3ed6fb 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: { meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; - license = "X/MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 2ba49162e2f0..1fd6c429dc02 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index 415a98029cc6..516fb9329833 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://gdome2.cs.unibo.it/; description = "DOM C library developped for the Gnome project"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index b2f2e85a1ea8..3f9a619ff6a1 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 0649775ad216..a589d625273d 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index b153d91934b3..43ba2a9ca113 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation ({ most systems with the Linux kernel. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; #platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6801012e8553..66fb0179489c 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index eb653591005e..2b1a5b571ef0 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/glpk/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index f87211195d52..d79293eced14 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = "LGLP2.1"; # or later + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index f003979c701c..d0559c46795b 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 461187a509cd..c96c830e2f7f 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 89306540694b..6aea78a3ac52 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ca9c003dfe74..cd48e08a39c4 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 70b4ab8639d3..383c1a7e223a 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gsasl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9631746691f8..da4796fba896 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 4959a70ca631..207b82486981 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gss/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 466406fbe793..792b6d2e4dbc 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = "LGPL v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 820e8eb07c9e..ff26e727e9f3 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 49c612f59e74..89b6e73e6b6d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; description = "GStreamer's plug-in using FFmpeg"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index a433d717039f..988d1bba258a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a09f82797608..a0cd0a4c646f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 769de911fd6a..e4411fcefbbd 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index e960aa90421b..d01961f5cdeb 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index cadef6802728..f781c624cea1 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { interface. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 1427ec866a9c..97a4638170f9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9a526de05b1c..d20f06635da9 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ef8f3e398832..09221502e363 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 43d0db9755a3..69a0341a6953 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 17dc5469910f..6905adcd71e3 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index eaccf2fb08bc..2620d9cc120c 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "GtkMathView is a C++ rendering engine for MathML documents"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 0b59cbfc4892..727e4b2185c0 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 600ea1a0278f..47057b819e0b 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7724bc5cc3ab..17ab80ce5868 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gts.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index c48130c555cd..6584c1ff9070 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 78206de9f141..290f411cbf49 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://hawksoft.com/hawknl/; description = "Free, open source, game oriented network API"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 55c4dbff2960..99a256e48adf 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec{ meta = { homepage = http://ndevilla.free.fr/iniparser; description = "Free standalone ini file parsing library"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 760ad096fd0b..ac67c17218f0 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://irrlicht.sourceforge.net/; - license = "zlib"; + license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; }; } diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index 995cd0510b4c..f1da2c064092 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 7711d4f170f9..7e08c8afe6f6 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 3d4e5f260dce..0f0fa3f775a1 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index a924e2adfa63..5c83a0ba3579 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = "LGPL2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index e15c5c8d179f..83d3149a50fd 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 8c45adf4b570..4199becb06d9 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://judy.sourceforge.net/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; }; } diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 115da78de979..c98a01f6f70f 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 774cc7047e8c..521118f31757 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f1f1c7dd9092..94dfe8712403 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.all; maintainers = [ maintainers.urkud ]; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; }; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 3028ba7367cb..4e6dd6d5b028 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = http://www.ics.forth.gr/~lourakis/levmar/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2fc03e0d67cc..f1cc25de39f1 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d9775c256104..f5a3d92d3db1 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix index 743528d92651..7f77183c8432 100644 --- a/pkgs/development/libraries/libassuan/git.nix +++ b/pkgs/development/libraries/libassuan/git.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix index 9a161ec170f4..2532cec03900 100644 --- a/pkgs/development/libraries/libassuan1/default.nix +++ b/pkgs/development/libraries/libassuan1/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 3c28b95c0667..758f86e5f9a5 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -18,7 +18,6 @@ in stdenv.mkDerivation { meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; }; } - diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index c05528450543..e69cd4ed2acc 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libcanberra/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 34441d8fa7f8..d22ce9ae2bf1 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = http://cangjians.github.io/projects/libcangjie/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 8e4f8a36547a..b9823cefd2d9 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index fc26fb9aca11..db4af40afbd4 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 856d5124a3ff..ac7b428bfb00 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix index 79c734dcad62..a2b35a726518 100644 --- a/pkgs/development/libraries/libchamplain/0.6.nix +++ b/pkgs/development/libraries/libchamplain/0.6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 263b34701eed..51b7f7e181d0 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1b16d361c6dc..f0d7fbfbeb69 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nongnu.org/libchop/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index b4cea379bbae..a5ff8d409b2f 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { available. ''; homepage = http://sourceforge.net/projects/libcue/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 58c150a22d6e..ba7e3e47ff76 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libdaemon/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index f92bc5855243..bc5f6a1d7a03 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 69f66d7f5b7b..7565502cc1c1 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "Capture and control API for IIDC cameras with AVT extensions"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index b8f79f2ae695..f9d1fc87870d 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = "LGPL-2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 21ee2351c58f..62c7d4322527 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/libdivsufsort/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; }; } diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index d3ce7082621d..6af8e7a415e2 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index a92a48bf75f9..a80c0677a3bd 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 6b3a16d1c092..8d2d820a2301 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.flamingspork.com/projects/libeatmydata/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; }; } diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index ac52876f887e..d9436456d0d4 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { homepage = http://www.mr511.de/software/english.html; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 48c66cb60706..4843b65c4d38 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libexif.sourceforge.net/; description = "A library to read and manipulate EXIF data in digital photographs"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 309816b65e5e..6df5ca683f1f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index ef7a67b7fcd4..6293632452ce 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 430560107702..b039c84b2fb1 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = http://toxygen.net/libgadu/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index 9dc8b8a23179..ced3b723b132 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = https://www.gnu.org/software/libgcrypt/; repositories.git = git://git.gnupg.org/libgcrypt.git; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c53b5479b7b2..ba3de49ede8a 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; @@ -38,4 +38,3 @@ stdenv.mkDerivation (rec { // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) { configureFlags = [ "--disable-aesni-support" ]; } ) - diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 07e8d2869ce2..d07aae3ab807 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = http://www.remotesensing.org/geotiff/geotiff.html; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8ce9a10701ec..663bd944fb92 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b286dcfcd199..7b669cd780ae 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/libiconv/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da8a7d50b67e..802ee9e3e88f 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { included. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c7513b0a167f..1a39e0941535 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -37,9 +37,8 @@ in stdenv.mkDerivation rec { meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } - diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 1094a4e75919..158962d32940 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = http://libiptcdata.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a2235da408e3..ab8c696a66c7 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index f991fdc2f299..e7e4cd6c75d9 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index b45b443f6dee..387028177346 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index be1f3f2b4b96..959dca475732 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index fb6eacc366b0..94401c30a6ba 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b1f7b0071c85..865330fdda7c 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libmrss/doc; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index a49cd95822f6..b78e583fa640 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A de/compression library for various Microsoft formats"; homepage = http://www.cabextract.org.uk/libmspack; - license = "LGPL2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 14b50bb51182..da32903c94e7 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 3bb698e9bf63..c47076014c43 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index aeb0792dacfa..ab6931c63ca3 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index b492a16a2055..f34c421a120a 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libnxml/; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 0d5bdfcc9a75..3782dabc67bd 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = git://git.code.sf.net/p/otr/libotr; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "Library for Off-The-Record Messaging"; }; } diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 9505a6cf052f..ab8e03b89a07 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 85e8bad89066..a987768bbc53 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://parchive.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; }; } diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index c968fd352eb8..b389176b3da8 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "trackball-based 3D viewer qt widget including many useful features"; homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 9b51f694ab3e..58ff77480b63 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 41445b841435..76daf7d748bf 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://librsync.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; }; } diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b0a726ed7f35..ae6299286a17 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index c48c5265fc48..bd38c37a57b3 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a819e0cef6f3..7d46f9e32cef 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 5e069655afc3..bae22ef220fc 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 81336aed8aad..f7f0f79075d0 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 125cb890008d..f60043f18b17 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/LibUnique; description = "A library for writing single instance applications"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 9bc3cb7f9012..b578d895c5f0 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (rec { strings as internal in-memory representation. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad4..95299cb3fd7b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "VAAPI library: Video Acceleration API"; }; } diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index ececdabb56ce..85f0dbddb0b8 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index aebb81020b3a..61f519dfe51a 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; }
\ No newline at end of file diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix index 4b0acd83fc39..f94ca128228d 100644 --- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix +++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 09860522ef41..fb81dc425f1f 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix index 767314cdcae9..8ca872864bd9 100644 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ b/pkgs/development/libraries/libzrtpcpp/1.6.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index b18aa6848bfe..9962efa7f1e6 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 4ffbb9719cab..2a77c8e0623c 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { the MIPS and SPARC chips. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 32424d546b44..d4400d840c0b 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://log4cpp.sourceforge.net/; description = "A logging framework for C++ patterned after Apache log4j"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index f153c684629a..7fa6194cbca6 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.oberhumer.com/opensource/lzo; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index 9cfb8afa8eba..f9632dca9d22 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.libming.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index e5d212dc2690..652227d47e85 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpc.multiprecision.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8e3281c862ae..e3fbaececb9b 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -39,10 +39,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index f92fe3730435..2363f33de079 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; }; } - diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 3cc1c6ce43c5..9d9a524e86d0 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 0a2df0003847..4aecfa4b01af 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix index cc20550802ed..15da5054291e 100644 --- a/pkgs/development/libraries/mygui/svn.nix +++ b/pkgs/development/libraries/mygui/svn.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index c1cada63abee..379848b0cb08 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 7b502822a180..7627fb79e992 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/ncurses/; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 4208402ab993..57d3732fa6dc 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { I/O. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.lysator.liu.se/~nisse/nettle/; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index d9369d59c7be..f5f72c006c73 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://fedorahosted.org/newt/; description = "Library for color text mode, widget based user interfaces"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c9b685aa05b9..4f87f2bc230f 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { that this is a solid way to provide a co-routine based framework. ''; homepage = http://www.gnupg.org; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 6bb1916ed0fb..527bb25dce18 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index f508637dfefb..27193e045450 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; homepage = http://code.google.com/p/ogre-paged/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index b024b518b690..48f5bfc71e52 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; homepage = http://kcat.strangesoft.net/openal.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 75d6033e1cc5..b5e390eafa85 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.openal.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix index 2c1b148251c6..b485fa3e947b 100644 --- a/pkgs/development/libraries/osip/3.nix +++ b/pkgs/development/libraries/osip/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 3ec3dac221f2..cfa838f5a370 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 1c62a64d006d..40b02c2afbb2 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8518083b4d35..6d79587abcb5 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "A compatibility library for pango>1.30.*"; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7138c44da643..4cf6bd44dd3b 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = "BSD-3"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 5948fd0ef2b7..b29deae9260c 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index cb76a1b615fe..81619d9eb552 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 5e15a63735ee..35262f797e97 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://plib.sourceforge.net/; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b9412b37cbad..79cc8deff802 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -49,7 +49,7 @@ let Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } merge ]); # poppler_drv diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index b4c8a7f17890..acf760f4f799 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -107,7 +107,7 @@ let meta = { description = "Geographic Objects for PostgreSQL"; homepage = "http://postgis.refractions.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; @@ -148,4 +148,3 @@ in rec { }); } - diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index e3b1444b8cb3..f93eee674ffc 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://bugseng.com/products/ppl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 6e3cc7cac55c..17c05ada7a84 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Cartographic Projections Library"; homepage = http://proj.maptools.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 2f99b9d72183..dd39804983a4 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0826e6c5f7cb..05500f345acc 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 4e4c3c553616..0461e5ebcf54 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written in C/C++ and makes them available for major Bio* languages: diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 63de26ee90c9..bb33eed61421 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = http://www.chokkan.org/software/liblbfgs/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 41a6b8501eca..30c1f4937ecf 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4e1187aa0f76..d7a0b11a8dab 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 7d655ae122a0..fdad4e21b0b6 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0e542b353f67..5104532ea91e 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Common interface to speech synthesis"; homepage = http://www.freebsoft.org/speechd; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index e6769285fc81..28afdf85dfbc 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A software framework that allows research manipulation of Biblical texts"; homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 54db07d0de82..e04363326d01 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b06dffa1202d..cb34edb4762d 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 02a1008cda5d..d0eb8987ea08 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tdb.samba.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 82ce734d1735..7741549666ad 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ee742487e263..ccd619e8bc18 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://fallabs.com/tokyotyrant/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index a0d607517ac3..bdc2b4da6e3e 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; homepage = http://tsocks.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index cef853698a8e..05acc6f53085 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ec478d7a76c..f3ac325b5a12 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 11dc34176f53..03769815a3e2 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -23,7 +23,7 @@ args : with args; meta = { description = "unix odbc driver for postgresql"; homepage = https://projects.commandprompt.com/public/odbcng; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; ini = ""; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f05c01bf58df..6f1cb572b9bc 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Intel driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 9a81b840b35d..9b28d0016ddb 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 97251e15c497..04bef5ef41c3 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index c92df5a8bcb4..846fc64a91e4 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.vmime.org/; description = "Free mail library for C++"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index c9e7fb4249d9..1ff34d45ba33 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix index 57240eb73356..b89900d2b05e 100644 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ b/pkgs/development/libraries/xapian/1.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Xapian Probabilistic Information Retrieval library"; homepage = "http://xapian.org"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index b6bc94814e64..9ce5312f69ab 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; homepage = xapian10.meta.homepage; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 7ea79a629245..1c1426d969e8 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xerces.apache.org/xerces-c/; description = "Validating XML parser written in a portable subset of C++"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index afb23e4de354..80f4e2fc8604 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index f79483874f6b..a0466091a526 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "GUI tool for avrdude"; homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix index d0e2517cdd9e..c7365f944e95 100644 --- a/pkgs/development/misc/intelgen4asm/default.nix +++ b/pkgs/development/misc/intelgen4asm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Program to compile an assembly language for the Intel 965 Express Chipset"; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f3103..ff344ef6f327 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://cristal.inria.fr/camlimages; description = "Image manipulation library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7379a62d4244..8f18658b0f65 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade6..f4837bd047f5 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "An ocaml wrapper for the Expat XML parsing library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 4d46bda243f3..f1ec69143b07 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 46398d26114b..8b611c65a41d 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 75c8d7ad2244..7cefe26746f8 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.pSub ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 392cf5c9772d..c2f50c4e5b83 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (rec { ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; description = "LablGTK is is an Objective Caml interface to gtk+"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 976910aae29a..333e86fa3fe9 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "OCaml bindings for gtkmathview"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ed70d1b9c3ee..0ae60ab07e4a 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8f19847680b6..94395f601aa4 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 6361dbd9ae64..51af8d99d69b 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlsdl.sourceforge.net/; description = "OCaml bindings for SDL 1.2"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d71..d92207cd20b1 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index e996b6223b1e..77ffa7528981 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 19beeec1ec54..72efaa0606d7 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5d22970155b6..3b7f77ae96d1 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 = "perl5"; + license = stdenv.lib.licenses.perl5; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 619f2f14b96b..340c5805e9c9 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 = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b30e2f12fc62..2b412d518c5c 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -34,7 +34,7 @@ buildPerlPackage rec { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.maatkit.org/; }; } diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 32ef97bf29c5..d88504379ed0 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Python DBus bindings"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a6efb8bdc2b3..93fa70e44bcf 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 374158da810c..cc36680fcb01 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { plots in publication-ready quality are built out of these primitives. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://pyx.sourceforge.net/; }; } diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 9ad34097d0b1..89a17d28a1b9 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://ltp.sourceforge.net/coverage/lcov.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.mornfall ]; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d549bd8fb198..2ab8c05ebf85 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Free advanced command line hexadecimal editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index f7fb810410dc..a2d135d44841 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Interactive Raw Editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a6ea2c2f59d4..a7e55de7d47d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 3a0879d6edfd..18481d16f17f 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index f21be7cc48c7..870664c252a5 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2d7c63fdc7de..ccbf74e528e2 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -52,7 +52,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # Of course, we don't really need that on NixOS. :-) description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 25ef7ef0b246..edc901858b83 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Simple wrapper around make to colorize the output"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916b..2a8c80e7db26 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa488..6b24df39be9a 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix index 6a76fa0302b6..2da17490abff 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f8466e5aafda..b7316fc17c4a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { build-by-convention behavior. ''; homepage = http://www.gradle.org/; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index c6856dae5651..75d72e3d52a0 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9a8979aaa6cf..54509178b1a1 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; description = "Doxygen, a source code documentation generator tool"; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 8698dc27b401..74e967686f3e 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { generating Guile wrappers for C functions. ''; homepage = http://www.nongnu.org/g-wrap/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index cfcd8564b4cc..c8bb94412cad 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -24,7 +24,7 @@ let version = "0.94"; in homepage = http://fastjar.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 88246e4bb6eb..b35ec4357c4f 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; homepage = http://josefsson.org/autobuild/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index f6793e3aeec0..c3b44ca56863 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 08fcd95afb5e..38fe289d29a1 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 0af9877c9355..2cd80eb4bac5 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 269d423f2fab..6a93cdc78fdc 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a93e8d60b5..d4369787f1b6 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index d20ea2c2e91c..0c6ed42825a9 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3caeee7287a1..8d8fc5d464e8 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/binutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; /* Give binutils a lower priority than gcc-wrapper to prevent a collision due to the ld/as wrappers/symlinks in the latter. */ diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index bf927db2793c..2cc8e640631a 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://sourceforge.net/projects/cbrowser/; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index d9be5802fa95..53bc8ed78c8b 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { produced flowcharts in Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/cflow/; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index d313d271afbb..09c9325d4ff2 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/cgdb/cgdb.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux ++ cygwin; maintainers = with stdenv.lib.maintainers; [ viric ]; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 122c256657f0..0bf5bbce692d 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ''; homepage = http://coccinelle.lip6.fr/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index cfdc35f1b346..9f1eca0fa13c 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/complexity/; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index f9246df9e567..500129c7c9de 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0a6895aff6b9..91150255bdaa 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9e400cc5c62a..bc22752fe7ed 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/dejagnu/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b3a86a03d97c..2b5ced780633 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gdb/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d0efe4e62494..9926dd6cd334 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gengetopt/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fdb5f72af830..d6abf8d10bdb 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 75e8e2dfe4fd..67688254a407 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { compiler or as a macro processor in its own right. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 2f35f96e9329..a434e54bba9f 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = http://www.jirka.org/gob.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 478d2162b337..e25998e54204 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/gperf/; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b447cf918cf1..cd8ad0d64cd7 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d60a06fb3e1..23bd35c8739a 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index caa277bfbf5f..0940bcca191a 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Hydra, the Nix-based continuous integration system"; homepage = http://nixos.org/hydra/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0c82c2cd2759..17714b7a9d45 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/indent/; description = "A source code reformatter"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 0465b6d90a89..086f4b5fed33 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/inotify-tools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index c7f790b7d50a..07ef5ffc082d 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { ''; homepage = http://siliconforks.com/jscoverage/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 78cd15e04bdb..5eee9ead5d63 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4c3500c65a24..8b0a92c12445 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index a54102043408..dc7eb5cabfd0 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 10cf371f13a8..a71afd5d4729 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "McCabe-style function complexity and line counting for C and C++"; homepage = http://www.parisc-linux.org/~bame/pmccabe/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' pmccabe calculates McCabe-style cyclomatic complexity for C and diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 9dc50abf3f73..455305be7492 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.dwheeler.com/sloccount/; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 6b99a5755e42..6b06bf385b3b 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = https://code.google.com/p/stm32flash/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index e3acf620c73b..1b4cab361ce5 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 7fa604e4af65..1f36a14fa979 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Perl script which converts Texinfo source files to HTML output"; homepage = http://www.nongnu.org/texi2html/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 9a41d2963424..5131d3814123 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { well-integrated with GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 732d3ab92c15..234ff82b50a0 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 303cdf89a050..bba7ef7fad04 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 36047210a924..1d7e6b330423 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; description = "graphical file and directories comparator and merge tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = []; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b03f5923bf..4c0176de7e88 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5660d51f0606..5bf5d7c2e8c6 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 284223905f64..5947f85343c4 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2dec606254b4..08980d5b1c4b 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -37,6 +37,6 @@ composableDerivation.composableDerivation {} { meta = { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ee4644239298..e301fe8431af 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://oprofile.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b6750f889373..457a5d1dcaa5 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; description = "Sysprof, a system-wide profiler for Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 884091c1636c..66dda8f43efd 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/systemtap/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 23f0dea44535..baa816589cab 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index cf3f6e1563b8..6f5fc2add3a3 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = http://www.andyetitmoves.net/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [bluescreen303]; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 77891f438813..86f4b961315e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { * mastering long poems * even practicing guitar chords! ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index bf2fb1e89c21..93297171bcb8 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.asc-hq.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index c923f0894052..4a7eb9376da7 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ballandpaddle/; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 3bb17b3e02f9..b4e61b6d1d1f 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -37,7 +37,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; description = "print large banners to ASCII terminals"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 252f881c3752..57cd67fbb7ba 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 0f4904bfed97..d7e2cf4894dd 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://home.gna.org/blackshadeselite/; description = "Fork of Black Shades"; - license = "GPLv2+"; # Says its gna.org project page + license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 085c7c4082cb..46f5b3d01830 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index ce3a0c8fa3c3..0798173a64d2 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 99bf2d41fd69..538efebf8334 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = http://www.nongnu.org/crack-attack/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 944b67041c26..b50aa7040484 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { description = "A model-airplane flight simulator"; maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 6036d7fabd55..f0d885c1f882 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/dhewm/dhewm3; description = "Doom 3 port to SDL"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 1a026132e525..8cc1b9933cde 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 1f879393868f..96ff52446ec4 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = http://www.freedink.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like # maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index a30ff7e2f871..94451ef8930d 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ''; homepage = http://www.freedink.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d83358cd69d7..d26dfc2401c0 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = http://gav.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index b58654f1f429..d925c8810bf3 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gltron.org/; description = "Game based on the movie Tron"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 21c4195b28b8..3f1d52c5fc03 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "GNU Go - A computer go player"; homepage = "http://http://www.gnu.org/software/gnugo/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ee792ef1e4d9..7bdcc7afecd3 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/icbm3d/; description = "3D vector-based clone of the atari game Missile Command"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 6ab6b8d79d7b..8668de26a199 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple text adventure interpreter for Unix and Windows"; homepage = http://instead.syscall.ru/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index cbc445f62161..c7b40db5caff 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 70288e549a4e..8fe7591cde0c 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f2ac737486c6..f19596789cef 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c2a7ee90a1f6..580b27ab21d0 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = http://www.naev.org; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 4062405407bd..88cfbe98851c 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://trackballs.sourceforge.net/; description = "Cross-platform pacman-like game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index f62570dbd089..49dbb7ba82b4 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = http://oilrush-game.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 0c7e46ae0740..b031cb3f0dd0 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { meta = { homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 09a7761326a6..1b6b7f26a41e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = http://www.openttd.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 04d2f2ecb8b0..19aff03dacaa 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.page ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 77e8ab3b92e2..af9900cede53 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pio.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 009d07d4456c..7c58b4ca1e86 100755 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; description = "next-generation RTS that takes the genre to a planetary scale"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index d5f9ca6ee23d..98cf0dbeed8d 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/3dpong/; description = "One or two player 3d sports game based on Pong from Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 8969b613cebb..06e43fd273f0 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://hippo.nipax.cz/download.en.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 809bcc930d24..26c7e0a36677 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 934213279fad..fbf47653af99 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3848f22ed204..cf55bcd597e2 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { meta = { homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 196561d1e379..ea050d278691 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 7a78235bdff1..e6105eab95b9 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 51149d4f2607..1c9cc1393432 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } */ @@ -119,6 +119,6 @@ stdenv.mkDerivation { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 31fd25a5150f..7b258deef8a9 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { meta = { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = http://code.google.com/p/vdrift-ogre/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index cd2698665f62..29d3b4e45571 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://supertuxkart.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index 72a894b63afb..c8e0d3f097ff 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://supertux.lethargik.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 18a911d563bd..e5d9e5e97513 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/teetertorture/; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index e06aec68b1a2..83b2c62870e5 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/tennix/; description = "Tennix 2009 World Tennis Championship Tour"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 979fcd1a48c3..f7734c320e64 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -54,7 +54,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; passthru = { inherit srcDrv; @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 698653784a7e..a2355ba9d1e8 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 473161771158..e6370d6e7c61 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 2a25c290b2d8..a5ae8ec8b6de 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; homepage = http://trigger-rally.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 2fef444328cd..0d909e1c43c1 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufoai.org; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 4b1cab6531c7..c90972db66ea 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ultimatestunts.nl/; description = "Remake of the popular racing DOS-game Stunts"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index dbae3e167247..47fcd2dc4cf9 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 07055c415585..9d233d383384 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; homepage = http://sc2.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ jcumming aszlig ]; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index af112c37af4f..bba7823f6630 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://vdrift.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 6f0fb48f0a5f..f87633e299bd 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/vectoroids/; description = "Clone of the classic arcade game Asteroids by Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d9fcb47bcc36..0b3448737346 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer remake of ZED"; homepage = http://zod.sourceforge.net/; - license = "GPLv3+"; /* Says the web */ + license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 8f0830be1862..b5e4adfa0b91 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix index 8a08eadc6a48..e99ad03212c2 100644 --- a/pkgs/misc/cups/pdf-filter.nix +++ b/pkgs/misc/cups/pdf-filter.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cups.org/; description = "Image and pdf filters for CUPS"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 942bf2c21840..015c61e461e6 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; broken = true; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 181a89b66677..d15e873422e3 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index c23b60c29b30..60854f8550b8 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index e3c9dbc84e5d..5462f7727033 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://fakenes.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 150b45dd7275..7ef63f93026d 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix index d67121fe430a..571e14347b49 100644 --- a/pkgs/misc/emulators/mupen64plus/1.5.nix +++ b/pkgs/misc/emulators/mupen64plus/1.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index d67121fe430a..571e14347b49 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 9f93c9957d65..0fa5a08d2dc8 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusuable Amiga Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.amigaemulator.org; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 8323ca082b7f..b869143ff1cc 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = http://www.viceteam.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 3dd3d4bc7311..8103ff9c43f3 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; homepage = http://code.google.com/p/winetricks/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index a85d0fb389e2..0366b9dd22ce 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index c3bced292005..bca81a4b6b3a 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ef8cb7d0a927..945d6556837c 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index fa2c36cf2c28..bb3520e300ab 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 142c75aeb0fa..275b93e01b8b 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -23,7 +23,7 @@ let of output drivers for various file formats and printers. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index 0c9059a30085..4bdb6e132fbb 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ({ kernels (such as Linux). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 3eaa6336ec27..4b16652ba053 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ meta = { description = "GNU Hurd's libpthread"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index 54c6429955bb..6d2d20687bc6 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ were added using glue code, i.e., a Linux emulation layer in Mach. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 9ee188b0c8c6..34426b45d55e 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { Mach-based inter-process communication. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix index 4897c0c0af80..6f3d719d8169 100644 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ b/pkgs/os-specific/gnu/smbfs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/hurdextras/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix index 946e4c0c109c..5e2f428130cd 100644 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ b/pkgs/os-specific/gnu/unionfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index a3400ee0823f..0fc799225153 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = http://sourceforge.net/projects/acpiclient/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = maintainers.mornfall; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index c7f96206eab4..6fc3bbe7c08e 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 06af0c9228a6..70c8f36105c7 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; homepage = http://sourceforge.net/projects/afuse; - license = "GPL-v2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 5ebe1c06279b..1a602858b7ab 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; - license = "GPL2.1"; + license = stdenv.lib.licenses.lgpl21; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7ff782d69ed..9de84e228c43 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 81ead8d33d0e..5c5c2f026afd 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description="Kernel based automounter"; homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; executables = [ "automount" ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 88c7ffd93ee2..6e57e7651c45 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 0b7b6a0cafb4..fee955bcca21 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 0cc4e3741c26..43673c899b44 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7226acf0e579..9e81508080df 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 022ea648fea3..4ea9295ef4f9 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0f4a1b6985ef..d3a0b827ed10 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 57fc9390f61e..b60232a9b754 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 138b4ff468f1..c95532f13602 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dag.wieers.com/home-made/dstat/; description = "Versatile resource statistics tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 419207882f83..20419fe816d3 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index a9278f0c7ce0..e2a5cb37c942 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d0e77a3bb700..6c5dd330f658 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -38,7 +38,7 @@ in it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.tuxonice.net/; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index e701c91019df..325a44f97aa4 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://fedorahosted.org/hwdata/"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 33ac05aef478..1aa10648861d 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 63a056712ac3..00f27a43e65a 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 7c688943ea82..a47b59e9e567 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 30e2a37cb91b..6d9baed7f2dd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,7 +198,7 @@ let " (with patches: " + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fc05fc234525..d1eb38df6da2 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "keyutils-1.5.9"; - + src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = "make install DESTDIR=$out"; - + meta = with stdenv.lib; { homepage = http://people.redhat.com/dhowells/keyutils/; description = "Tools used to control the Linux kernel key management system"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index eb776dcb86d0..163ac1890505 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://latencytop.org; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 202831309f0e..a4d9e5a866df 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index bbeb2851ea38..3670f06e5439 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Library for working with POSIX capabilities"; homepage = http://people.redhat.com/sgrubb/libcap-ng/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f878d2844964..bb5dde9a61ed 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 700455d5f8b9..93cab433c9c6 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lsi.com/; description = "LSI Logic Fusion MPT command line management tool"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9386b50969fd..76f4661ecfc1 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; description = "A set of tools for controlling the network subsystem in Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index a863ee8a4d04..e843658dfc28 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; homepage = http://www.atoptool.nl/downloadnetatop.php; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 42bacd41be03..bb85acf4dcbd 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nfs.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d85c0c1a389f..0014a5d2ee53 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index f9aa80fba836..9acaee797f0c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index e28593d02522..88ab08e6c3d2 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; broken = true; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index fe5f938b75b3..2cf375c8368b 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; description = "A one-time password login package"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index b5672728b536..f5fdc5670871 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamusb.org/; description = "Authentication using USB Flash Drives"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index b53c61c754ae..787b72fde480 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e3b6168be9b5..4fb7fc8cb0b8 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index f966180a8b69..c1049d78f42a 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 13a6e87319ed..7fa32ce4c943 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 89e9ff663423..b4b4569def4b 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { meta = { description = "A tool to handle hotkeys on Apple laptop keyboards"; homepage = http://www.technologeek.org/projects/pommed/index.html; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 702ebc5d8284..04ab624b86a4 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Analyze power consumption on Intel-based laptops"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/psmouse-alps/default.nix b/pkgs/os-specific/linux/psmouse-alps/default.nix index 65f1a5cf6c61..9dd78f5885ad 100644 --- a/pkgs/os-specific/linux/psmouse-alps/default.nix +++ b/pkgs/os-specific/linux/psmouse-alps/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "ALPS dlkm driver with all known touchpads"; homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 4dbe7e54247a..3dd4588b0837 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; - license = "ZLIB"; + license = STDENV.LIB.LICENSES.ZLIB; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c95d27005efb..cc1363156dd7 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux Tools"; homepage = "http://oss.tresys.com/projects/setools/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2b4888f89cdf..ec504bd92357 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 8ea3599ff198..fe79c23dc440 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { homepage = http://tunctl.sourceforge.net/; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index e7cce315e8c6..a0df3d526f59 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d2b3632d69ae..9bf8692d1ce9 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index f84088a93028..a4fd00e4911b 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index ae24e32a1577..7abf6d7c8288 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { description = "Brings multitouch gestures to the Linux desktop"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8f8477d1864a..4b118a5a7cdc 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { meta = { homepage = http://qt-project.org/wiki/jom; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = "GPLv2+"; # Explicitly, GPLv2 or GPLv3, but not later. + license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index cd417eb9ad09..dde4f5d73711 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { homepage = http://sourceware.org/pthreads-win32/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 5e86d60871df..585228af2b45 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = ""; homepage = http://bird.network.cz; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 3d0324775f89..0fec6a5fe0e9 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the Default.scala included in the distribution as a template. ''; - license = "APLv2"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 2431c86ddb65..07dff1cf5855 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/modwsgi/"; description = "Host Python applications in Apache through the WSGI interface"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 8c0118912f5d..a86f924346bc 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -35,7 +35,7 @@ let version = "0.11"; in homepage = http://www.gnu.org/software/myserver/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 40b4ff1f2d72..bbbe54b95fd9 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9da83fe891fe..56d402397ecd 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; - license = "X11"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 78792c3a4f72..aa9da965d172 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 67dff3f6572e..3694547c2d99 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and group by, and is easy to setup and learn. ''; homepage = http://www.rethinkdb.com; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 898bfb711ffd..958578138bc2 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/pies/; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index a398a3ccdf98..781fca1c33d2 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index dcd577bb6cb7..a8c991e12d3e 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/radius/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 76e416d64724..569ec87c4cb0 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index acff3a84a31e..2d827c737d8b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = https://code.google.com/p/shellinabox; description = "Web based AJAX terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.tomberek]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 2afec801961c..fdb1dcbd1cf6 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 90e71f5e47ad..14cd91ee1418 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 642b713daaab..a6552738ea6d 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -16,7 +16,7 @@ rec { meta = { description = "http-proxy"; homepage = "http://www.squid-cache.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 96073645cc1c..ee566c32def5 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://unfs3.sourceforge.net/; - license = "BSD"; # 3-clause BSD + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f15705d4a113..5868125c97f1 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Erlang"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.ejabberd.im; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 61f6478629dd..6a6b8563a555 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { Bash without modification. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 4354a3cd0b3a..1e1904a29a5a 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/rush/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 1fe3cb646ff4..8506c9f38f3d 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; updateWalker = true; }; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index b2bdbe8aaeaf..00cf9a54fb7e 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast and small background setter for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 96241bd02cdf..d91f4bfdf652 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 57417fa77211..0d63c190b054 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 42e26825e330..eab21f2d2211 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ce439d22c21c..0e92021b62c9 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xnee/; diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index c9f41b68446a..efc0647f5dbd 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; description = "xtrace, a tool to trace X11 protocol connections"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index ec139e7240d3..54dac32141fe 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.analog.cx/"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index b2dedf4688d3..3d5abd074d96 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tigervnc.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 187d3345e6b3..acb8708ec14f 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "TightVNC is an improved version of VNC"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 6428fbaa9dc4..87324ac80a24 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { archives). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index ff51b28f34bb..cd0cea13a14d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; - # license = "LGPLv2.1+"; + "unRAR restriction" + # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 273b394881b6..afd734fbae04 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/sharutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 0258edb8a194..89f577e93ad0 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://viric.name/cgi-bin/btar; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index e51d6d6acea1..baa0d6170162 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 8a9db4e5701f..45d6cb83739a 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "http://www.nongnu.org/duplicity"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index be5e0ef4abcd..4df142afe3a5 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.httrack.com"; description = "Easy-to-use offline browser utility"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d58815f6d6dd..58affe10e4e1 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 9b147d68230f..0bd19e2d6be8 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { meta = { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = http://rsnapshot.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index b8b7510b882b..e5a4f83ab0f8 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth manager for KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; inherit (kdelibs.meta) platforms; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 0d44624786b6..bcf9ec2c0cc3 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { ''; homepage = http://cdrkit.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 39b7c8098582..516f07508072 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index fd0f131b8c2a..f181ab71edfb 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = http://vobcopy.org/projects/c/c.shtml; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 62a802ebab5f..88cca66efb13 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { filesystems. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xorriso/; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b1d127635f61..b7bf9c59f494 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { is just a bonus. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 6fd1ae97d960..51f61fcf239d 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; inherit version; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8c4547753aa3..ca8d356abb3e 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; description = "The RZIP compression program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 283b751cf26a..c012be7c56d4 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { meta = { homepage = http://upx.sourceforge.net/; description = "The Ultimate Packer for eXecutables"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 4c00252fc2a1..5a43aa52a0ec 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c51837eef181..d91525e348f7 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; homepage = "http://chunkfs.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index f944e591a126..97548442ebae 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 0e72c45e31ad..75e5280d391d 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://fsfs.sourceforge.net/; description = "Secure distributed file system in user space"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index dce7757d23a2..c6d2776f437a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "an open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 6f68a798ede9..b0f7981ebb3c 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://httpfs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 4cb09d53adcf..2a7d9672843d 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Tools for MTD filesystems"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2c14bc624ae3..0c5ec063b1aa 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.namesys.com/; description = "ReiserFS utilities"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 3951a8d8bb79..89e49c9586c5 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/s3backer/; description = "FUSE-based single file backing store via Amazon S3"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4787ed77b599..b6a296e6bc7b 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510df..2d1a6472205e 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index debc340ee4ce..dc1a8b3abaee 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = http://www.lcdf.org/gifsicle/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 10cd9adf2b3c..94a613078a47 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/icoutils/; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index ed69327b752a..36a75743ed8a 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.mcternan.me.uk/mscgen/; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix index 1a7c3317cf9f..f14c16775f8d 100644 --- a/pkgs/tools/graphics/panomatic/default.nix +++ b/pkgs/tools/graphics/panomatic/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://aorlinsk2.free.fr/panomatic/; description = "Tool that automates the creation of control points in Hugin"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 857a86d57af1..92dce64dcfd4 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { statistical capabilities. It allows significant user control over colors, styles, options and details.''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ploticus.sourceforge.net/; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index bb250b9d8523..ae0c4d197315 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/plotutils/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index df1046cb750f..fe01a9459ecb 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 62816705b8f0..d4e977128cfe 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 747c4b44ac80..2795b0d4d871 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/fcitx/"; description = "A Flexible Input Method Framework"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [iyzsong]; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index f2fe1d959303..d2d29aae785d 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -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"; + license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ longDescription = '' diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 024798a84e3f..78383f4185d5 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f7c121d825e2..52d80a8812e0 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b0dbb049cbf7..8844fe9c57cc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -75,7 +75,7 @@ let operating system. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 35e4c3ab4d48..ac9685b83f5d 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; - license = "lgpl"; + license = stdenv.lib.licenses.lgpl2; }; } - diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ddf30f342d15..49e158ea2d04 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with stdenv.lib.maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index aac7855827cc..d37febcf506a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap - license = "GPL-2"; # gentoo says so.. ? + license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 435115ffc596..65a0047738bc 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { (or CP-1252) characters in them. ''; homepage = "http://detox.sourceforge.net/"; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 77d1d58c30c2..1cbbb9720c9a 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"; + license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. @@ -33,5 +33,3 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } - - diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 14e6a2f6681f..41c479e414b3 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { files within a set of directories. ''; homepage = http://code.google.com/p/fdupes/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d0a03f955a89..d6ae74e02b5e 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 88cb2c313c0a..a6ea96b77db5 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 50af2a12c24b..16c7f652deca 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 17cd86014dd4..b1877bdcf98c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/grub/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index a937e96eed55..5f21559d4715 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = http://gsmartcontrol.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index f3c5dd02c7e5..835ceb32881e 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index ab6102cf23c5..227fba3d377e 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices"; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e01a28ab1850..2b2f3aeaca3c 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/idutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index fe9c46dac64f..2fa712239314 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"; + license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index db2d6cffc408..ee521f047006 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.columbia.edu/kermit/ck80.html"; description = "Portable Scriptable Network and Serial Communication Software"; - license = "free"; + license = "free non-commercial"; #Kermit http://www.columbia.edu/kermit/ckfaq.html#license }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2c2a547f2fdc..2eb63f09216f 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Keychain management tool"; homepage = "http://www.gentoo.org/proj/en/keychain/"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 15c6258e86fd..308b5217a6fc 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = http://packages.debian.org/sid/lockfile-progs; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 594947ba13d5..94c08fa9ba9b 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; repositories.git = git://github.com/MidnightCommander/mc.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 761b2c5bdbfb..ffd8966a80eb 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = http://mcrypt.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 2b15d4470c36..82650999b730 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index f177e9e84c28..3200c7016b66 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://mktorrent.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 941d805a6ffb..b7f7842680f6 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { windows and can scroll left and right. Why settle for less? ''; homepage = http://www.jedsoft.org/most/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index a9d32205ceab..6d3634ea7af9 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://ms-sys.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 5d93ef44b36b..0dad6c2d33f3 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "GPL"; + license = "BSD-Original"; }; } diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index fbc6d6076500..2a081b882ab8 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://palcal.sourceforge.net/; description = "Command-line calendar program that can keep track of events"; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fa6f147efe49..df360bb9804d 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/parallel/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 54697f98414a..d516e50124c8 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight GTK+ clipboard manager"; homepage = "http://parcellite.sourceforge.net"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 1d0c4f2a9e74..108d4d5e0400 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ # Add your name here! diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 19a0df261695..156f03dad876 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility program to help you manage the disk devices"; homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 6af4511e8a37..6b4a0e3018fe 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; homepage = http://code.google.com/p/picocom/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 37636da72350..909ed0856bb9 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"; + license = "nonfree"; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 1da0d70a14fa..031264f1edd0 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Cowsay reimplemention for ponies"; homepage = http://terse.tk/ponysay/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index f5be7b8a46d8..993a36ea9092 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index d99fc1960ddd..a8b6e046a9b2 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 = "free"; + license = "Artistic-2"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index e798ee669e2f..f2f5f37ebe44 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/recutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index b679218db79b..fe0f3d646b86 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 5270ddad35e7..7bc4701bb2fd 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 14cc6c4260f7..7880b3e883f3 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; - license = "unfree"; # I couldn't find its license, only a copyright. + license = stdenv.lib.licenses.unfree; # I couldn't find its license, only a copyright. description = "Steam Locomotive runs across your terminal when you type 'sl'"; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index c861fc6f73a3..f3c1c278c767 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Serial line sniffer"; homepage = http://slsnif.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 58f30a021fa3..a6afe475e3bd 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/stow/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 607674051549..5e473a5cd093 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.lcdf.org/type/; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... - license = "BSD-like"; + license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 73ac04dd34ec..fd237ac15f4a 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 05ab7cc7ae70..3a35e9a9f1cc 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/time/; }; } diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index f8ad1fd4d15e..bf73dbcbf2fc 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/uucp/uucp.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index a3938c1af4c4..1c2c94ff89ca 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; homepage = http://wvware.sourceforge.net; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index cc9f98a94f60..93a2707d1e98 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 1014f11453b9..c830f1a3e2ee 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = http://people.debian.org/~kims/xclip/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index f6d6a2bacfa7..79c6a743bce4 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; + license = "free"; #TODO BSD on Gentoo, looks like MIT }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 635d94a3e864..df8677bfffaf 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 475d6775cde2..ce2ded24f823 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption crackign tools"; homepage = http://www.aircrack-ng.org/; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 34bdd153f3ab..cfd72098261c 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 00e747da7c7e..1f7c8a449f3d 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; description = "An small footprint implementation of the SSH 2 protocol"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index a47a0397bf5a..35cd66761329 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c9bc05658d03..f93221296125 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stream audio or video content from all types of flash or rtmp servers. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://savannah.nongnu.org/projects/flvstreamer; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index e6b5cd9daabf..e7aabcd97554 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "GTK+-based FTP client"; homepage = http://www.gftp.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index d0821a4f5881..557fce6d94b3 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; homepage = http://sourceforge.net/projects/hyenae/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 7af7f73aad92..29f09b8cc197 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://imapproxy.org/; description = "It proxies IMAP transactions caching server connections"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c2c1320988a7..1418ad63385c 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 99bc84882482..ce90bed30106 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 295cb0bf1391..20ee6da8a30c 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 132d1832a9d5..49753d189d63 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://jnettop.kubs.info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index ab43813f923b..b7146342b9f1 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.lysator.liu.se/~nisse/lsh/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 25dbd634c8c0..5c1910f1d6eb 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for Mega.co.nz"; homepage = http://megatools.megous.com/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e781af7c235a..5209e58ff246 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 1055ef90b124..87f0db1946b5 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utilties for indexing and searching Maildirs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b2943eb2aced..dffafe5c8169 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 16b8a1159b6a..5752ff2a63c1 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD"; + license = "BSD-Original"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 361d44eaca75..5c7840034b7f 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. - license = "BSD-like"; + license = "ngrep"; # Some custom BSD-style, see LICENSE.txt platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 7ef5eb17dc14..b3d4ec95e061 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://0pointer.de/lennart/projects/nss-mdns/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index d5fa2deb68dc..11e67ae63336 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.ntop.org/products/ntop/; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index c5386553f4f1..a97406ac7ed8 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://nzbget.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 666f3ad8ba71..b81c46c0b616 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ea94560219f0..fec6679a14b0 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"; + license = "bsd"; # multi BSD GPL-2 platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f06a36a96f5d..591bf26ff0b6 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; homepage = http://openvpn.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ac848b5d72e2..45a739247584 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 835744c60004..8c707e2fcc72 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { web indexes as users can push content directly to search groups. ''; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; homepage = http://www.seeks-project.info/; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 6058639e412a..40d57cd65b63 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Permanent DNS caching"; homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7a5b6b6c440d..fa3fc4472f3b 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/pdsh/"; description = "High-performance, parallel remote shell utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6778cf94907e..2835c9016ab4 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 63919edd5054..e2da224cfdcc 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://samy.pl/pwnat/; description = "ICMP NAT to NAT client-server communication"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index a057985b48cc..0c290db78a77 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 48788d36884c..8390c70a4d3b 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; + license = "free-non-copyleft"; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 74e8a530560c..af1849565fe2 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index bf0c2f80694c..3e8f3ca3dc59 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 88ee926e4065..36fdbfac7231 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/udptunnel/; description = "Tunnels TCP over UDP packets"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 54390d4f9eee..1da9ca969841 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.washington.edu/imap/; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = "Apache2"; + license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 8619cd954090..1386f7133e54 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "virtual private network (VPN) client for Cisco's VPN concentrators"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 3f3a0dc89936..e32ee43113eb 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; homepage="http://vtun.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 837ab3627faf..4f8717e9a11e 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { power on. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index c86982155254..6ff5439c4bc6 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/wget/; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 381cb21ec1b2..291f7e36ce06 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A SOAP interface and client for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index d89ab7667e82..61e998fd545e 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A distributed deployment extension for Nix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 7420353499f5..65ae91f6e187 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d2f3ae6468c7..a1914224dbdb 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { description = "Automated deployment of mutable components and services for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix index 7c4a098cad8a..b4b3c98505e9 100644 --- a/pkgs/tools/package-management/guix/default.nix +++ b/pkgs/tools/package-management/guix/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 16a276273cc3..b2e86935b50d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ef673241c7ef..c27f78b31235 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 96de0e0fbe4a..dbbdb8e57a66 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "AES encrypting or decrypting pipe"; homepage = http://loop-aes.sourceforge.net/aespipe.README; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.goibhniu; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 458111be4006..42af2e0b57e8 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0d4841bf036b..e6a63a2f2882 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://ccrypt.sourceforge.net/; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix index 3d7db862dce0..69a0a68319fd 100644 --- a/pkgs/tools/security/gnupg/git.nix +++ b/pkgs/tools/security/gnupg/git.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index a25ae35b6cc9..53f784396a72 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 31736123a9f2..0a96dbadff75 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; description = "Tools to use cryptography for things like four-eyes principles"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index c9648fbe404d..ac9ccc592054 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; + license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 4d1d55244c0b..038044ad6810 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index e693143e4c41..2a4995f45794 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { to the process. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 0254b143edfd..f8e76c4e83b1 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "use socks-friendly applications with Tor"; homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index cd9519590cc4..071504368b7f 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { execution statistics. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/acct/; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index c77890513656..2964db34e124 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = ''The classical Unix `at' job scheduling command''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; }; } diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bc4bca887c80..4210a0a04a5a 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "collectd-5.4.1"; - + src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index d2ace27b1fd6..8117906585cc 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/ddrescue/ddrescue.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ iElectric ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 81206a132965..67b97ea75b15 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 1bf18ed867c3..9764ae6ce0e4 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fakeroot.alioth.debian.org/; description = "Give a fake root environment through LD_PRELOAD"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5a70843ff6bb..f546cd8f5ffc 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description="A command scheduler with extended capabilities over cron and anacron"; homepage = http://fcron.free.fr; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index e72497cf7c4e..9a4ac260ecc7 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/fdisk/; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b4ddca4371e6..c408c0f34ea8 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 2bfa77164b81..21a67dba305c 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/freeipmi/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 93dfab9a1a47..0fe4cbc986c1 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ab682c60921a..ea121b0e43c9 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = http://gt5.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index 1325b52b3808..d1631776d393 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://idle3-tools.sourceforge.net/; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 208ff837b346..88c9a4eecd1f 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = http://logcheck.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index b62340096027..964ee217108d 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 2b4f28fa868d..4bf958959961 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mcron/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3fe05e941b6c..d18c2737854a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index a6a5fced8794..304d8f21eb28 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://safecopy.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 1a3bfa69d1ad..dc30c601750a 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/storebrowse; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 9102482d3d63..89bf06886518 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index afb6073b539e..f14d4affae79 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "command to produce a depth indented directory listing"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index e056af26877c..2865e5b34826 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 05494e54a3ec..aaa458b05cb1 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.convertlit.com/; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dc61723e5977..a87901eb5eb9 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 23223572bb23..14014d06052d 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 7bb7060d5c2d..df49e5788eb5 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/enscript/; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index b231f2875c09..e8c5472d2cb8 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lines of code. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bdf19161e431..6e83bd357b27 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { prints the matching lines. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 1ad40a4a5fa0..7b38227cfcc1 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://savannah.gnu.org/projects/patch; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index cf30169acef1..b1c5910029dd 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index f4d3169f2fae..97cc3c611733 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; longDescription = '' diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index ea06a6255508..247cb67da56c 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -32,7 +32,7 @@ let date = "2009-07-04"; in used to validate and fix HTML data. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = http://tidy.sourceforge.net/; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 52781ed37927..eeac7b7f63fa 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://kdiff3.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 551d0b9f74a9..97fcd0629847 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.rc0.org.uk/mairix; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index dbf13a6332b5..d0e39add665a 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran data english-russian"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 45dcf922d8e8..3abe03b2a4ea 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 6dab8f86c327..0f5032c4a175 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index fe3e3b7317d2..b3e5f12407d8 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: main engine to query translations"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 3c77b50bee88..e73ba43791a9 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: basic useful functions"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index fb3856176d96..b03b1b110c4b 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran: simple command line utilities for dictionary maintainance"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21024c4aaad4..fba52b69fbaf 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { but also as a personal search system for email or other files. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 7c76c7f1bca2..a2d6e360a374 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://qshowdiff.danfis.cz/; description = "Colourful diff viewer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index fc7ee9f6f066..a2920345afa7 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index e30567000dd1..59b9b7bc13d1 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 21a866cf87e8..a7d1ddb0f3b5 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; homepage = http://www.gnu.org/software/src-highlite/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; longDescription = '' diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index c81e02b43995..9e62b2b3d592 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://billposer.org/Software/uni2ascii.html; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 3981f67aefb9..e6fc3510cd40 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; description = "GNU wdiff, comparing files on a word by word basis"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index b8f2f4696aea..fd5a5dc5f8e5 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"; + license = "free-non-copyleft"; #TODO W3C }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index ee66cf923774..6ec9758ed3a2 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp rxp $out/bin ''; meta = { - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; description = "a validating XML parser written in C"; homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index db7ebfbb77a8..aea3ab2bd968 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; homepage = http://xmlstar.sourceforge.net/; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 1769a59520ba..2ad9b0465658 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 = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index d7d3f6f92a22..78dac0c6aa4e 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { into the traditional Unix man page format and the GNU Texinfo format. ''; - license = "MIT-style"; + license = stdenv.lib.licenses.mit; homepage = http://docbook2x.sourceforge.net/; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 5a2c5fb2e067..48d1ebfc2762 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Documentation production system for software manuals"; homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; - license = "free"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ce531a920223..0dcd82535eeb 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 61e94d4d6185..c0fc43362971 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Wiki: http://lout.wiki.sourceforge.net/ homepage = http://savannah.nongnu.org/projects/lout/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 28a43e69598c..c71bc3ba77c6 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = http://www.accesspdf.com/pdftk/; - license = "free"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 054632533a11..8344735606ca 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { of pdfLaTeX to produce PDF documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 6993158291c2..a68ab2d01b9e 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index f903ef5792f4..69d02a275b34 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"; # LaTeX Project Public License + license = "LPPL-1.2"; # LaTeX Project Public License }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index bfc5efc73614..1b0602063e9e 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://fedorahosted.org/xmlto/; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index e4c8e99efdb6..faaea6aaffc4 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; }; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 2034331c8e0f..156fac03d09c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 8e7fbdaeaf33..0f3b5f4d39db 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 806a0b210960..0a658a23e1cf 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Collection of SWF manipulation and creation utilities"; homepage = http://www.swftools.org/about.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 27f4ce4476fd..123dbf647f0d 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e9b62886fce8..1f04229c2c82 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index a80ad91c4c30..34cfa662c916 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"; + license = "unfree-redistributable"; #Amazon }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8433cec7f7..2054483f72d1 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 = stdenv.lib.licenses.perl5; }; }; @@ -126,7 +126,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -151,7 +151,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 = stdenv.lib.licenses.perl5; }; }; @@ -175,7 +175,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -268,7 +268,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -296,7 +296,7 @@ let self = _self // overrides; _self = with self; { ''; homepage = http://www.aarontrevena.co.uk/opensource/autodia/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; @@ -310,7 +310,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Replace functions with ones that succeed or die with lexical scope"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -325,7 +325,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/autovivification/; description = "Lexically disable autovivification"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -344,7 +344,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 = stdenv.lib.licenses.perl5; }; }; @@ -357,7 +357,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -397,7 +397,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 = stdenv.lib.licenses.perl5; }; }; @@ -419,7 +419,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BusinessISBNData URI ]; meta = { description = "Parse and validate ISBNs"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -431,7 +431,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Data pack for Business::ISBN"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -444,7 +444,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -456,7 +456,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Work with International Standard Serial Numbers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -552,7 +552,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; }; }; @@ -575,7 +575,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; }; }; @@ -588,7 +588,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 = stdenv.lib.licenses.perl5; }; }; @@ -611,7 +611,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 = stdenv.lib.licenses.perl5; }; }; @@ -625,7 +625,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -651,7 +651,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 = stdenv.lib.licenses.perl5; }; }; @@ -690,7 +690,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -704,7 +704,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose TextSimpleTable ]; meta = { description = "Regex DispatchType"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -734,7 +734,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "The Catalyst developer's manual"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -748,7 +748,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -764,7 +764,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -778,7 +778,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; meta = { description = "Request logging from within Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -792,7 +792,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 = stdenv.lib.licenses.perl5; }; }; @@ -815,7 +815,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 = stdenv.lib.licenses.perl5; }; }; @@ -829,7 +829,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; meta = { description = "Flexible caching support for Catalyst."; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -845,7 +845,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -882,7 +882,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; meta = { description = "Unicode aware Catalyst"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -907,7 +907,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 = stdenv.lib.licenses.perl5; }; }; @@ -940,7 +940,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 = stdenv.lib.licenses.perl5; }; }; @@ -954,7 +954,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; meta = { description = "Make serving static pages painless"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -978,7 +978,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; meta = { description = "JSON view for your data"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -991,7 +991,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { description = "Template View Class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1035,7 +1035,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = { description = "Replace the development server with Starman"; - license = "perl"; + license = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; }; }; @@ -1088,7 +1088,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 = stdenv.lib.licenses.perl5; }; }; @@ -1099,7 +1099,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1119,7 +1119,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1135,7 +1135,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; meta = { description = "Lets you build groups of accessors"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1164,7 +1164,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 = stdenv.lib.licenses.perl5; }; }; @@ -1179,7 +1179,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 = stdenv.lib.licenses.perl5; }; }; @@ -1192,7 +1192,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1228,7 +1228,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Get information about a class and its structure"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1267,7 +1267,7 @@ let self = _self // overrides; _self = with self; { preConfigure = "patchShebangs ."; meta = { description = "A module for creating generic methods"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1281,7 +1281,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 = stdenv.lib.licenses.perl5; }; }; @@ -1323,7 +1323,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 = stdenv.lib.licenses.perl5; }; }; @@ -1338,7 +1338,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; }; }; @@ -1359,7 +1359,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1371,7 +1371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively copy Perl datatypes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1401,7 +1401,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 = stdenv.lib.licenses.perl5; }; }; @@ -1438,7 +1438,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 = stdenv.lib.licenses.perl5; }; }; @@ -1449,7 +1449,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1463,7 +1463,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1478,7 +1478,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 = stdenv.lib.licenses.perl5; }; }; @@ -1492,7 +1492,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 = stdenv.lib.licenses.perl5; }; }; @@ -1583,7 +1583,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Read and write Changes files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1597,7 +1597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/dagolden/cpan-meta; description = "The distribution metadata for a CPAN dist"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1612,7 +1612,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Verify requirements in a CPAN::Meta object"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1626,7 +1626,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 = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1641,7 +1641,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 = stdenv.lib.licenses.perl5; }; }; @@ -1655,7 +1655,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 = stdenv.lib.licenses.perl5; }; }; @@ -1732,7 +1732,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1836,7 +1836,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1859,7 +1859,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Pretty printing of data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1915,7 +1915,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 = stdenv.lib.licenses.perl5; }; }; @@ -1938,7 +1938,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 = stdenv.lib.licenses.perl5; }; }; @@ -1950,7 +1950,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules that serialize data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -1965,7 +1965,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 = stdenv.lib.licenses.perl5; }; }; @@ -1997,7 +1997,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; }; @@ -2060,7 +2060,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; }; }; @@ -2095,7 +2095,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; }; }; @@ -2108,7 +2108,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 = stdenv.lib.licenses.perl5; }; }; @@ -2121,7 +2121,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2134,7 +2134,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 = stdenv.lib.licenses.perl5; }; }; @@ -2147,7 +2147,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2163,7 +2163,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 = stdenv.lib.licenses.perl5; }; }; @@ -2176,7 +2176,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2191,7 +2191,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; }; }; @@ -2205,7 +2205,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://datetime.perl.org/; description = "Localization support for DateTime.pm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2232,7 +2232,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; meta = { description = "Time zone object base class and factory"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2246,7 +2246,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 = stdenv.lib.licenses.perl5; }; }; @@ -2259,7 +2259,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 = stdenv.lib.licenses.perl5; }; }; @@ -2272,7 +2272,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C<caller>"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2295,7 +2295,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/timbunce/devel-sizeme; description = "Unknown"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2340,7 +2340,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2356,7 +2356,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 = stdenv.lib.licenses.perl5; }; }; @@ -2369,7 +2369,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 = stdenv.lib.licenses.perl5; }; }; @@ -2383,7 +2383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2405,7 +2405,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 = stdenv.lib.licenses.perl5; }; }; @@ -2418,7 +2418,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2432,7 +2432,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 = stdenv.lib.licenses.perl5; }; }; @@ -2447,7 +2447,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2490,7 +2490,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2506,7 +2506,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2519,7 +2519,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2553,7 +2553,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An object representing a stack trace"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -2566,7 +2566,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2597,7 +2597,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2609,7 +2609,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -2647,7 +2647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2662,7 +2662,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 = stdenv.lib.licenses.perl5; }; }; @@ -2677,7 +2677,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; doCheck = false; }; @@ -2693,7 +2693,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 = stdenv.lib.licenses.perl5; }; }; @@ -2706,7 +2706,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2720,7 +2720,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 = stdenv.lib.licenses.perl5; }; }; @@ -2734,7 +2734,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 = stdenv.lib.licenses.perl5; }; }; @@ -2749,7 +2749,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 = stdenv.lib.licenses.perl5; }; }; @@ -2764,7 +2764,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 = stdenv.lib.licenses.perl5; }; }; @@ -2779,7 +2779,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 = stdenv.lib.licenses.perl5; }; }; @@ -2794,7 +2794,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 = stdenv.lib.licenses.perl5; }; }; @@ -2809,7 +2809,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 = stdenv.lib.licenses.perl5; }; }; @@ -2824,7 +2824,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 = stdenv.lib.licenses.perl5; }; }; @@ -2839,7 +2839,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 = stdenv.lib.licenses.perl5; }; }; @@ -2854,7 +2854,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; }; }; @@ -2869,7 +2869,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 = stdenv.lib.licenses.perl5; }; }; @@ -2884,7 +2884,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 = stdenv.lib.licenses.perl5; }; }; @@ -2899,7 +2899,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 = stdenv.lib.licenses.perl5; }; }; @@ -2913,7 +2913,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 = stdenv.lib.licenses.perl5; }; }; @@ -2928,7 +2928,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 = stdenv.lib.licenses.perl5; }; }; @@ -2943,7 +2943,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 = stdenv.lib.licenses.perl5; }; }; @@ -2958,7 +2958,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 = stdenv.lib.licenses.perl5; }; }; @@ -2973,7 +2973,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; }; }; @@ -2985,7 +2985,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailSimple MROCompat ]; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -2998,7 +2998,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 = stdenv.lib.licenses.perl5; }; }; @@ -3010,7 +3010,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Produce RFC 8822 date strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3023,7 +3023,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3037,7 +3037,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3051,7 +3051,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Parse a MIME Content-Type Header"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3064,7 +3064,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fac34g44sn0l59wim68zrhih1mvlh1rxvyn3gc5pviaiz028lyy"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3089,7 +3089,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 = stdenv.lib.licenses.perl5; }; }; @@ -3102,7 +3102,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EmailDateFormat ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3132,7 +3132,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3144,7 +3144,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Extra sets of Chinese encodings"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -3197,7 +3197,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 = stdenv.lib.licenses.perl5; }; }; @@ -3262,7 +3262,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3275,7 +3275,7 @@ let self = _self // overrides; _self = with self; { sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3296,7 +3296,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A wrapper for perl's configuration"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3316,7 +3316,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3330,7 +3330,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Various portability utilities for module builders"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3343,7 +3343,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3355,7 +3355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "A tool to build C libraries."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3370,7 +3370,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; description = "Create a module Makefile"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3460,7 +3460,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3551,7 +3551,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3564,7 +3564,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; preCheck = "export HOME=$TMPDIR"; }; @@ -3649,7 +3649,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3664,7 +3664,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3676,7 +3676,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Install shared files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -3690,7 +3690,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and dumb file system watcher"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3704,7 +3704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3756,7 +3756,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3803,7 +3803,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3835,7 +3835,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 = stdenv.lib.licenses.perl5; }; }; @@ -3863,7 +3863,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 = stdenv.lib.licenses.perl5; }; }; @@ -3947,7 +3947,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -3959,7 +3959,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Store multiple values per key"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4026,7 +4026,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; meta = { description = "Class that represents an HTML form element"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4062,7 +4062,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 = stdenv.lib.licenses.perl5; }; }; @@ -4075,7 +4075,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTagset ]; meta = { description = "HTML parser class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4155,7 +4155,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 = stdenv.lib.licenses.perl5; }; }; @@ -4168,7 +4168,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4197,7 +4197,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4210,7 +4210,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4223,7 +4223,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; meta = { description = "A simple http server class"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4235,7 +4235,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Date conversion routines"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4264,7 +4264,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style messages"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4277,7 +4277,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4319,7 +4319,7 @@ let self = _self // overrides; _self = with self; { }; doCheck = false; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4351,7 +4351,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4375,7 +4375,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 = stdenv.lib.licenses.perl5; }; doCheck = !stdenv.isDarwin; }; @@ -4398,7 +4398,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 = stdenv.lib.licenses.perl5; }; }; @@ -4410,7 +4410,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Utilities for interactive I/O"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4450,7 +4450,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 = stdenv.lib.licenses.perl5; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -4482,7 +4482,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 = stdenv.lib.licenses.perl5; 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 = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4577,7 +4577,7 @@ let self = _self // overrides; _self = with self; { for immediate access from Perl. ''; - license = "Artistic"; + license = stdenv.lib.licenses.perl5; maintainers = [ ]; }; @@ -4609,7 +4609,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.perl5; maintainers = [ ]; }; @@ -4632,7 +4632,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4645,7 +4645,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4657,7 +4657,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4669,7 +4669,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4779,7 +4779,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4801,7 +4801,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Provide the stuff missing in List::Util"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4884,7 +4884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { description = "Simple logging interface with a contextual log"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -4899,7 +4899,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; }; @@ -4932,7 +4932,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 = stdenv.lib.licenses.perl5; }; }; @@ -4947,7 +4947,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 = stdenv.lib.licenses.perl5; }; }; @@ -4961,7 +4961,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 = stdenv.lib.licenses.perl5; }; }; @@ -4973,7 +4973,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Guess media type for a file or a URL"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -4990,7 +4990,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 = stdenv.lib.licenses.perl5; }; }; @@ -5003,7 +5003,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 = stdenv.lib.licenses.perl5; }; }; @@ -5184,7 +5184,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; }; @@ -5207,7 +5207,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5222,7 +5222,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5261,7 +5261,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Charset Information for MIME"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5282,7 +5282,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Definition of MIME types"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5296,7 +5296,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 = stdenv.lib.licenses.perl5; }; }; @@ -5310,7 +5310,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 = stdenv.lib.licenses.perl5; }; }; @@ -5323,7 +5323,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5337,7 +5337,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; meta = { description = "A tiny replacement for Module::Build"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5359,7 +5359,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 = stdenv.lib.licenses.perl5; }; }; @@ -5371,7 +5371,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Find and use installed modules in a (sub)category"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5386,7 +5386,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; }; }; @@ -5399,7 +5399,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5413,7 +5413,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5426,7 +5426,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5441,7 +5441,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5457,7 +5457,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5479,7 +5479,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DevelFindPerl ]; meta = { description = "Get the full path to a locally installed module"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5495,7 +5495,7 @@ let self = _self // overrides; _self = with self; { ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5517,7 +5517,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 = stdenv.lib.licenses.perl5; }; }; @@ -5529,7 +5529,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Recursively scan Perl code for dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5542,7 +5542,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5568,7 +5568,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; }; }; @@ -5582,7 +5582,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5597,7 +5597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5611,7 +5611,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5626,7 +5626,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5653,7 +5653,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5678,7 +5678,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5707,7 +5707,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5723,7 +5723,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; meta = { description = "Role for daemonizing your Moose based application"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5737,7 +5737,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5752,7 +5752,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5767,7 +5767,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -5784,7 +5784,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 = stdenv.lib.licenses.perl5; }; }; @@ -5799,7 +5799,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 = stdenv.lib.licenses.perl5; }; }; @@ -5814,7 +5814,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; }; }; @@ -5829,7 +5829,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5843,7 +5843,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -5858,7 +5858,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 = stdenv.lib.licenses.perl5; }; }; @@ -5882,7 +5882,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 = stdenv.lib.licenses.perl5; }; }; @@ -5897,7 +5897,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 = stdenv.lib.licenses.perl5; }; }; @@ -5912,7 +5912,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 = stdenv.lib.licenses.perl5; }; }; @@ -5972,7 +5972,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; }; }; @@ -6008,7 +6008,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 = stdenv.lib.licenses.perl5; }; }; @@ -6049,7 +6049,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 = stdenv.lib.licenses.perl5; }; }; @@ -6075,7 +6075,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 = stdenv.lib.licenses.perl5; }; }; @@ -6105,7 +6105,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; meta = { description = "Moose types that check against Perl syntax"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6137,7 +6137,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6186,7 +6186,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6225,7 +6225,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/namespace-autoclean; description = "Keep imports out of your namespace"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6239,7 +6239,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 = stdenv.lib.licenses.perl5; }; }; @@ -6312,7 +6312,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 = stdenv.lib.licenses.perl5; }; }; @@ -6325,7 +6325,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6341,7 +6341,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6398,7 +6398,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Low-level HTTP connection (client)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6432,7 +6432,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 = stdenv.lib.licenses.perl5; }; }; @@ -6446,7 +6446,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6527,7 +6527,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 = stdenv.lib.licenses.perl5; }; }; @@ -6556,7 +6556,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6607,7 +6607,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; }; }; @@ -6622,7 +6622,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6636,7 +6636,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 = stdenv.lib.licenses.perl5; }; }; @@ -6658,7 +6658,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 = stdenv.lib.licenses.perl5; }; }; @@ -6673,7 +6673,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; }; }; @@ -6706,7 +6706,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 = stdenv.lib.licenses.perl5; }; }; @@ -6726,7 +6726,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cross-platform path specification manipulation"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6774,7 +6774,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6855,7 +6855,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 = stdenv.lib.licenses.perl5; }; }; @@ -6869,7 +6869,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -6884,7 +6884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6897,7 +6897,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 = stdenv.lib.licenses.perl5; }; }; @@ -6911,7 +6911,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 = stdenv.lib.licenses.perl5; }; doCheck = false; }; @@ -6925,7 +6925,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; meta = { description = "Parse regular expressions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6939,7 +6939,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; meta = { description = "Extensions to L<PPI|PPI>"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -6988,7 +6988,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 = stdenv.lib.licenses.perl5; }; }; @@ -7003,7 +7003,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 = stdenv.lib.licenses.perl5; }; }; @@ -7016,7 +7016,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Parse and manipulate Perl version strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7039,7 +7039,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 = stdenv.lib.licenses.perl5; }; }; @@ -7054,7 +7054,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 = stdenv.lib.licenses.perl5; }; }; @@ -7069,7 +7069,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 = stdenv.lib.licenses.perl5; }; }; @@ -7090,7 +7090,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 = stdenv.lib.licenses.perl5; }; }; @@ -7118,7 +7118,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rwstauner/Pod-Markdown; description = "Convert POD to Markdown"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7150,7 +7150,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 = stdenv.lib.licenses.perl5; }; }; @@ -7189,7 +7189,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; }; @@ -7242,7 +7242,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7276,7 +7276,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 = stdenv.lib.licenses.perl5; }; }; @@ -7290,7 +7290,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7303,7 +7303,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 = stdenv.lib.licenses.perl5; }; }; @@ -7329,7 +7329,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 = stdenv.lib.licenses.perl5; }; }; @@ -7349,7 +7349,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lexically-scoped resource management"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7362,7 +7362,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 = stdenv.lib.licenses.perl5; }; }; @@ -7392,7 +7392,7 @@ let self = _self // overrides; _self = with self; { sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7415,7 +7415,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7440,7 +7440,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 = stdenv.lib.licenses.perl5; }; }; @@ -7481,7 +7481,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; meta = { description = "Generate SQL from Perl data structures"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7540,7 +7540,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 = stdenv.lib.licenses.perl5; }; }; @@ -7567,7 +7567,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 = stdenv.lib.licenses.perl5; }; }; @@ -7597,7 +7597,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://plackperl.org; description = "Temporary buffer to save bytes"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7610,7 +7610,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 = stdenv.lib.licenses.perl5; }; }; @@ -7644,7 +7644,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; meta = { description = "A simple sprintf-like dialect"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7670,7 +7670,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/string-flogger; description = "String munging for loggers"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7713,7 +7713,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 = stdenv.lib.licenses.perl5; }; }; @@ -7748,7 +7748,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 = stdenv.lib.licenses.perl5; }; }; @@ -7762,7 +7762,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7776,7 +7776,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "String::Util -- String processing utilities"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7790,7 +7790,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 = stdenv.lib.licenses.perl5; }; }; @@ -7803,7 +7803,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 = stdenv.lib.licenses.perl5; }; }; @@ -7817,7 +7817,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 = stdenv.lib.licenses.perl5; }; }; @@ -7830,7 +7830,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 = stdenv.lib.licenses.perl5; }; }; @@ -7844,7 +7844,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 = stdenv.lib.licenses.perl5; }; }; @@ -7865,7 +7865,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 = stdenv.lib.licenses.perl5; }; }; @@ -7898,7 +7898,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 = stdenv.lib.licenses.perl5; }; }; @@ -7971,7 +7971,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/phaylon/syntax/wiki; description = "Activate syntax extensions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -7984,7 +7984,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ]; meta = { description = "Perl6 style Junction operators in Perl5"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8006,7 +8006,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 = stdenv.lib.licenses.perl5; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ ocharles ]; }; @@ -8052,7 +8052,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ensure that a platform has weaken support"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8079,7 +8079,7 @@ let self = _self // overrides; _self = with self; { meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8131,7 +8131,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8143,7 +8143,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Detect encoding of the current terminal"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8157,7 +8157,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8170,7 +8170,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; meta = { description = ""; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8279,7 +8279,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8291,7 +8291,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Validate your CPAN META.yml files"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -8316,7 +8316,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 = stdenv.lib.licenses.perl5; }; }; @@ -8331,7 +8331,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 = stdenv.lib.licenses.perl5; }; }; @@ -8344,7 +8344,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8385,7 +8385,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 = stdenv.lib.licenses.perl5; }; }; @@ -8400,7 +8400,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 = stdenv.lib.licenses.perl5; }; }; @@ -8495,7 +8495,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8516,7 +8516,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 = stdenv.lib.licenses.perl5; }; }; @@ -8531,7 +8531,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 = stdenv.lib.licenses.perl5; }; }; @@ -8543,7 +8543,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check the presence of tabs in your project"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8599,7 +8599,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 = stdenv.lib.licenses.perl5; }; }; @@ -8623,7 +8623,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 = stdenv.lib.licenses.perl5; }; }; @@ -8635,7 +8635,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Check file names portability"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8647,7 +8647,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Checks to see if the module can be loaded"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8662,7 +8662,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8704,7 +8704,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test your SYNOPSIS code"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8716,7 +8716,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Write tests, not scripts that run them"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8731,7 +8731,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8751,7 +8751,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unit testing without external dependencies"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8780,7 +8780,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 = stdenv.lib.licenses.perl5; }; }; @@ -8794,7 +8794,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 = stdenv.lib.licenses.perl5; }; }; @@ -8806,7 +8806,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Test fallback behaviour in absence of modules"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8822,7 +8822,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; }; }; @@ -8836,7 +8836,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 = stdenv.lib.licenses.perl5; }; }; @@ -8862,7 +8862,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8899,7 +8899,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interface to read and parse BibTeX files"; - license = "perl5"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8920,7 +8920,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8940,7 +8940,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Framework for more readable interactive test scripts"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -8963,7 +8963,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -8979,7 +8979,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 = stdenv.lib.licenses.perl5; }; }; @@ -8991,7 +8991,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Micro template engine with Perl5 language"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9029,7 +9029,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simple eyecandy ASCII tables"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9079,7 +9079,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc."; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9092,7 +9092,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/gfx/p5-Test-Vars; description = "Detects unused variables"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9107,7 +9107,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; }; }; @@ -9119,7 +9119,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9175,7 +9175,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Cycle through a list of values via a scalar"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9187,7 +9187,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered associative arrays for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9199,7 +9199,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Ordered hashes for Perl"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9229,7 +9229,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9243,7 +9243,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9265,7 +9265,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 = stdenv.lib.licenses.perl5; }; }; @@ -9278,7 +9278,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9320,7 +9320,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 = stdenv.lib.licenses.perl5; }; }; @@ -9332,7 +9332,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Require() modules from a variable"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9355,7 +9355,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Unicode Collation Algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9367,7 +9367,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Wrapper around ICU collation services"; - license = "perl"; + license = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9383,7 +9383,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9403,7 +9403,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9417,7 +9417,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 = stdenv.lib.licenses.perl5; }; }; @@ -9430,7 +9430,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 = stdenv.lib.licenses.perl5; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -9453,7 +9453,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9522,7 +9522,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 = stdenv.lib.licenses.perl5; }; }; @@ -9552,7 +9552,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9619,7 +9619,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileSlurp XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = "perl"; + license = stdenv.lib.licenses.perl5; }; }; @@ -9738,7 +9738,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 = stdenv.lib.licenses.perl5; }; }; @@ -9751,7 +9751,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 ca980e386373..e76cf4988d02 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -142,7 +142,7 @@ in BTree-based folder implementation with order support ''; homepage = "http://pypi.python.org/pypi/plone.folder"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -162,7 +162,7 @@ in The Plone Content Management System (core) ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -182,7 +182,7 @@ in Waitress WSGI server ''; homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -202,7 +202,7 @@ in zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. ''; homepage = "http://pypi.python.org/pypi/zope.deferredimport"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -222,7 +222,7 @@ in Python 2 and 3 compatibility utilities ''; homepage = "http://pypi.python.org/pypi/six/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -242,7 +242,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -262,7 +262,7 @@ in Uid product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFUid"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -322,7 +322,7 @@ in A referencebrowser implementation for Archetypes ''; homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -342,7 +342,7 @@ in An extension to zope.formlib, which allows to group fields into different fieldsets. ''; homepage = "http://pypi.python.org/pypi/plone.fieldsets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -362,7 +362,7 @@ in redirection tool ''; homepage = "http://pypi.python.org/pypi/plone.app.redirector"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -402,7 +402,7 @@ in ZODB blob support for Plone ''; homepage = "http://plone.org/products/plone.app.blob"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -444,7 +444,7 @@ in Programmable browser for functional black-box tests ''; homepage = "http://pypi.python.org/pypi/zope.testbrowser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -464,7 +464,7 @@ in Full text indexing for ZCatalog / Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -504,7 +504,7 @@ in Local registries for zope component architecture ''; homepage = "http://pypi.python.org/pypi/zope.site"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -524,7 +524,7 @@ in Plone's content menu implementation ''; homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -584,7 +584,7 @@ in Structured Configuration Library ''; homepage = "http://www.zope.org/Members/fdrake/zconfig/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -604,7 +604,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -664,7 +664,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -704,7 +704,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -724,7 +724,7 @@ in Component vocabularies ''; homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -744,7 +744,7 @@ in Zope Content Management Framework core components ''; homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -824,7 +824,7 @@ in Special MultiMapping objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/MultiMapping"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -844,7 +844,7 @@ in SQL method support for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -906,7 +906,7 @@ in Buildout recipe for creating a Zope 2 instance ''; homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -926,7 +926,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -966,7 +966,7 @@ in Zope process lifetime events ''; homepage = "http://pypi.python.org/pypi/zope.processlifetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -986,7 +986,7 @@ in Default product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1006,7 +1006,7 @@ in zope.formlib integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1106,7 +1106,7 @@ in Load, configure, and compose WSGI applications and servers ''; homepage = "http://pythonpaste.org/deploy/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1126,7 +1126,7 @@ in The default theme for Plone 4. ''; homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1166,7 +1166,7 @@ in Sequence Sorting ''; homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1206,7 +1206,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1226,7 +1226,7 @@ in Zope publication ''; homepage = "http://pypi.python.org/pypi/zope.app.publication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1246,7 +1246,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1266,7 +1266,7 @@ in Content Views for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.content"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1306,7 +1306,7 @@ in Zope External Editor ''; homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1386,7 +1386,7 @@ in A source query widget for z3c.form. ''; homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1406,7 +1406,7 @@ in DCWorkflow product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1470,7 +1470,7 @@ in Zope Template Application Language Expression Syntax (TALES) ''; homepage = "http://pypi.python.org/pypi/zope.tales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1510,7 +1510,7 @@ in This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. ''; homepage = "http://pypi.python.org/pypi/DateTime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1530,7 +1530,7 @@ in Special Missing objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1570,7 +1570,7 @@ in World timezone definitions, modern and historical ''; homepage = "http://pytz.sourceforge.net"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1590,7 +1590,7 @@ in Zope Configuration Markup Language (ZCML) ''; homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1610,7 +1610,7 @@ in check-out/check-in staging for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.iterate"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1670,7 +1670,7 @@ in zope.sendmail integration for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.MailHost"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1690,7 +1690,7 @@ in Zope Broken Object Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.broken"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1710,7 +1710,7 @@ in Document Templating Markup Language (DTML) ''; homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1730,7 +1730,7 @@ in Provides support for restricted execution of Python scripts in Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1810,7 +1810,7 @@ in Formlib-based controlpanels for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1830,7 +1830,7 @@ in Screen-scraping library ''; homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1850,7 +1850,7 @@ in WSGI request and response object ''; homepage = "http://webob.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1870,7 +1870,7 @@ in An error reporting utility for Zope3 ''; homepage = "http://pypi.python.org/pypi/zope.error"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1890,7 +1890,7 @@ in Plone OpenID authentication support ''; homepage = "http://pypi.python.org/pypi/plone.app.openid"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1930,7 +1930,7 @@ in Plone integration for the basic plone.portlets package ''; homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1990,7 +1990,7 @@ in Persistent ExtensionClass ''; homepage = "http://pypi.python.org/pypi/Persistence"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2030,7 +2030,7 @@ in Flexible CMF content ''; homepage = "http://code.google.com/p/dexterity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2050,7 +2050,7 @@ in Recipe for installing Python package distributions as eggs ''; homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2090,7 +2090,7 @@ in Enhanced emailing handlers for the python logging package. ''; homepage = "http://www.simplistix.co.uk/software/python/mailinglogger"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -2110,7 +2110,7 @@ in A BTree based implementation for Zope 2's OFS. ''; homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2130,7 +2130,7 @@ in webdav locking support ''; homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2150,7 +2150,7 @@ in configurable viewlet manager ''; homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2170,7 +2170,7 @@ in Zope testing framework, including the testrunner script. ''; homepage = "http://pypi.python.org/pypi/zope.testing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2190,7 +2190,7 @@ in Object life-cycle events ''; homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2210,7 +2210,7 @@ in User-configurable, blob-aware image scaling for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.imaging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2230,7 +2230,7 @@ in Plone integration for plone.contentrules ''; homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2270,7 +2270,7 @@ in Zope Page Templates ''; homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2290,7 +2290,7 @@ in A package for all things users and groups related (specific to plone) ''; homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2310,7 +2310,7 @@ in System for managing development buildouts ''; homepage = "http://pypi.python.org/pypi/zc.buildout"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2350,7 +2350,7 @@ in ZODB undo support for Zope2. ''; homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2370,7 +2370,7 @@ in Zope 3 Template Application Languate (TAL) ''; homepage = "http://pypi.python.org/pypi/zope.tal"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2390,7 +2390,7 @@ in General Zope 2 help screens. ''; homepage = "http://pypi.python.org/pypi/Products.OFSP"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2452,7 +2452,7 @@ in Zope Container ''; homepage = "http://pypi.python.org/pypi/zope.container"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2492,7 +2492,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2512,7 +2512,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2532,7 +2532,7 @@ in zExceptions contains common exceptions used in Zope2. ''; homepage = "http://pypi.python.org/pypi/zExceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2572,7 +2572,7 @@ in The Zope publisher publishes Python objects on the web. ''; homepage = "http://pypi.python.org/pypi/zope.publisher"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2592,7 +2592,7 @@ in ZCML directives for configuring browser views for Zope. ''; homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2612,7 +2612,7 @@ in Plone specific i18n extensions. ''; homepage = "http://pypi.python.org/pypi/plone.app.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2632,7 +2632,7 @@ in Zope Security Framework ''; homepage = "http://pypi.python.org/pypi/zope.security"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2652,7 +2652,7 @@ in Cache purging support for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.cachepurging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2694,7 +2694,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2714,7 +2714,7 @@ in Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2774,7 +2774,7 @@ in Zope Viewlets ''; homepage = "http://pypi.python.org/pypi/zope.viewlet"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2834,7 +2834,7 @@ in Zope Internationalization Support ''; homepage = "http://pypi.python.org/pypi/zope.i18n"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2876,7 +2876,7 @@ in A backend for ZODB that stores pickles in a relational database. ''; homepage = "http://pypi.python.org/pypi/RelStorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2896,7 +2896,7 @@ in zope.formlib integration for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2978,7 +2978,7 @@ in Upgrade machinery for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3018,7 +3018,7 @@ in Provides transforms from text/x-web-intelligent to text/html and vice versa. ''; homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3038,7 +3038,7 @@ in Zope contenttype ''; homepage = "http://pypi.python.org/pypi/zope.contenttype"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3058,7 +3058,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3098,7 +3098,7 @@ in Zope sendmail ''; homepage = "http://pypi.python.org/pypi/zope.sendmail"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3118,7 +3118,7 @@ in Object annotation mechanism ''; homepage = "http://pypi.python.org/pypi/zope.annotation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3138,7 +3138,7 @@ in Integrate five.customerize into Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3218,7 +3218,7 @@ in File-system Representation Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3238,7 +3238,7 @@ in Decorators for caching the values of functions and methods ''; homepage = "http://pypi.python.org/pypi/plone.memoize"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3258,7 +3258,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3278,7 +3278,7 @@ in Interfaces and simple adapter that give the size of an object ''; homepage = "http://pypi.python.org/pypi/zope.size"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3298,7 +3298,7 @@ in TTW customization of template-based Zope views ''; homepage = "http://pypi.python.org/pypi/five.customerize"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3318,7 +3318,7 @@ in Resolver for Python dotted names. ''; homepage = "http://pypi.python.org/pypi/zope.dottedname"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3358,7 +3358,7 @@ in Translation files for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.locales"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3378,7 +3378,7 @@ in z3c.form date and datetime widgets ''; homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3398,7 +3398,7 @@ in Listing of content for the Plone CMS ''; homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3418,7 +3418,7 @@ in Zope2 application server / web framework ''; homepage = "http://zope2.zope.org"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3458,7 +3458,7 @@ in This package provides support for external Python methods within a Zope 2 environment. ''; homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3478,7 +3478,7 @@ in Browser layer management for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.browserlayer"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3498,7 +3498,7 @@ in workflow and security settings for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3518,7 +3518,7 @@ in Integration package for `plone.folder` into Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.folder/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3538,7 +3538,7 @@ in Basic inter-process locks ''; homepage = "http://www.python.org/pypi/zc.lockfile"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3558,7 +3558,7 @@ in Cache managers for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3578,7 +3578,7 @@ in RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. ''; homepage = "http://pypi.python.org/pypi/RestrictedPython"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3598,7 +3598,7 @@ in Adaptable string interpolation ''; homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3618,7 +3618,7 @@ in A RAM-based storage for ZODB ''; homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3658,7 +3658,7 @@ in Zope datetime ''; homepage = "http://pypi.python.org/pypi/zope.datetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3698,7 +3698,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3718,7 +3718,7 @@ in UNKNOWN ''; homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -3738,7 +3738,7 @@ in Zope locale extraction and management utilities ''; homepage = "http://pypi.python.org/pypi/zope.app.locales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3778,7 +3778,7 @@ in Zope Content Type ''; homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3818,7 +3818,7 @@ in MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3878,7 +3878,7 @@ in Advanced i18n/l10n features ''; homepage = "http://pypi.python.org/pypi/plone.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3938,7 +3938,7 @@ in Zope Object Database: object database and persistence ''; homepage = "UNKNOWN"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3958,7 +3958,7 @@ in jQuery integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3998,7 +3998,7 @@ in Plone ContentRules Engine ''; homepage = "http://pypi.python.org/pypi/plone.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4038,7 +4038,7 @@ in Message Identifiers for internationalization ''; homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4058,7 +4058,7 @@ in Transaction management for Python ''; homepage = "http://www.zope.org/Products/ZODB"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4078,7 +4078,7 @@ in Method and property caching decorators ''; homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4098,7 +4098,7 @@ in Tools for managing themes in CMF and Plone sites ''; homepage = "http://pypi.python.org/pypi/plone.theme"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4138,7 +4138,7 @@ in Zope 2's indexing and search solution. ''; homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4178,7 +4178,7 @@ in Layout mechanisms for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4246,7 +4246,7 @@ in Plone UI and default rules for plone.caching/z3c.caching ''; homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4266,7 +4266,7 @@ in Zope Exceptions ''; homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4286,7 +4286,7 @@ in plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. ''; homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4306,7 +4306,7 @@ in Security framework for Zope2. ''; homepage = "http://pypi.python.org/pypi/AccessControl"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4326,7 +4326,7 @@ in Special Record objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Record"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4386,7 +4386,7 @@ in Registry for managing CSS and JS ''; homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4426,7 +4426,7 @@ in Convenience uid/gid helper function used in Zope2. ''; homepage = "http://pypi.python.org/pypi/initgroups"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4446,7 +4446,7 @@ in Daemon process control library and tools for Unix-based systems ''; homepage = "http://www.python.org/pypi/zdaemon"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4466,7 +4466,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4506,7 +4506,7 @@ in Definition of authentication basics for the Zope Framework ''; homepage = "http://pypi.python.org/pypi/zope.authentication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4566,7 +4566,7 @@ in A portlet that fetches results from a collection ''; homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4586,7 +4586,7 @@ in Shared Zope Toolkit browser components ''; homepage = "http://pypi.python.org/pypi/zope.browser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4606,7 +4606,7 @@ in This package adds 'saved search' functionality to Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4626,7 +4626,7 @@ in Calendar product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4648,7 +4648,7 @@ in The Plone Content Management System ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4668,7 +4668,7 @@ in Pluggable Zope2 authentication / authorization framework ''; homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4708,7 +4708,7 @@ in jQuery Tools integration for Plone plus overlay and AJAX form helpers. ''; homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4728,7 +4728,7 @@ in Read Zope configuration state from profile dirs / tarballs ''; homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4748,7 +4748,7 @@ in Metaclass for subclassable extension types ''; homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4788,7 +4788,7 @@ in StructuredText parser ''; homepage = "http://pypi.python.org/pypi/zope.structuredtext"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4808,7 +4808,7 @@ in Zope RAM Cache ''; homepage = "http://pypi.python.org/pypi/zope.ramcache"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4828,7 +4828,7 @@ in Resolving paths in the object hierarchy ''; homepage = "http://pypi.python.org/pypi/zope.traversing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4848,7 +4848,7 @@ in Content Provider Framework for Zope Templates ''; homepage = "http://pypi.python.org/pypi/zope.contentprovider"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4868,7 +4868,7 @@ in The classic Plone 3 default theme. ''; homepage = "http://pypi.python.org/pypi/plonetheme.classic"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4908,7 +4908,7 @@ in A simple static HTML portlet for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4948,7 +4948,7 @@ in An extension of zope.viewlet to support dynamic portlets ''; homepage = "http://pypi.python.org/pypi/plone.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4968,7 +4968,7 @@ in Configure application plugins based on interfaces ''; homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5008,7 +5008,7 @@ in A general logging facility ''; homepage = "http://cheeseshop.python.org/pypi/zLOG"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5028,7 +5028,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5068,7 +5068,7 @@ in Form generation and validation library for Zope ''; homepage = "http://pypi.python.org/pypi/zope.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5088,7 +5088,7 @@ in Pluggable object copying mechanism ''; homepage = "http://pypi.python.org/pypi/zope.copy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5108,7 +5108,7 @@ in A collection of generally useful vocabularies. ''; homepage = "https://github.com/plone/plone.app.vocabularies"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5128,7 +5128,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5168,7 +5168,7 @@ in Zope catalog index for paths ''; homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5188,7 +5188,7 @@ in Subrequests for Zope2 ''; homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5208,7 +5208,7 @@ in An advanced form and widget framework for Zope 3 ''; homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5228,7 +5228,7 @@ in Action icons product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5248,7 +5248,7 @@ in Helper to test WSGI applications ''; homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -5268,7 +5268,7 @@ in Manage link integrity in Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5288,7 +5288,7 @@ in The Original Zope 3 Form Framework ''; homepage = "http://pypi.python.org/pypi/zope.app.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5308,10 +5308,9 @@ in Local site manager implementation for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.localsitemanager"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; } - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2f3aca49cc5..ee29b74f72e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -474,7 +474,7 @@ rec { meta = { homepage = http://code.google.com/p/argparse/; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "argparse: Python command line parser"; @@ -577,7 +577,7 @@ rec { meta = { homepage = https://github.com/botocore/bcdoc; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -1582,7 +1582,7 @@ rec { homepage = http://code.google.com/p/cssutils/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; }); @@ -2785,7 +2785,7 @@ rec { meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -2801,7 +2801,7 @@ rec { meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -3288,7 +3288,7 @@ rec { ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ ]; }; @@ -4134,7 +4134,7 @@ rec { meta = { description = "Super-fast templating language."; homepage = http://www.makotemplates.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -4386,7 +4386,7 @@ rec { homepage = http://moinmo.in/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -4506,7 +4506,7 @@ rec { meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; }); @@ -4525,7 +4525,7 @@ rec { meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -5288,7 +5288,7 @@ rec { meta = { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc."; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -5715,7 +5715,7 @@ rec { description = "Python wrappers for the Crypto++ library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; @@ -6471,7 +6471,7 @@ rec { homepage = http://allmydata.org/trac/pyutil; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -6920,7 +6920,7 @@ rec { meta = { homepage = http://stuvel.eu/rsa; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -7108,7 +7108,7 @@ rec { homepage = http://code.google.com/p/simplejson/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }); @@ -7790,7 +7790,7 @@ rec { meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; }; @@ -8075,7 +8075,7 @@ rec { meta = { homepage = "urlgrabber.baseurl.org"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; @@ -8413,7 +8413,7 @@ rec { homepage = http://python-xlib.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8523,7 +8523,7 @@ rec { and Haskell API. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -9604,7 +9604,7 @@ rec { meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; |