From 7dceb844199366e40cc28565f686795c27c0a489 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 22:15:45 +0200 Subject: [PATCH 01/20] libressl: add licenses --- pkgs/development/libraries/libressl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 91d2851df2bb..e30f2b0af5d5 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -27,6 +27,7 @@ let meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; + license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; }; From 12302a2e2217069a0ae85acf63ef87b697eaf606 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 22:26:20 +0200 Subject: [PATCH 02/20] lssci: add license --- pkgs/os-specific/linux/lsscsi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 96b84c00a5f0..aba907039aca 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { substituteInPlace Makefile.in --replace /usr "$out" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.linux; }; } From 03a41ab5ec818c76f64f9009867fd9d7cef3f1e8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 22:30:55 +0200 Subject: [PATCH 03/20] lvm2: add license --- pkgs/os-specific/linux/lvm2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a24024112c95..096eefe8a68f 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -78,11 +78,12 @@ stdenv.mkDerivation { cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; - meta = { + meta = with stdenv.lib; { homepage = http://sourceware.org/lvm2/; description = "Tools to support Logical Volume Management (LVM) on Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = platforms.linux; + license = with licenses; [ gpl2 bsd2 lgpl21 ]; + maintainers = with maintainers; [raskin]; inherit version; downloadPage = "ftp://sources.redhat.com/pub/lvm2/"; }; From bd73e26cda625111521813ce1ea171a4b6987d42 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 22:40:20 +0200 Subject: [PATCH 04/20] mdadm: add license --- pkgs/os-specific/linux/mdadm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index b6fdae75bac2..6de666630bb3 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile ''; - meta = { + meta = with stdenv.lib; { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 44ab7c5fbedad01a4ec97cf72e701afcc616af21 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:37:37 +0200 Subject: [PATCH 05/20] man-pages: add license --- pkgs/data/documentation/man-pages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 244e00ec70ac..6d657472e66f 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Linux development manual pages"; homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; + license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it }; From fbc3dd0a6696c6580bc807779965e37729cb9d8c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:39:26 +0200 Subject: [PATCH 06/20] mingetty: add license --- pkgs/os-specific/linux/mingetty/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index d36544453323..a29a03734242 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mingetty; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 4920d7adb07c653d0480bcd1fb99ba9b366f2f64 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:44:13 +0200 Subject: [PATCH 07/20] mktemp: update meta data --- pkgs/tools/security/mktemp/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index a2a4f82f652c..71bdd3af55de 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation { sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Simple tool to make temporary file handling in shells scripts safe and simple"; + homepage = https://www.mktemp.org; + license = licenses.isc; + platforms = platforms.unix; }; } From 6aba5e26b3bf79ba8e193ea3ece74011c1b33ce0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:52:16 +0200 Subject: [PATCH 08/20] ntp: add license --- pkgs/tools/networking/ntp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 467b17e468a2..19a90e2c13c9 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.ntp.org/; description = "An implementation of the Network Time Protocol"; + license = { + # very close to isc and bsd2 + url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html; + }; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; }; From 73eede054326dd33605bed9ce8e4fd6c099f5b9e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:55:36 +0200 Subject: [PATCH 09/20] nss: add license --- pkgs/development/libraries/nss/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5387272a2f05..fd9730cc218c 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -108,9 +108,10 @@ in stdenv.mkDerivation rec { rm -f "$out"/lib/*.a ''; - meta = { + meta = with stdenv.lib; { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; - platforms = stdenv.lib.platforms.all; + license = licenses.mpl20; + platforms = platforms.all; }; } From dcd7b27e850e66c566a9b3af738404326decb3e0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 17 Aug 2018 23:58:56 +0200 Subject: [PATCH 10/20] nss_ldap: update meta data --- pkgs/os-specific/linux/nss_ldap/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 70cbae88d695..ef0bdc4f1266 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, openldap, perl}: - + stdenv.mkDerivation { name = "nss_ldap-265"; - + src = fetchurl { url = http://www.padl.com/download/nss_ldap-265.tar.gz; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; @@ -29,7 +29,9 @@ stdenv.mkDerivation { buildInputs = [ openldap perl ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "LDAP module for the Solaris Nameservice Switch (NSS)"; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 8844504fba5de1e903efbe8b4374ad34306d7f24 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:03:01 +0200 Subject: [PATCH 11/20] openldap: add license --- pkgs/development/libraries/openldap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 9ed555053e25..16e00e9f2b95 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.openldap.org/; description = "An open source implementation of the Lightweight Directory Access Protocol"; + license = licenses.openldap; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; From 4ba295b79757bd196e340fb4c31c35d6a1251eec Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:05:21 +0200 Subject: [PATCH 12/20] openssl: add license --- pkgs/development/libraries/openssl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b09809f89249..c36f141d4214 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -107,11 +107,12 @@ let fi ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = licenses.openssl; + platforms = platforms.all; + maintainers = [ maintainers.peti ]; priority = 10; # resolves collision with ‘man-pages’ }; }; From a3990e734d49308b511796013e678df263a77fd8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:11:32 +0200 Subject: [PATCH 13/20] perl: add license --- pkgs/development/interpreters/perl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 40a70623dcb7..9b128185dd0a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -152,6 +152,7 @@ let meta = { homepage = https://www.perl.org/; description = "The standard implementation of the Perl 5 programmming language"; + license = licenses.gpl1; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; From 0320769991e29f1fb7d1d4c56ccbc71bc0266258 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:12:55 +0200 Subject: [PATCH 14/20] polkit: add license --- pkgs/development/libraries/polkit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 82927664b4c1..6675bbf91836 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; + license = licenses.gpl2; platforms = platforms.unix; maintainers = [ ]; }; From 406dee31c47abc2bd48fd9a5b8317444412e6dd7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:18:17 +0200 Subject: [PATCH 15/20] ppp: add licenses --- pkgs/tools/networking/ppp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 96016ee7b4f3..cea8a3f133f4 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -55,10 +55,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = https://ppp.samba.org/; description = "Point-to-point implementation for Linux and Solaris"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.falsifian ]; + license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.falsifian ]; }; } From 63a80e7bfff97da5ec7a2aa11ef313f668a37368 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:22:12 +0200 Subject: [PATCH 16/20] pptp: add license --- pkgs/tools/networking/pptp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index d8a633f03321..03270ce87881 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl which ]; - meta = { + meta = with stdenv.lib; { description = "PPTP client for Linux"; homepage = http://pptpclient.sourceforge.net/; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 827e959a6f5f7df66f385f28cffc08e07c6a6eb4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:28:13 +0200 Subject: [PATCH 17/20] shadow: update meta data --- pkgs/os-specific/linux/shadow/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 25ba60b58eea..885ea3421f65 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -81,10 +81,11 @@ stdenv.mkDerivation rec { mv $out/bin/su $su/bin ''; - meta = { - homepage = http://pkg-shadow.alioth.debian.org/; + meta = with stdenv.lib; { + homepage = https://github.com/shadow-maint; description = "Suite containing authentication-related tools such as passwd and su"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; passthru = { From 2ba5ac8ddab3882073b9e7a7fb5626ed94d0c0a8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:32:36 +0200 Subject: [PATCH 18/20] systemd: add license --- pkgs/os-specific/linux/systemd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 015aabbacfe6..912ba5b5e0ef 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -198,10 +198,11 @@ in stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } From 824a0192a7ebeb1a8d78ee23c38611a6d156de94 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 00:45:54 +0200 Subject: [PATCH 19/20] xfig: update meta data --- pkgs/applications/graphics/xfig/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 545675ab1545..7e276aaf406c 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; - homepage = http://xfig.org; + homepage = http://mcj.sourceforge.net/; + license = { + url = "http://mcj.sourceforge.net/authors.html#xfig"; + }; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } From 2521f7cbdc2725e9420902d29bbdeea353b47069 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 18 Aug 2018 23:11:55 +0200 Subject: [PATCH 20/20] perl: set license to artistic --- pkgs/development/interpreters/perl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 9b128185dd0a..765487fc6508 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -152,7 +152,7 @@ let meta = { homepage = https://www.perl.org/; description = "The standard implementation of the Perl 5 programmming language"; - license = licenses.gpl1; + license = licenses.artistic1; maintainers = [ maintainers.eelco ]; platforms = platforms.all; };