From 68ec5811d1cfacc0d8d9e280ab67c9691a82e96a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 20:58:30 +0200 Subject: [PATCH 01/15] device-tree_rpi: update meta data --- pkgs/os-specific/linux/device-tree/raspberrypi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index b5886f6bd116..5a0d5710392b 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation { overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; meta = with stdenvNoCC.lib; { - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + inherit (raspberrypifw.meta) platforms homepage license; + description = "DTBs for the Raspberry Pi"; }; } From 1bd4fbc4a4273215e4ca98bf25b4c1af8fdcbb0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:00:30 +0200 Subject: [PATCH 02/15] iptstate: add license --- pkgs/os-specific/linux/iptstate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index cd290113e00e..529a82e96469 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; + license = licenses.zlib; }; installPhase = '' From fc47c7b8835910beb76b6723fda01ca486a3921b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:02:50 +0200 Subject: [PATCH 03/15] gpio-utils: add license --- pkgs/os-specific/linux/kernel/gpio-utils.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index 447704eedc8d..e28d838efb3f 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { meta = { description = "Linux tools to inspect the gpiochip interface"; - maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ kwohlfahrt ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } From b2cfe47647b6c8ede89fee25d6e7c7a2937ca7b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:04:56 +0200 Subject: [PATCH 04/15] klibcShrunk: add meta data --- pkgs/os-specific/linux/klibc/shrunk.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index b5b9783c6e7d..8b79940ed78c 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -22,7 +22,5 @@ stdenv.mkDerivation { ''; # */ allowedReferences = ["out"]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; + inherit (klibc) meta; } From 077cd7210b79fb333ea8c54a72c80b480de12533 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:10:46 +0200 Subject: [PATCH 05/15] kmod-blacklist: add license --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index e14e190cd7c5..17f34f9bbd79 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -34,5 +34,6 @@ in stdenv.mkDerivation { homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } From 2862ba321addae55fb876dfa1e830d3d6f7ad797 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:11:42 +0200 Subject: [PATCH 06/15] kmod-debian-aliases: add license --- pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index f0f413317277..23d323f84b8f 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { cp aliases.conf $out ''; - meta = { + meta = with lib; { homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; - maintainers = with lib.maintainers; [ mathnerd314 ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ mathnerd314 ]; + platforms = with platforms; linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } From 2b99f89db32769da3f87a926cb5f18714e55ea4b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:22:31 +0200 Subject: [PATCH 07/15] libvolume_id: add license --- pkgs/os-specific/linux/libvolume_id/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index e54dee10c1d4..98ddc50e2e48 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl}: - + stdenv.mkDerivation { name = "libvolume_id-0.81.1"; - + src = fetchurl { url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; @@ -18,7 +18,8 @@ stdenv.mkDerivation { cp -f libvolume_id.so.0 $out/lib/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } From 7e2278e691d83ca972d37798d3f93c6945cb499a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:27:03 +0200 Subject: [PATCH 08/15] rfkill-udev: add license --- pkgs/os-specific/linux/rfkill/udev.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 3ee112126ac6..a24c947673de 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -47,9 +47,10 @@ in stdenv.mkDerivation { cp ${rfkillHook} "$out/bin/rfkill-hook.sh" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.mit; }; } From a61b50f79b2876f39d7d4f79d93482566430ab0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:29:37 +0200 Subject: [PATCH 09/15] sysklogd: add license --- pkgs/os-specific/linux/sysklogd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index c8378f2a0cbc..f93e9012e05d 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; - meta = { + meta = with stdenv.lib; { description = "A system logging daemon"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From e830f2a0e274ab4de9d46e4da89c98460625c004 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:31:24 +0200 Subject: [PATCH 10/15] xf86-video-nested: add license --- pkgs/os-specific/linux/xf86-video-nested/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index c117293d3ad1..f86393cba84d 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = { + meta = with stdenv.lib; { homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + license = licenses.mit; }; } From b9e6b1d1986481bc7bcba0972d723d55cc55e6a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:32:23 +0200 Subject: [PATCH 11/15] adguardhome: add license --- pkgs/servers/adguardhome/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 54000a81b67d..3260ce4f053a 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Network-wide ads & trackers blocking DNS server"; platforms = platforms.linux; maintainers = with maintainers; [ numkem ]; + license = licenses.gpl3; }; } From 0a2a353ad533deaa468957fbc22cbe6a3a64ccee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:34:44 +0200 Subject: [PATCH 12/15] resim: add license --- pkgs/misc/emulators/resim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index 81acdf81f2ec..ba7ac6212576 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -15,4 +15,6 @@ stdenv.mkDerivation { cp -v libresim/libarmsim.so $out/lib/libarmsim.so cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + + meta.license = stdenv.lib.licenses.mit; } From 19d41f90b44206a8e71d1c331d20725cef199471 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:39:52 +0200 Subject: [PATCH 13/15] openmsx: add license --- pkgs/misc/emulators/openmsx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 68b464f4d358..f0ab48aa6258 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = with licenses; [ bsd2 boost gpl2 ]; }; } From 1560a465c30b03c052a51d9ca348065f4bf8add4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:41:19 +0200 Subject: [PATCH 14/15] fcgiwrap: add license --- pkgs/servers/fcgiwrap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index cd4d3116213f..a15e1c15b15b 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; + license = licenses.mit; }; } From 56f4aa7c9d653552a4743196583fdab4460e5a54 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:43:26 +0200 Subject: [PATCH 15/15] hashi-ui: add license --- pkgs/servers/hashi-ui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 019a8dca3b65..70926e37739a 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A modern user interface for hashicorp Consul & Nomad"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ numkem ]; + license = licenses.mit; }; }