From 4ea5a9161f5cf0dae3710b70da33e191337bde80 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:17:41 +0200 Subject: [PATCH 1/9] cppunit: add license --- pkgs/development/libraries/cppunit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 0690bd425aec..3f8b2d896ac6 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; - meta = { + meta = with stdenv.lib; { homepage = https://freedesktop.org/wiki/Software/cppunit/; description = "C++ unit testing framework"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.lgpl21; + platforms = platforms.linux ++ platforms.darwin; }; } From 2c2d02fce57ee5ecd220ca103cdad86f371c202e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:17:54 +0200 Subject: [PATCH 2/9] cracklib: add license --- pkgs/development/libraries/cracklib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index aa8b4231a869..b75f03fab7c7 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; + license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; From 546bbb69488461dfc7124295d26b2c850d889277 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:18:55 +0200 Subject: [PATCH 3/9] cpufrequtils: add license + homepage --- pkgs/os-specific/linux/cpufrequtils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index e36aaa5e38d0..04da31176da2 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ]; - meta = { + meta = with stdenv.lib; { description = "Tools to display or change the CPU governor settings"; - platforms = stdenv.lib.platforms.linux; + homepage = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html; + license = licenses.gpl2; + platforms = platforms.linux; }; } From de5b6b2bfe6043c9d552d064e0498b01c036a93a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:19:36 +0200 Subject: [PATCH 4/9] cramfsswap: add licenses + meta data --- pkgs/os-specific/linux/cramfsswap/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 6f11a3bb7a72..d183bb25cb56 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [zlib]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "swap endianess of a cram filesystem (cramfs)"; + homepage = "https://packages.debian.org/sid/utils/cramfsswap"; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 8c6dc9def7705c58df9e5463a16888b854a3c6cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:20:08 +0200 Subject: [PATCH 5/9] cpio: add license --- pkgs/tools/archivers/cpio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 2313f27f2e54..c38dc7bbfbe7 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -31,10 +31,11 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3; + platforms = platforms.all; priority = 6; # resolves collision with gnutar's "libexec/rmt" }; } From 47e8f3b137e03dfdd43885913a944cab664ea1ee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:20:43 +0200 Subject: [PATCH 6/9] cromfs: add license --- pkgs/tools/archivers/cromfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 68f7f02e7413..57a8a8e97380 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse perl ]; - meta = { + meta = with stdenv.lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = https://bisqwit.iki.fi/source/cromfs.html; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } From c1801f612cf1a361ed3503137a701847b6c6c003 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:21:16 +0200 Subject: [PATCH 7/9] cowsay: add license --- pkgs/tools/misc/cowsay/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 0a7b079445d5..bb874dd002a7 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation { bash ./install.sh $out ''; - meta = { + meta = with stdenv.lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = http://www.nog.net/~tony/warez/cowsay.shtml; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rob ]; + homepage = https://en.wikipedia.org/wiki/Cowsay; + license = licenses.gpl1; + platforms = platforms.all; + maintainers = [ maintainers.rob ]; }; } From 8fa1389402aa994af545577dfaa2a8c1969dadc0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:24:49 +0200 Subject: [PATCH 8/9] cron: add license --- pkgs/tools/system/cron/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index d6347798053b..374f0ac19d89 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { hardeningEnable = [ "pie" ]; preBuild = '' - # do not set sticky bit in /nix/store + # do not set sticky bit in /nix/store substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755 # do not strip during install, broken on cross and we'll do ourselves as needed substituteInPlace Makefile --replace ' -s cron' ' cron' @@ -36,8 +36,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; - meta = { + meta = with stdenv.lib; { description = "Daemon for running commands at specific times (Vixie Cron)"; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.bsd0; + platforms = with platforms; linux ++ darwin; }; } From 5c395d5095ed9f04fffdbda5da74c5867350e540 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Aug 2018 20:25:03 +0200 Subject: [PATCH 9/9] cri-tools: add license --- pkgs/tools/virtualization/cri-tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 120727f3873d..f57befce3081 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchurl }: +{ buildGoPackage, fetchurl, lib }: buildGoPackage { name = "cri-tools-1.0.0-alpha.0"; @@ -10,6 +10,10 @@ buildGoPackage goPackagePath = "github.com/kubernetes-incubator/cri-tools"; subPackages = [ "cmd/crictl" "cmd/critest" ]; + meta = { + license = lib.licenses.asl20; + }; + goDeps = ./deps.nix; }