From b2710b53abce8c8c3f06b8e6885d384e1ed09dd9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:26:02 +0200 Subject: [PATCH 01/20] axoloti/libusb1: add license --- pkgs/applications/audio/axoloti/libusb1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index cf71c006046..1a6ebd346cc 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.libusb.info; description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From 661f569b6c0754351671769d4c88cecdaac03f12 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:32:04 +0200 Subject: [PATCH 02/20] distrho: add licenses --- pkgs/applications/audio/distrho/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 5885e0f73f5..bf79b68bc7d 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; + license = with licenses; [ gpl2 gpl3 gpl2Plus lgpl3 mit ]; maintainers = [ maintainers.goibhniu ]; platforms = [ "x86_64-linux" ]; }; From 683265c3d608e75937c9388ad010c41736d75b4c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:34:09 +0200 Subject: [PATCH 03/20] lastfmsubmitd: add license --- pkgs/applications/audio/lastfmsubmitd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index e22bca29bc9..3135a00334c 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "lastfmsubmitd"; @@ -15,6 +15,7 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = https://www.red-bean.com/decklin/lastfmsubmitd/; + license = lib.licenses.mit; description = "An last.fm audio scrobbler and daemon"; }; } From e014edeb8bbe4aee8b301135586693f51a9a4fbb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:41:30 +0200 Subject: [PATCH 04/20] k3d: add license --- pkgs/applications/graphics/k3d/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 3555c2b477f..a4b509704a7 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -39,12 +39,11 @@ stdenv.mkDerivation rec { #doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } From e350e31691c1687919fcb291984d004262cc6d70 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:49:57 +0200 Subject: [PATCH 05/20] golden-cheetah: add license --- pkgs/applications/misc/golden-cheetah/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index f62eb92ac04..eecc34b3d94 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm' enableParallelBuilding = false; - meta = { + meta = with stdenv.lib; { description = "Performance software for cyclists, runners and triathletes"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = platforms.linux; + maintainers = [ maintainers.ocharles ]; + license = licenses.gpl3; }; } From 98440749c10309c6330558951313193675158b55 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 13:53:01 +0200 Subject: [PATCH 06/20] goldendict: add license --- pkgs/applications/misc/goldendict/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 5cb51eefe5d..42d5d83f7bd 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { qmakeFlags = [ "CONFIG+=zim_support" ]; - meta = { + meta = with stdenv.lib; { homepage = http://goldendict.org/; description = "A feature-rich dictionary lookup program"; - - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ]; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner astsmtl ]; + license = licenses.gpl3Plus; }; } From c809cfb197ad52c36884afc1da51f3744f73dc07 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:02:24 +0200 Subject: [PATCH 07/20] gphoto2fs: add license + homepage --- pkgs/applications/misc/gphoto2/gphotofs.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 6fa11667cf3..7b23fca2121 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { libgphoto2 fuse glib libtool ]; - meta = { + meta = with stdenv.lib; { description = "Fuse FS to mount a digital camera"; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.gphoto.org/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = with licenses; [ lgpl2 gpl2 ]; }; } From 18cf65ac580ea4ce26c7617aa7d61a38d61b9a46 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:04:59 +0200 Subject: [PATCH 08/20] ethabi: add license --- pkgs/applications/altcoins/ethabi.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index 81b4cb52948..d0bc700eb70 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -17,10 +17,11 @@ buildRustPackage rec { cargoBuildFlags = ["--features cli"]; - meta = { + meta = with stdenv.lib; { description = "Ethereum function call encoding (ABI) utility"; homepage = https://github.com/ethcore/ethabi/; - maintainers = [stdenv.lib.maintainers.dbrock]; + maintainers = [ maintainers.dbrock ]; + license = licenses.gpl3; inherit version; }; } From 733280bb6e0a33558e103ab0b268e039d57115bf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:06:43 +0200 Subject: [PATCH 09/20] ethrun: add license --- pkgs/applications/altcoins/ethrun.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix index 2a8c37610db..c58d9d8faf4 100644 --- a/pkgs/applications/altcoins/ethrun.nix +++ b/pkgs/applications/altcoins/ethrun.nix @@ -15,10 +15,11 @@ buildRustPackage rec { cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0"; - meta = { + meta = with stdenv.lib; { description = "Directly run Ethereum bytecode"; homepage = https://github.com/dapphub/ethrun/; - maintainers = [stdenv.lib.maintainers.dbrock]; + maintainers = [ maintainers.dbrock ]; + license = licenses.gpl3; broken = true; # mark temporary as broken inherit version; }; From b986430d0238fd493704ba2764a8779dee59cd20 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:09:18 +0200 Subject: [PATCH 10/20] gxneur: add licenses --- pkgs/applications/misc/gxneur/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index ec041902b25..9def56aa98c 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -14,8 +14,9 @@ stdenv.mkDerivation { libglade GConf pcre libappindicator-gtk2 ]; - meta = { + meta = with stdenv.lib; { description = "GUI for XNEUR keyboard layout switcher"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ gpl2 gpl3 ]; }; } From 7ddb87eb5a8baad95a473311249bc138aceb04c9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:11:09 +0200 Subject: [PATCH 11/20] krename: add license --- pkgs/applications/misc/krename/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index a0a2776ae36..52233ad2f2f 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -20,6 +20,7 @@ in mkDerivation rec { meta = with lib; { homepage = http://www.krename.net; description = "A powerful batch renamer for KDE"; + license = licenses.gpl2; inherit (kconfig.meta) platforms; maintainers = with maintainers; [ peterhoeg ]; }; From 4f67eabc19664e3a4e394853fe4045e3d4caf8a4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:13:00 +0200 Subject: [PATCH 12/20] mop: add license --- pkgs/applications/misc/mop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index 8c6bd92d536..b9179bbe546 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -22,9 +22,10 @@ buildGoPackage rec { sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx"; }; - meta = { + meta = with stdenv.lib; { description = "Simple stock tracker implemented in go"; homepage = https://github.com/mop-tracker/mop; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; }; } From 5194e10968e25af637eebfeb710650a395869554 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:16:42 +0200 Subject: [PATCH 13/20] nut: add licenses --- pkgs/applications/misc/nut/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4d53203ccd4..816918ca063 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; - meta = { + meta = with stdenv.lib; { description = "Network UPS Tools"; longDescription = '' Network UPS Tools is a collection of programs which provide a common @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.networkupstools.org/; repositories.git = https://github.com/networkupstools/nut.git; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ pierron ]; + platforms = platforms.linux; + maintainers = [ maintainers.pierron ]; + license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; priority = 10; }; } From f48d5dae41fb6d7fc5e8a87dc960a713121b1a3a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:18:09 +0200 Subject: [PATCH 14/20] pdf-quench: add license --- pkgs/applications/misc/pdf-quench/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index c567a7903b8..0829c4f91cc 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -31,6 +31,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/linuxerwang/pdf-quench; description = "A visual tool for cropping pdf files"; platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ flokli ]; }; } From c7808a90139e784eb7bbe321e3f5bdaf3ed156b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:19:28 +0200 Subject: [PATCH 15/20] posterazor: add license --- pkgs/applications/misc/posterazor/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 6cb00fb1525..45db856dbb9 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { cp PosteRazor $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; - maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.madjar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } From e279a7858e7887eb2f00dd809ee19358fd8b4067 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:21:53 +0200 Subject: [PATCH 16/20] terminal-notifier: add license --- pkgs/applications/misc/terminal-notifier/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index c838eca5065..b05c8a80399 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.darwin; + homepage = https://github.com/julienXX/terminal-notifier; + license = licenses.mit; + platforms = platforms.darwin; }; } From e134ce139eebd93d76c7afbc9894527e9e07e28b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:24:34 +0200 Subject: [PATCH 17/20] wordnet: add license --- pkgs/applications/misc/wordnet/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index a2e3fa13fc6..5d153a0e417 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation rec { ''; homepage = https://wordnet.princeton.edu/; - + license = { + fullName = "WordNet 3.0 license"; + url = https://wordnet.princeton.edu/license-and-commercial-use; + }; maintainers = [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; From 0bd9864dd8148135fd7912f044d49f84e25822f5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:27:45 +0200 Subject: [PATCH 18/20] xautoclick: add license --- pkgs/applications/misc/xautoclick/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index bb18da4d4ad..045354da3d6 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { addToSearchPath PATH .bin ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Autoclicker application, which enables you to automatically click the left mousebutton"; + homepage = http://xautoclick.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.linux; }; } From bf0a571725778ea1cfc2a8508758f13c7c9ce270 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:31:25 +0200 Subject: [PATCH 19/20] xchm: add license --- pkgs/applications/misc/xchm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 74c9c807b81..a7a6500fd22 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { echo $NIX_LDFLAGS ''; - meta = { + meta = with stdenv.lib; { description = "A viewer for Microsoft HTML Help files"; homepage = http://xchm.sourceforge.net; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 0c0656bcdceea0e86316aa386197a275fa6b8ca9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Sep 2018 14:34:00 +0200 Subject: [PATCH 20/20] xpdf: add license, update homepage --- pkgs/applications/misc/xpdf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 3cb416a5f7c..7e0369b277d 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation { --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} ''; - meta = { - homepage = http://www.foolabs.com/xpdf/; + meta = with stdenv.lib; { + homepage = https://www.xpdfreader.com; description = "Viewer for Portable Document Format (PDF) files"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = with licenses; [ gpl2 gpl3 ]; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; }; }