From d6aabb1f9a06eae6a83bbd7e99b86b066cf91eca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:26:04 +0200 Subject: [PATCH 01/15] jool: add license --- pkgs/os-specific/linux/jool/cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 50f0398e1343..d851a47924d6 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { homepage = https://www.jool.mx/; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; }; } From a3f9340d930a42883cc9c90aa3f1e205f489a145 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:28:03 +0200 Subject: [PATCH 02/15] kmod: add license --- pkgs/os-specific/linux/kmod/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 142c176a15fa..43d69ac9574d 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -33,9 +33,10 @@ in stdenv.mkDerivation rec { ln -s bin $out/sbin ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/; description = "Tools for loading and managing Linux kernel modules"; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } From e0c319cee3e72ec0dd8408736cc05296ba8c7d0e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:30:20 +0200 Subject: [PATCH 03/15] libatasmart: add license, update homepage --- pkgs/os-specific/linux/libatasmart/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 81333ce790ed..3c8c71bdde57 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; - meta = { - homepage = http://0pointer.de/public/; + meta = with stdenv.lib; { + homepage = http://0pointer.de/blog/projects/being-smart.html; description = "Library for querying ATA SMART status"; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } From bbb8d5c2503099b0f8fa750bab797fd65739e768 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:33:49 +0200 Subject: [PATCH 04/15] lksctp-tools: add license --- pkgs/os-specific/linux/lksctp-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index f5f08a3e7c69..6c644c9482a3 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; }; - meta = { + meta = with stdenv.lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools."; homepage = http://lksctp.sourceforge.net/; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 + platforms = platforms.linux; }; } From c8ff1aeb7be1d2ee62a92c7c276e1734a51e10cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:35:57 +0200 Subject: [PATCH 05/15] lm-sensors: add license --- pkgs/os-specific/linux/lm-sensors/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 25b868369ae1..af52dc551ddd 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"}) ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.lm-sensors.org/; description = "Tools for reading hardware sensors"; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; + platforms = platforms.linux; }; } From c6eff806968494ea21ee4fbc8304562c6f6758bd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:37:57 +0200 Subject: [PATCH 06/15] multipath-tools: add license --- pkgs/os-specific/linux/multipath-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index a1b207ffea09..6488f98565a9 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -31,9 +31,10 @@ stdenv.mkDerivation rec { "unitdir=$(out)/lib/systemd/system" ]; - meta = { + meta = with stdenv.lib; { description = "Tools for the Linux multipathing driver"; homepage = http://christophe.varoqui.free.fr/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 7c10761149e42c68d7057448ec609946138738c2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:40:20 +0200 Subject: [PATCH 07/15] pam_ccreds: add license --- pkgs/os-specific/linux/pam_ccreds/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 6026ac1d41aa..8293ac0a830a 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation { sed 's/-o root -g root//' -i Makefile.in ''; - buildInputs = [pam openssl db]; - meta = { + buildInputs = [ pam openssl db ]; + + meta = with stdenv.lib; { homepage = http://www.padl.com/OSS/pam_ccreds.html; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 11bb3c134f4be779f30f14137a49933704ce6b8a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:42:32 +0200 Subject: [PATCH 08/15] pam_mount: add licenses --- pkgs/os-specific/linux/pam_mount/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index c38990bdf8fd..29ed9375c2e3 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { rm -r $out/nix ''; - meta = { + meta = with stdenv.lib; { homepage = http://pam-mount.sourceforge.net/; description = "PAM module to mount volumes for a user session"; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.tstrobel ]; + license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; + platforms = platforms.linux; }; } From 74470d51c3875a6459ca66014ec7760998cdd79e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:46:29 +0200 Subject: [PATCH 09/15] perf-tools: add license --- pkgs/os-specific/linux/perf-tools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 31f86965ee8d..ee12251ae5e3 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -34,10 +34,11 @@ stdenv.mkDerivation { mv $d/man $out/share/ ''; - meta = { - platforms = lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; homepage = https://github.com/brendangregg/perf-tools; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl2; }; } From a5dd0609b3d4587cc3ccd2f071eaa0ef3cd01bf0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:51:23 +0200 Subject: [PATCH 10/15] rfkill: add license --- pkgs/os-specific/linux/rfkill/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 48be4fbc3438..6b6bef29cc36 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; description = "A tool to query, enable and disable wireless devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; + license = licenses.isc; }; } From b67770e03354616893620561d2a8584b61582853 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:54:56 +0200 Subject: [PATCH 11/15] rtkit: add licenses --- pkgs/os-specific/linux/rtkit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 868dcc9a58ea..059b09449619 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus libcap ]; - meta = { + meta = with stdenv.lib; { homepage = http://0pointer.de/blog/projects/rtkit; description = "A daemon that hands out real-time priority to processes"; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl3 bsd0 ]; # lib is bsd license + platforms = platforms.linux; }; } From 4927ecbf2565f59510cd6740cd877eaf4cd47c35 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 21:57:21 +0200 Subject: [PATCH 12/15] udisks: add license --- pkgs/os-specific/linux/udisks/1-default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index bdc6a63f0697..d48c21f6b52a 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2Plus ]; }; } From 85c3661c088492de8f6df7e089adc47b69de40ee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 22:00:16 +0200 Subject: [PATCH 13/15] usbutils: add license --- pkgs/os-specific/linux/usbutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index adb2a0ee2fb1..657d6cc24a8d 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.linux-usb.org/; description = "Tools for working with USB devices, such as lsusb"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } From b3d114e6f9dfc63600c90a62be38f4e7a6fe1495 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 22:03:07 +0200 Subject: [PATCH 14/15] wpa_gui: add license + homepage --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index f4ef1b1498f8..891de61c0170 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -23,8 +23,10 @@ stdenv.mkDerivation { cp -av icons/hicolor $out/share/icons ''; - meta = { + meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - platforms = stdenv.lib.platforms.linux; + homepage = http://hostap.epitest.fi/wpa_supplicant/; + license = licenses.bsd3; + platforms = platforms.linux; }; } From 5c9fbdfbfc702926766424364968974981464eb6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Aug 2018 22:06:52 +0200 Subject: [PATCH 15/15] bsd_fingerd: add license --- pkgs/servers/fingerd/bsd-fingerd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index f7f2f93cf99e..d5671921abad 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.bsdOriginal; }; }