diff options
Diffstat (limited to 'pkgs/applications')
30 files changed, 56 insertions, 62 deletions
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index de5ef0551254..ebe847353dd9 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { for you. Listen directly on your computer or on your mobile devices. ''; homepage = "http://gpodder.org/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.skeidel ]; }; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index b1970a998d50..08d91498cc0a 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; homepage = http://sourceforge.net/projects/mp3splt/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bosu ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 3e365cae8e94..717262dbcb57 100755 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; homepage = https://github.com/boysetsfrog/vimpc; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index e1d2ad69b1dd..0850dd0e7be0 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://elvis.vi-editor.org/; description = "A vi clone for Unix and other operating systems"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix index 32a036805edc..96d7619d387b 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { interactive theorem provers), based on the customizable text editor Emacs. ''; homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 6901aed774ba..45a527c7484e 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 81e0dd35db95..ee9b775453c2 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.bostic.com/vi/; description = "The Berkeley Vi Editor"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 41a4b102a6f3..f1ca27eed803 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cinepaint.org/; - license = "free"; + license = stdenv.lib.licenses.free; description = "Image editor which supports images over 8bpp and ICC profiles"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bd155c59c6b2..9f7643ad1c04 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 7139bc71f3c1..c5350228dcf2 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -59,7 +59,7 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; - meta = { + meta = { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license @@ -174,10 +174,10 @@ rec { sourceRoot = "${name}/src"; buildPhase = "make gimp"; installPhase = "installPlugins gmic_gimp"; - meta = { + meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; - license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT"; + license = stdenv.lib.licenses.cecill20; /* The purpose of this Free Software license agreement is to grant users the right to modify and redistribute the software governed by this @@ -197,7 +197,7 @@ rec { # --enable-dst-correction - enable DST correction for file timestamps. # --enable-contrast - enable the contrast setting option. # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. + # --with-lensfun: use the lensfun library - experimental feature, read this before using it. # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index cc42e1c40466..40f8d441d7e9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric guibert]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 66fceec9a51b..3c146249dd0b 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "d4x-2.5.7.1"; - + inherit boost; src = fetchurl { @@ -12,9 +12,9 @@ stdenv.mkDerivation { buildInputs = [ gtk glib pkgconfig openssl boost ]; - meta = { + meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; } diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 542f11f6e671..5133ad3c29eb 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre, unzip , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -32,11 +32,11 @@ rec { doDeploy = a.fullDepEntry '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${a.stdenv.shell}' >> "$out/bin/vue" - echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" + echo '#!${a.stdenv.shell}' >> "$out/bin/vue" + echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" '' ["addInputs" "defEnsureDir"]; - + meta = { description = "Visual Understanding Environment - mind mapping software"; maintainers = with a.lib.maintainers; @@ -45,7 +45,6 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; # Apache License fork, actually + license = a.lib.licenses.free; # Apache License fork, actually }; }) x - diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 2bb05fe44e07..15d054c2be2a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Allows testing the fonts available in an X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 06b09154ba55..7584ebf72fb1 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Lists the fonts available in the X server"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 47f0c2f64552..7aa362c613fd 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation { installPhase = "make PREFIX=$out install"; - meta = { + meta = { description = "cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = with stdenv.lib.licenses; [ libpng zlib ]; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e1bcbf923677..d0fe7e91989d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; description = "Web browser"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix index 8935aeb2771a..fdf11adfb6c0 100644 --- a/pkgs/applications/networking/cluster/rq/default.nix +++ b/pkgs/applications/networking/cluster/rq/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - license = "Ruby"; + license = stdenv.lib.licenses.ruby; homepage = "http://www.codeforpeople.com/lib/ruby/rq/"; description = "Simple cluster queue runner"; longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions."; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8785837fbb93..092e6f53e493 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 07b87e3cf073..ce6e039c5b1b 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , flex, bison, gmp, perl , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["gmp"]; buildInputs = (map (n: builtins.getAttr n x) @@ -33,7 +33,7 @@ rec { sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' '') ["minInit" "doUnpack"]; - + meta = { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with a.lib.maintainers; @@ -42,7 +42,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { @@ -51,4 +51,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index afe827f3ad98..293381d2888b 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { target-system terms. ''; homepage = http://www.cl.cam.ac.uk/~pes20/ott; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 2126a4d76d63..89a214c3f474 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , sbcl, zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -47,11 +47,11 @@ rec { sbcl --load make.lisp ! ( ./test | grep ERROR ) - + mkdir -p "$out/bin" cp bin/satallax "$out/bin" '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; - + meta = { description = "A higher-order logic prover"; maintainers = with a.lib.maintainers; @@ -60,7 +60,7 @@ rec { ]; platforms = with a.lib.platforms; unix; - license = "free-noncopyleft"; + license = a.lib.licenses.free; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; }; passthru = { @@ -69,4 +69,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index f9680b475797..4d97f0480bb3 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Standard ML. ''; homepage = http://twelf.org/wiki/Main_Page; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 4c93eef2b1c0..7a534fce4f67 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 2e25ff582ee9..42c72fa47d41 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { homepage = http://vite.gforge.inria.fr/; - license = "CeCILL-A"; + license = stdenv.lib.licenses.cecill20; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index dcfcce1fcf63..562917ec0737 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation { done ''; - # usage: + # usage: meta = { description = "import svn, mercurial into git"; homepage = "http://repo.or.cz/w/fast-export.git"; - license = "?"; # the .py file is GPLv2 + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 0fdd78fe1068..3fa426d9f6f9 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 68b61fc453de..cdc53367d114 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 65a930a261c9..f7bddc50ef82 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xbmc.org/; description = "Media center"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.iElectric maintainers.titanous ]; }; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e3fa4f9fc711..c88603892b5d 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://larswm.fnurt.net/; description = "9wm-like tiling window manager"; - license = "free"; + license = stdenv.lib.licenses.free; }; } |