diff options
67 files changed, 101 insertions, 11 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 5e583049190..c9fd4f9c4ab 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -62,5 +62,6 @@ in mkDerivation rec { homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 12e3dad9c79..e504c09e43e 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 69d09cd429c..d45d6c3a62e 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ pythonPackages, fetchFromGitHub }: +{ stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; @@ -23,5 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = https://dosage.rocks/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 2ac335759ce..23d76afff0c 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -26,5 +26,6 @@ buildGoPackage rec { homepage = https://cointop.sh; platforms = stdenv.lib.platforms.linux; # cannot test others maintainers = [ ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 5cd8f572ad4..8304cb0f8d1 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 4ee9f461760..0e59ef5512d 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation (rec { downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ ]; platforms = platforms.unix; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index e44690a5bd7..bf0e964d591 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 020aa963541..0667ec49b32 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/sboli/twmn; platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 32729d57475..e461a2c8816 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 73094767bf3..9dc329dfc18 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c71ccdf8a0d..d1561a06526 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index f831ac0847c..bcabdf43cd2 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 14ed2587e63..cd697f107b3 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc98b398213..e6cc30cea95 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -96,6 +96,7 @@ let homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.asl20; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index dfb2eec5dc5..681a5baec82 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -15,5 +15,6 @@ in stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 1bfe8124104..e01aef98303 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; + license = stdenv.lib.licenses.bsd3; }; src = fetchurl { diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index a48de9a03f2..09758440524 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index f573a275aaa..c26a2a20a81 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c39478e590d..e28925c65bb 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 12f7e4c765d..901b6aa097f 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 820ee2a95d8..503c6f79659 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -27,4 +27,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; postUnpack = "sourceRoot=\${sourceRoot}/acme"; + + meta = certbot.meta // { + description = "ACME protocol implementation in Python"; + }; } diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 37f1e395d8d..3699fdd5d49 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://code.google.com/p/py-amqplib/; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index a79de55d2eb..77b93ce890e 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansi"; @@ -12,4 +12,10 @@ buildPythonPackage rec { checkPhase = '' python -c "import ansi.color" ''; + + meta = with lib; { + description = "ANSI cursor movement and graphics"; + homepage = https://github.com/tehmaze/ansi/; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index 6db4bbdc314..65476b47f8f 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; @@ -14,8 +14,9 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = { - homepage = https://pypi.python.org/pypi/anyjson/; + meta = with lib; { + homepage = https://bitbucket.org/runeh/anyjson/; description = "Wrapper that selects the best available JSON implementation"; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 584eb3ae2c5..520e01723e6 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; @@ -12,4 +12,10 @@ buildPythonPackage rec { }; buildInputs = [ zope_interface ]; + + meta = with lib; { + description = "Basic building blocks for python applications"; + homepage = https://github.com/AGProjects/python-application; + license = licenses.lgpl2Plus; + }; } diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 20013b8a1ed..cd8e83dbf63 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { @@ -14,4 +14,10 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ boto ]; + + meta = with lib; { + description = "Python Interface to Route53"; + homepage = https://github.com/mariusv/Area53; + license = licenses.unfree; # unspecified + }; } diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index b5d115f4d0b..0a54c0ed17c 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { description = "Bitbucket command line interface"; homepage = https://bitbucket.org/zhemao/bitbucket-cli; maintainers = with maintainers; [ refnil ]; + license = licenses.bsd2; }; } diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index c4e37e5c700..1bd24b4785d 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://emma.sourceforge.net/; description = "A code coverage tool for Java"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.cpl10; }; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index a5a3d243918..7f2df62008f 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = http://findbugs.sourceforge.net/; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + license = licenses.lgpl3; }; } diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 10a27e2e3b8..565ec7904f1 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -22,5 +22,6 @@ buildGoPackage rec { meta = { description = "Proxy for for simulating network conditions."; maintainers = with lib.maintainers; [ avnik ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 7db64136731..38a67289d39 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = http://fs.fsf.org/construo/; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 2fe76649d55..36ea8a7a3d5 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 06bd2a8bc4d..8549a860d8e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index a6f6365ae63..129ccb30456 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a07eec431c3..ede8d425f12 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 67df9dd2f11..376ae47ffbe 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -19,5 +19,6 @@ multiStdenv.mkDerivation { meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65ed..0ccf318dfb2 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 91443eeced5..739bd447192 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c4af0bec9a2..629f61bf5b1 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index a233b6ba4cf..eba73b2692a 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = [ stdenv.lib.maintainers.rickynils]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 2386acf1b79..cc7493f9533 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 7bfea23c78b..82d79785b11 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -15,4 +15,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2438c49d9cb..d989d17b032 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index e986b46aa48..fee601d1575 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 9587416a96a..753bdd49959 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD/DVD Burner"; homepage = https://wiki.gnome.org/Apps/Brasero; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 839cc1d604e..7f97209a4aa 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -12,4 +12,6 @@ in symlinkJoin { wrapProgram $out/bin/brasero \ --prefix PATH ':' ${binPath} ''; + + inherit (brasero-original) meta; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index dc6bcca597b..bc79577ab2b 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = https://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index b22f7e07a46..6cc049a4409 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "FUSE-based VMFS (vmware) mounting tools"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 49bd74ea412..e3c7254457d 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ garbas ]; + license = licenses.mit; }; } diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 52bcbde1cc1..56b9d5c849a 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 9449b7759a8..7b97e58fdf9 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; inherit version; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 27bb62c582a..22951eecf53 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 7610bb88f39..e31da3bfd21 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 59efcaa1809..f19d448e5fc 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 224c7a4ab48..ac69fd99265 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -26,5 +26,6 @@ python2Packages.buildPythonApplication rec { homepage = http://pyropus.ca/software/getmail/; inherit version; updateWalker = true; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 658739c93aa..63652557efa 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ebzzry codyopel ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index dce6d1acb77..e8db3a07184 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://sstp-client.sourceforge.net/; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index b23616c57e9..80daf6447ef 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://surfraw.alioth.debian.org; maintainers = []; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index 888fa48eab9..ee97bda1906 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index bcf1a5c1f79..cfe54967cce 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 + license = licenses.gpl3; }; } diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 1a276875ed7..a2ec48d4d27 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://point-at-infinity.org/seccure/; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index b286f31304e..3bbcdafcdcd 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Shamir Secret Sharing Scheme"; homepage = http://point-at-infinity.org/ssss/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 959334f4cc5..d6e8f4f1bb9 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index fe699b35590..2ab568ba841 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { shfmt formats shell programs. It can use tabs or any number of spaces to indent. You can feed it standard input, any number of files or any number of directories to recurse into. ''; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 2177937221a..f8b0ddbfac5 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 32cf2771b51..561c8cf7d78 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; @@ -15,5 +15,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 162a1b6d5a4..7efcf6cbf83 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "VNC recorder"; homepage = http://ronja.twibright.com/utils/vncrec/; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } |