diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-28 19:20:29 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-28 19:20:29 +0200 |
| commit | 158e1cfdd0ddb8380e266dcf16a4167455335bc3 (patch) | |
| tree | 1437b0590a546a7900c83518efa96dfc4e2e310a /pkgs | |
| parent | 831d597bfab70bf2952f9573b2cacc9d1c56de1c (diff) | |
| download | nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar.gz nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar.bz2 nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar.lz nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar.xz nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.tar.zst nixpkgs-158e1cfdd0ddb8380e266dcf16a4167455335bc3.zip | |
Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
Diffstat (limited to 'pkgs')
139 files changed, 164 insertions, 164 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 0c12778089b..ead15e9a918 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ALSA or JACK as sound input library. ''; homepage = http://home.gna.org/fmit/index.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index dca72f22b49..1f008e56c15 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { used to estimate the musical key of many different audio formats. ''; homepage = https://github.com/EvanPurkhiser/keyfinder-cli; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 33ce627e56e..bea869ea318 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { efficient workflow tool. ''; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a3cdbb6afb9..31142efcc89 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index cb8a22a3c06..781806bedd6 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { a special case of text editing. ''; homepage = http://emacs-jabber.sourceforge.net/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix index a21c73b7e8b..d57c591ec1e 100644 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -26,6 +26,6 @@ trivialBuild rec { meta = with lib; { description = "An analog indicator of the position in the buffer"; homepage = https://github.com/TeMPOraL/nyan-mode/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d4fa56898c3..6db7130896f 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "the next generation code editor"; homepage = http://www.lighttable.com/; - license = [ licenses.gpl3 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b40e797f7ea..ee3edaaf61b 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -190,7 +190,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index b13925fe14e..7a1ce7aa1f2 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 4519d4c2626..a63dd0ab9e2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vim - the text editor - for Mac OS X"; homepage = https://github.com/b4winckler/macvim; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.darwin; }; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 42ed3daa688..482e59833b3 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -118,7 +118,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; - license = with licenses; [ vim ]; + license = licenses.vim; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index af499c51f97..348ba5c3c2c 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; - license = with licenses; mit; + license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index b47a8215fd4..43d717c58e5 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = https://launchpad.net/simple-scan; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index a6c299d1ab3..724bddda6cf 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Quicker to unpack locally than load Hydra hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; }; } diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 47535ab6b90..4324a33d238 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; - license = with licenses; gpl3; + license = licenses.gpl3; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 9875b3abf01..823b6cdf538 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -176,7 +176,7 @@ a.composableDerivation.composableDerivation {} (fix: { meta = { description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization"; homepage = http://grass.itc.it/index.php; - license = [ "GPL" ]; + license = "GPL"; broken = true; }; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index cc1d4e7c659..5e9505e9f32 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "Simple, blog aware, static site generator"; homepage = http://jekyllrb.com/; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index df5f7954182..ee9d1dbbf8d 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { detects a new entry it'll emit only that new entry. ''; homepage = http://www.vanheusden.com/rsstail/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index db24670d969..ec269def5b4 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 19715d7b255..f7aff8a4d0c 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "A curses threads-with-tags style email client"; homepage = http://supmua.org; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ cstrahan lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 446b65c9882..328a156260b 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = http://x2go.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cea9329d9c8..0837659983e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = { homepage = http://syncthing.net/; description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; - license = with lib.licenses; mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matejc ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index e2aff9313e9..d7f047b84e0 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { description = ''Lambda calculus interpreter''; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; gpl3; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index cfe96bc6983..444bb06c4a0 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = ''Simple Theorem Prover''; maintainers = with stdenv.lib.maintainers; [mornfall]; platforms = with stdenv.lib.platforms; linux; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index b97314f02d1..9a3ab13c33e 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computer algebra system for high-performance number theory computations"; homepage = "http://pari.math.u-bordeaux.fr/"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index e2f34d48de2..66292499f2b 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://speedcrunch.digitalfanatics.org"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' SpeedCrunch is a fast, high precision and powerful desktop calculator. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bb851140b45..43ef4337d57 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.gromacs.org"; - license = with licenses; gpl2; + license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index ced82dd45c0..eede33c2145 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.catb.org/~esr/src/; - license = [ stdenv.lib.licenses.bsd3 ]; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 1256572de7c..fd336dafb23 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { videos to MPEG4, MP3 or other formats in just one easy step. ''; homepage = http://clipgrab.org/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 03ccb2664fc..1711503314e 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a257ef27e9f..14adddf8d1b 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VirtualBox client with remote management"; homepage = http://remotebox.knobgoblin.org.uk/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' VirtualBox is traditionally considered to be a virtualization solution aimed at the desktop. While it is certainly possible to install diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index a158dd8dcf4..c57a89193b5 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; homepage = http://awesome.naquadah.org/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 82539b940b8..4e6c9c9a83e 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index be0a946064b..1e6b53446aa 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7bc1b9fa1fd..515f172b748 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - license = with stdenv.lib.licenses; [ gpl3 ]; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 6dab322b056..ad5fd1999ed 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { EGA/VGA-bold for 8x14 and 8x16. ''; homepage = http://www.is-vn.bg/hamster/; - license = with licenses; [ gpl2Plus ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index ef7511afb17..69baf7bda45 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { inherit version; description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; - license = with licenses; cc-by-sa-30; + license = licenses.cc-by-sa-30; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index b2bfb7bd13d..9abe5d6ea8e 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -26,7 +26,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainer = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index 8e0c35eda30..e12f41c9b7f 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; maintainers = [ maintainers.lethalman ]; - license = [ licenses.gpl2 ]; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index efe8be2051f..b49884fad1c 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten; description = "An LLVM-to-JavaScript Compiler"; maintainers = with maintainers; [ bosu ]; - license = with licenses; ncsa; + license = licenses.ncsa; }; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 8cad6dc369d..c9ec01703bf 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/zsaleeba/picoc; downloadPage = https://code.google.com/p/picoc/downloads/list; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index 5f6540d3ee2..c53a012d753 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = with licenses; [ ruby ]; + license = licenses.ruby; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index d89a2763834..abd8a284e62 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; description = "Brokken's Own Base Classes And Templates"; downloadPage = http://sourceforge.net/projects/bobcat/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 86cdd08db64..92e02c6ca08 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; - license = with licenses; boost; + license = licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7ddbc408ca6..823f09b8bce 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "the Git linkable library"; homepage = http://libgit2.github.com/; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index da658e398eb..c357d808cac 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; # http://www.open-mpi.org/projects/hwloc/license.php - license = with licenses; bsd3; + license = licenses.bsd3; homepage = http://www.open-mpi.org/projects/hwloc/; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 07563364e34..c90a2481648 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - license = with stdenv.lib.licenses; [ mit ]; + license = stdenv.lib.licenses.mit; branch = "1.6"; }; } diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index 397eec61a78..4423f9c157d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -113,7 +113,7 @@ let meta = let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in { - license = with stdenv.lib.licenses; [ bsd2 ]; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index dd0de49a4bd..bbeb75d0b8d 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = http://sites.dparrish.com/libcli; - license = with licenses; lgpl21Plus; + license = licenses.lgpl21Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 40efafdea3d..6ab80d55a45 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Musical key detection for digital audio (C++ library)"; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 8a7054db20a..8d1288f98ce 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libpseudo.sourceforge.net/; description = "Simple, thread-safe messaging between threads"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index d642309ed74..4a2d7be7b8b 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = http://rockdaboot.github.io/libpsl/; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 56e7084292c..0b9b79f0c60 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/re.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 165e16a8823..817e1c79bc7 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/rem.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 4316b2dda6b..e5965a10f67 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; - license = with licenses; [ mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 1dcd578da29..c0880ee896f 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libviper.sourceforge.net/; description = "Simple window creation and management facilities for the console"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index b52db39042f..e58d964a625 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libvterm.sourceforge.net/; description = "Terminal emulator library to mimic both vt100 and rxvt"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index c900cfbc684..84dbb0c156f 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "NX compression library"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 37b0db4ef6c..d0bcb73151f 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Qt 5 Cryptographic Architecture"; homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 32d9bd0a8e5..9c657ec52d7 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 928095a4e29..46df5459dca 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platform that supports both FreeType and the OpenGL API. ''; homepage = http://quesoglc.sourceforge.net/; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix index 84a7a9b4ccf..2c92ba5618c 100644 --- a/pkgs/development/libraries/rabbitmq-c/0.4.nix +++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; + license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 301fcc84b9f..b2dfa8884e9 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/re2/; description = "An efficient, principled regular expression library"; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index 3427bf1c4e9..35fca306d6c 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.simons ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index cbe03b8eb63..f2d64bbc9ba 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.simons ]; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 24dc443ca70..16e7b09a0f2 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; inherit version; updateWalker = true; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 11f3294b289..663432f8ec8 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very basic terminfo library"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 2c16f1f6f6c..e0be56e5037 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://alloy.mit.edu/; downloadPage = http://alloy.mit.edu/alloy/download.html; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index cd8cde1ae52..ce9b8a9a59d 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { application of this sort. ''; homepage = http://coan2.sourceforge.net/; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index c3381186aa8..9a8df0f4690 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { replacing #includes with forward-declares when possible. ''; homepage = http://include-what-you-use.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix index 983c5c451d0..4e5413b5012 100644 --- a/pkgs/development/tools/atom-shell/default.nix +++ b/pkgs/development/tools/atom-shell/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross platform desktop application shell"; homepage = https://github.com/atom/atom-shell; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.fluffynukeit ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index f8e759b83ee..ee49423a8b1 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index a7be59a1fea..f6cf63afc2a 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { entirely in Java 6. ''; homepage = http://www.benf.org/other/cfr/; - license = with licenses; mit; + license = licenses.mit; platforms = with platforms; all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index db02fef9f2a..f7d2dfc4957 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0d96c562c16..0a7e2530526 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; homepage = http://flexcpp.sourceforge.net/; downloadPage = http://sourceforge.net/projects/flexcpp/files/; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 99e54e86a56..948e39f4b55 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; - license = with licenses; unfree; + license = licenses.unfree; homepage = https://docs.saucelabs.com/reference/sauce-connect/; maintainers = with maintainers; [offline]; platforms = with platforms; platforms.linux; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 7f50b816cc1..a5bfb8bfc59 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chromium-based cross-platform / cross-language application framework"; homepage = https://github.com/breach/thrust; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = [ maintainers.osener ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 485b52d3d08..a7d6bbc63d9 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://red.planetarena.org; # Engine is under GPLv2, everything else is under - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 801b7ea7277..c577d65a559 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A blobby volleyball game''; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; homepage = "http://blobby.sourceforge.net/"; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e7a420b894a..46cd66d22af 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = with maintainers; [ nckx sander ]; }; diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index a0a25a2ff4b..4c1a385baaf 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { battle (or at least blow to bits in aesthetically pleasing ways). ''; homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; platforms = [ "x86_64-linux" "i686-linux" ] ; }; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 925362be1c5..9224d5872c2 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { realism". This results in a very unique, enjoyable and addictive game. ''; homepage = http://www.urbanterror.net; - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 4a845a3a17e..db389047ec7 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { to life, and all the consequences that ensue. ''; homepage = http://www.strangeloopgames.com; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 83c9b5d52fa..95086d04630 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.warsow.net; # Engine is under GPLv2, everything else is under - license = with licenses; unfreeRedistributable; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; }; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 2382da03453..ba887d91de1 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { game, or that they are extremely delicious. ''; homepage = http://worldofgoo.com; - license = with licenses; unfree; + license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ba8245bb700..7b68e1e3d36 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { aims to become the best possible open-source FPS of its kind. ''; homepage = http://www.xonotic.org; - license = with stdenv.lib.licenses; gpl2Plus; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9b1c181c2a4..0ff38209867 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -540,7 +540,7 @@ rec { meta = with stdenv.lib; { description = "Analytics about your programming"; homepage = https://wakatime.com; - license = with licenses; bsd3; + license = licenses.bsd3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 39c606f3fb5..b8fc6e5f6ce 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { inherit version; description = "Report system-wide file access events"; homepage = https://launchpad.net/fatrace/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. Its main purpose is to find processes which keep waking up the disk diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 7d5ed0cd3ee..4c1497367e3 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the internal hard drive and park its heads on the ramp when critical situations are anticipated. This has no effect on SSD devices! ''; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 4733ce95bb2..e4165b08d7d 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; homepage = https://code.google.com/p/ftop/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' Ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. If run as a regular user, the set of diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 7672318392f..4b371097ee6 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { - Customizable multi-threaded caching ''; homepage = http://seasonofcode.com/pages/jfbview.html; - license = with licenses; asl20; + license = licenses.asl20; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a5f6242f84f..16f1331d320 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { inherit version; description = "Log machine checks (memory, IO, and CPU hardware errors)"; homepage = http://mcelog.org/; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index ac60501929a..4b656967386 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 3b0f7c694ac..fab13a125c4 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://sg.danny.cz/sg/sdparm.html; description = "A utility to access SCSI device parameters"; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index ebabb1091ee..f898034719f 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 38e59a39f38..2bb81d83337 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -11,7 +11,7 @@ meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index adda65ce60a..a0392d0f95a 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 88a1d464b67..bbac243c7a0 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 705a4ba43e7..8a831f7ff69 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = with stdenv.lib.licenses; bsd3; + license = stdenv.lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index e951c24e6a0..28359bb555d 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = with stdenv.lib.licenses; free; + license = stdenv.lib.licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 2422d2bb4f7..151cd68fdbc 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "NX compression proxy"; homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index fdc52eabd4b..0b29ca1f42a 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Enterprise ready, Network Backup Tool"; homepage = http://bacula.org/; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ iElectric lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fcc3b373fd1..5355138ac8c 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { inherit version; description = "Binary differential compression in VCDIFF (RFC 3284) format"; homepage = http://xdelta.org/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index c0a6c8400fd..f47107c85fb 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { unmount the file system with `fusermount -u mountpoint`. ''; homepage = https://github.com/drotiro/boxfs2; - license = with licenses; gpl3; + license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 409e7a8c36f..59cb07dead0 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quickly find duplicate files"; homepage = http://duff.dreda.org/; - license = with licenses; zlib; + license = licenses.zlib; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 81a3b46cacb..211690606ef 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://vgough.github.io/encfs; description = "Provides an encrypted filesystem in user-space via FUSE"; - license = with licenses; lgpl2; + license = licenses.lgpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix index a767ba36b3f..3215b0d9174 100644 --- a/pkgs/tools/filesystems/exfat-utils/default.nix +++ b/pkgs/tools/filesystems/exfat-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Unix-like systems. ''; homepage = https://code.google.com/p/exfat; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix index 983228e9de5..ae9f9e32fa8 100644 --- a/pkgs/tools/filesystems/fuse-exfat/default.nix +++ b/pkgs/tools/filesystems/fuse-exfat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/exfat/; description = "A FUSE-based filesystem that allows read and write access to exFAT devices"; platforms = with platforms; linux; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 50242bb6388..23ee5558e14 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { simple drag-and-drop in a file browser. ''; homepage = http://khenriks.github.io/mp3fs/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 5106af48917..853654c0f79 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://rdfind.pauldreik.se/; description = "Removes or hardlinks duplicate files very swiftly"; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ wmertens ]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index f081f812169..7e880ffeeb9 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 9c32d3c5466..47eacd9bdb0 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { add-on to your favorite shell. ''; homepage = http://www.clex.sk; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index cfc1e9ab564..800e1c6f67a 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -13,7 +13,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; homepage = http://www.fluentd.org/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index e5c814faa4a..dd2798de272 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { while preserving the partition contents. ''; homepage = http://gparted.sourceforge.net; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index a3a34d95fb5..663c60d2856 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = http://qjoypad.sourceforge.net; - license = with stdenv.lib.licenses; gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index fd64f6694ee..ad9e0949ce8 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; - license = with licenses; asl20; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 96610c32167..f5ac891d8e6 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "Manage complex tmux sessions easily"; homepage = https://github.com/tmuxinator/tmuxinator; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ auntie ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index bc48bb6cf47..ca0c5f5edf1 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { - Supports IPv6. ''; homepage = http://unix4lyfe.org/darkstat; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index bdd2c4a0c24..11dadf9dcd8 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for securing communications between a client and a DNS resolver"; homepage = http://dnscrypt.org/; - license = with stdenv.lib.licenses; [ isc ]; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ joachifm ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index fcb3e903753..c4f7c8da9d4 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { allowed. ''; homepage = http://code.gerade.org/hans/; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 9b676c6b72e..f1abec0faf7 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Now only one utiltity is needed to do a lot. ''; homepage = http://www.deepspace6.net/projects/ipv6calc.html; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index f16698ef3cd..5d05677bb29 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; - license = with licenses; [ gpl2Plus ]; + license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny viric ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index cf9c3a4fa4e..fad99bbd7d7 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; - license = with licenses; gpl3; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 967504a0004..c391bb9ecb0 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = http://netsniff-ng.org/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 2368470b84d..150f60f8de4 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = http://arthurdejong.org/nss-pam-ldapd/; - license = with licenses; [ lgpl21 ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 7f6addc8629..70294820425 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { connect at startup to any preferred network within range. ''; maintainers = [ maintainers.roconnor ]; - license = with licenses; gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 624386f34f2..beb0e7d8678 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mornfall nckx ]; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a8f6ae81e04..ef15967330d 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. Also requires a running pcscd service and compatible card reader. diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index 45a314e13a6..06307263e52 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) viewer"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = with licenses; lgpl3; + license = licenses.lgpl3; longDescription = '' A simple, graphical Java application to view, print and save data from Belgian electronic identity cards. Independent of the eid-mw package, diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 1e2f74e1b0a..ef0a6d251a3 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bootchart.org/; description = "Performance analysis and visualization of the GNU/Linux boot process"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index fd911142c21..ce29fc63553 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index baaa97b4b24..d560fdad51b 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { reliable and faster recovery. ''; homepage = http://foremost.sourceforge.net/; - license = with licenses; publicDomain; + license = licenses.publicDomain; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a61835dbd0c..e624991dc42 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = http://kernel.ubuntu.com/~cking/stress-ng; downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 62f7280a54a..4aba9f48b76 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Setuid-safe wrapper for chroot"; - license = with licenses; gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index a1397cb6214..c443dc148f1 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "terminal mixer - multiplexer for the i/o of terminal applications"; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 6cd69a746f0..3bf4cea09f5 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "task spooler - batch queue"; - license = with licenses; gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index c9cf05373b5..386e80a1376 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { which can also easily be used to show your records on a web page. ''; homepage = https://github.com/rpodgorny/uptimed/; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbab34adc03..429da118b09 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -36,7 +36,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; - license = with licenses; artistic2; + license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; @@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2d vector graphics library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -3723,7 +3723,7 @@ let self = _self // overrides; _self = with self; { ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; - license = with licenses; artistic2; + license = licenses.artistic2; }; }; @@ -3986,7 +3986,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; - license = with licenses; gpl2; + license = licenses.gpl2; }; }; @@ -4105,7 +4105,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = stdenv.lib.licenses.lgpl3Plus; }; }; @@ -4160,7 +4160,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; - license = with licenses; artistic2; + license = licenses.artistic2; maintainers = [ ]; }; }; @@ -4185,7 +4185,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -7273,7 +7273,7 @@ let self = _self // overrides; _self = with self; { homepage = http://gtk2-perl.sourceforge.net/; description = "Layout and render international text"; maintainers = with maintainers; [ nckx ]; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -7813,7 +7813,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; }; }; @@ -7923,7 +7923,7 @@ let self = _self // overrides; _self = with self; { }; meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; - license = with licenses; mit; + license = licenses.mit; }; }; @@ -8435,7 +8435,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsUtil SubExporter ]; meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; - license = with licenses; gpl2; + license = licenses.gpl2; }; }; @@ -9335,7 +9335,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; meta = with stdenv.lib; { description = "Simulating other classes"; - license = with licenses; lgpl2Plus; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc6b79a86e4..882ddad6815 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1766,7 +1766,7 @@ let A Python package for creating beautiful command line interfaces in a composable way, with as little code as necessary. ''; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -5412,7 +5412,7 @@ let It's just one file and is implemented using ctypes. ''; homepage = http://github.com/terencehonles/fusepy; - license = with licenses; isc; + license = licenses.isc; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5513,7 +5513,7 @@ let - Allow for the same file at multiple paths. ''; homepage = https://github.com/dsoprea/GDriveFS; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; @@ -5664,7 +5664,7 @@ let anywhere within your gevent-powered application. ''; homepage = http://gehrcke.de/gipc; - license = with licenses; mit; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; @@ -8058,7 +8058,7 @@ let not a large parsing framework or a component of some larger system. ''; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = [ ]; }; @@ -8432,7 +8432,7 @@ let syntax highlighting. ''; homepage = http://pgcli.com; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -8742,7 +8742,7 @@ let with a nice interactive Python shell (called ptpython) built on top. ''; homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -9047,7 +9047,7 @@ let meta = { homepage = https://pypi.python.org/pypi/pygit2; description = "A set of Python bindings to the libgit2 shared library"; - license = with licenses; gpl2; + license = licenses.gpl2; platforms = with platforms; all; }; }; @@ -9489,7 +9489,7 @@ let meta = { homepage = http://pygments.org/; description = "A generic syntax highlighter"; - license = with licenses; [ bsd2 ]; + license = licenses.bsd2; maintainers = with maintainers; [ nckx ]; }; }; @@ -10190,7 +10190,7 @@ let meta = { homepage = "https://github.com/rackspace/pyrax"; - license = with licenses; mit; + license = licenses.mit; description = "Python API to interface with Rackspace"; }; @@ -10266,7 +10266,7 @@ let meta = { homepage = "http://github.com/mongodb/mongo-python-driver"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; description = "Python driver for MongoDB "; }; }; @@ -10334,7 +10334,7 @@ let in Python. ''; - license = with licenses; bsd3; + license = licenses.bsd3; maintainers = [ ]; }; @@ -10726,7 +10726,7 @@ let meta = { description = "Check the status of code repositories under a root directory"; homepage = https://github.com/kynikos/repocheck; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; }; }; @@ -12144,7 +12144,7 @@ let Provides support for parsing, splitting and formatting SQL statements. ''; homepage = https://github.com/andialbrecht/sqlparse; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -13182,7 +13182,7 @@ let no 3rd-party dependencies. ''; homepage = https://github.com/jquast/wcwidth; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ nckx ]; }; }; |