From fde1b2efe2658d949aee0690643791cc93c543ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:21:58 +0200 Subject: [PATCH 01/10] atop: add license --- pkgs/os-specific/linux/atop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 7b4ac9e1f3b..739342b77fd 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -33,15 +33,16 @@ stdenv.mkDerivation rec { make systemdinstall $makeFlags ''; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; description = ''Console system performance monitor''; longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; + license = licenses.gpl2; downloadPage = http://atoptool.nl/downloadatop.php; }; } From 1f3b568a6c3c91b8e285792ca906c0a148dae388 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:24:42 +0200 Subject: [PATCH 02/10] bc: add license --- pkgs/tools/misc/bc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 52bd28e9748..ea8cefd14d3 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,6 @@ -{stdenv, autoreconfHook, buildPackages, fetchurl, flex, readline, ed, texinfo}: +{ stdenv, autoreconfHook, buildPackages +, fetchurl, flex, readline, ed, texinfo +}: stdenv.mkDerivation rec { name = "bc-1.07.1"; @@ -31,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; homepage = http://www.gnu.org/software/bc/; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } From 17702d0416765ddafac24598da5a0d40734b69d8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:36:36 +0200 Subject: [PATCH 03/10] curl: add license --- lib/licenses.nix | 5 +++++ pkgs/tools/networking/curl/7_59.nix | 1 + pkgs/tools/networking/curl/default.nix | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1ec0e5149c9..a5f1fc0f0f2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -210,6 +210,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + curl = { + fullName = "MIT/X11 derivate"; + url = "https://curl.haxx.se/docs/copyright.html"; + }; + doc = spdx { spdxId = "DOC"; fullName = "DOC License"; diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix index 71a87a8e9d1..0482bcf5262 100644 --- a/pkgs/tools/networking/curl/7_59.nix +++ b/pkgs/tools/networking/curl/7_59.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { description = "A command line tool for transferring files with URL syntax"; homepage = https://curl.haxx.se/; maintainers = with maintainers; [ lovek323 ]; + license = licenses.curl; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d15e6084a8b..d42cdcd4a34 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { description = "A command line tool for transferring files with URL syntax"; homepage = https://curl.haxx.se/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; + license = licenses.curl; + platforms = platforms.all; }; } From d15421f451316882e858920550cc8a7451a69137 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:44:29 +0200 Subject: [PATCH 04/10] cvs: add license --- pkgs/applications/version-management/cvs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 71fb7612b33..2063149dd78 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests - meta = { + meta = with stdenv.lib; { homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; # library is GPLv2, main is GPLv1 + platforms = platforms.all; }; } From 75e8dfeafa40d5d2892b5b1b83f11d5262994cd0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:46:53 +0200 Subject: [PATCH 05/10] diffutils: add licenses --- pkgs/tools/text/diffutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 60628e2139c..fff81fbc860 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; } From f9a1aef084ab146ce162a0004e249d3c26612f94 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:51:07 +0200 Subject: [PATCH 06/10] flex: add license --- pkgs/development/tools/parsing/flex/2.5.35.nix | 5 +++-- pkgs/development/tools/parsing/flex/2.6.1.nix | 5 +++-- pkgs/development/tools/parsing/flex/default.nix | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 1062a361413..3e40ddee9d9 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - meta = { + meta = with stdenv.lib; { branch = "2.5.35"; homepage = http://flex.sourceforge.net/; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 954c2bbcb24..81685b6ee66 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace "tests" " "; ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 17323a06cc1..2a91baa80b3 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } From e59f8fa490a5e3716dc7743a0276191758467a74 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 21:55:12 +0200 Subject: [PATCH 07/10] fortune: add license --- pkgs/tools/misc/fortune/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 59c0396eebe..8e955733598 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation { rmdir $out/games ''; - meta = { + meta = with stdenv.lib; { description = "A program that displays a pseudorandom message from a database of quotations"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsdOriginal; + platforms = platforms.unix; }; } From f1c0b5e498f0d9b78c384cd7082d15f26d848e55 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:04:31 +0200 Subject: [PATCH 08/10] grub-0.97: add license --- pkgs/tools/misc/grub/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index bb565bacfe7..6ba931ad80d 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation { passthru.grubTarget = ""; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.linux; }; } From 698600d9a1a3a8577d8b4fd08c45a4109a4986d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:05:13 +0200 Subject: [PATCH 09/10] iotop: add license --- pkgs/os-specific/linux/iotop/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a19b3d4ec16..e2ded7a8fd0 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -10,9 +10,11 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A tool to find out the processes doing the most IO"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://guichaz.free.fr/iotop; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } From 81fcce75668deb5314b67e6dfb20e229826447fe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Aug 2018 22:12:21 +0200 Subject: [PATCH 10/10] less: add license --- pkgs/tools/misc/less/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 57eeb39f543..c961ea938ba 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.eelco ]; }; }