From e86c84d607a9a1ada80f06d1d0b69ab52ad91e74 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:10:34 +0200 Subject: [PATCH 1/9] boringssl: add licenses --- pkgs/development/libraries/boringssl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index ff48ffe67f0a..9d65fb554ffe 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { mv ../include/openssl $out/include ''; - meta = { + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = platforms.all; + maintainers = [ maintainers.thoughtpolice ]; + license = with licenses; [ openssl isc mit bsd3 ]; }; } From e978d7a9f2a2f65cab54fc321df598ae0c845577 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:15:47 +0200 Subject: [PATCH 2/9] cln: add license --- pkgs/development/libraries/cln/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index e39386dca3f4..7764e9c67ed2 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - meta = { + meta = with stdenv.lib; { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + license = licenses.gpl2; + platforms = platforms.unix; # Once had cygwin problems }; } From c964f4fc26288b57a09c638b0ed6508c0a50e35d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:19:50 +0200 Subject: [PATCH 3/9] clucene: add license --- pkgs/development/libraries/clucene-core/2.x.nix | 5 +++-- pkgs/development/libraries/clucene-core/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 0db253bbec26..a14dec370479 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test" - meta = { + meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ asl20 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index b65e794a92aa..8451b0853729 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - meta = { + meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ asl20 lgpl2 ]; }; } From 796a2584d5b10508672aa1f642841564db5304e6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:22:23 +0200 Subject: [PATCH 4/9] cmark: add license --- pkgs/development/libraries/cmark/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 81df7e863193..fce02dac950f 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/jgm/cmark; maintainers = [ maintainers.michelk ]; platforms = platforms.unix; + license = licenses.bsd2; }; } From a2046daebd6c7c4d1b38c1c31f557b44114dd507 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:26:18 +0200 Subject: [PATCH 5/9] cogl: add licenses --- pkgs/development/libraries/cogl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index c624f9537fb3..085bab6475c2 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec { render without stepping on each other's toes. ''; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = platforms.mesaPlatforms; + license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ]; }; } From b271fe23110c54648c0e07816539358be634a397 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:27:21 +0200 Subject: [PATCH 6/9] ctpl: add license --- pkgs/development/libraries/ctpl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index d50aca1679b8..fd81de5139d6 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Template engine library written in C"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; + license = licenses.gpl3Plus; }; } From 4faaba0186a87b450b18c9c946bb24456b0dc654 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:29:36 +0200 Subject: [PATCH 7/9] ctpp2: add license --- pkgs/development/libraries/ctpp2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 55835cdb63db..5a2a53ef24d5 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; - maintainers = with stdenv.lib.maintainers; [ robbinch ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.robbinch ]; + platforms = platforms.linux; + license = licenses.bsd2; }; } From 63a91653326751964e99b340da006d74981c8713 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:33:34 +0200 Subject: [PATCH 8/9] cyrus-sasl: add license --- pkgs/development/libraries/cyrus-sasl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 7a9e3991aadb..87752867c350 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = http://cyrusimap.web.cmu.edu/; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; + license = licenses.bsdOriginal; }; } From 70087c5cfb0db3cd85977bbceb2295d1cd5ff9d0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 30 Sep 2018 11:02:17 +0200 Subject: [PATCH 9/9] apr: add license --- pkgs/development/libraries/apr-util/default.nix | 7 ++++--- pkgs/development/libraries/apr/default.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 4e2de01e9adb..fe159afe6854 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { inherit sslSupport bdbSupport ldapSupport; }; - meta = { + meta = with stdenv.lib; { homepage = http://apr.apache.org/; description = "A companion library to APR, the Apache Portable Runtime"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.eelco ]; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 8c31c89947cd..ea84609868cf 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; platforms = platforms.all; + license = licenses.asl20; maintainers = [ maintainers.eelco ]; }; }