From 0d0b4a89884c5dc0afa77871508a2670ade54c2f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:37:33 +0200 Subject: [PATCH 01/13] libuv: add licenses --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e608ea300d1..68c35c49ef3 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/libuv/libuv; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; } From 6f854a2085fbfa41a0ccf28824cc8bee44b3a81c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:40:08 +0200 Subject: [PATCH 02/13] libsigc++: add license --- pkgs/development/libraries/libsigcxx/1.2.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 38e5ffcb4de..fa27a80e22e 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ m4]; - meta = { + meta = with stdenv.lib; { homepage = https://libsigcplusplus.github.io/libsigcplusplus/; description = "A typesafe callback system for standard C++"; branch = "1.2"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl3; }; } From abd029abe70a59a46371f4ee70f2cdee98b0057b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:45:41 +0200 Subject: [PATCH 03/13] libwmf: add license --- pkgs/development/libraries/libwmf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index eed0c77af80..bf685862adf 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { description = "WMF library from wvWare"; - platforms = stdenv.lib.platforms.unix; + homepage = http://wvware.sourceforge.net/libwmf.html; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 81029a99eef591935375c9fae77233898c285da0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:45:54 +0200 Subject: [PATCH 04/13] libwpd: add meta data --- pkgs/development/libraries/libwpd/0.8.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 49012f8bddf..736b1a45fa2 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -2,19 +2,22 @@ stdenv.mkDerivation rec { name = "libwpd-0.8.14"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.gz"; sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; }; - + patches = [ ./gcc-0.8.patch ]; buildInputs = [ glib libgsf libxml2 ]; nativeBuildInputs = [ pkgconfig bzip2 ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for importing WordPerfect documents"; + homepage = http://libwpd.sourceforge.net; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.unix; }; } From 970a1ce522cc7e41f0571dab19ca8dea45823700 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:50:50 +0200 Subject: [PATCH 05/13] libwpg: add licenses --- pkgs/development/libraries/libwpg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 9d262910e14..99808be2b21 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ libwpd zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://libwpg.sourceforge.net; description = "C++ library to parse WPG"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.all; }; } From 3d886991747b9bbb384a16ac988e0d7c78a84113 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:52:33 +0200 Subject: [PATCH 06/13] log4shib: add license + homepage --- pkgs/development/libraries/log4shib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 7b672aebe44..b2fba7df509 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -15,5 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; + license = licenses.lgpl21; + homepage = http://log4cpp.sf.net; }; } From 77b7a63af4d7f4af98ad8cf401059cf1c5bda7d8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:54:07 +0200 Subject: [PATCH 07/13] loudmouth: add license --- pkgs/development/libraries/loudmouth/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index aecd75656da..cad5d0d7eca 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; + license = licenses.lgpl21; }; } From 81342af39db84d87f176790d059f5f64987e32d6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:55:59 +0200 Subject: [PATCH 08/13] martyr: add license --- pkgs/development/libraries/martyr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 3b610271539..064f04f220c 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = http://martyr.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; }; } From a46d0efd031b79d2edfd4749134c56e23a0c8455 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 19:58:06 +0200 Subject: [PATCH 09/13] mdds: add license --- pkgs/development/libraries/mdds/0.12.1.nix | 5 +++-- pkgs/development/libraries/mdds/0.7.1.nix | 5 +++-- pkgs/development/libraries/mdds/default.nix | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 11bd437d377..e1dd7586f92 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix index 8ff1d6d5e9a..2b61668d5c6 100644 --- a/pkgs/development/libraries/mdds/0.7.1.nix +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds/; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 43fee9ccead..3b0a0441cc4 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; - meta = { + meta = with stdenv.lib; { inherit version; homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } From c97276af5977b5b10a7f0af7df72ff781cf25c29 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 20:00:36 +0200 Subject: [PATCH 10/13] mono-addins: add license --- pkgs/development/libraries/mono-addins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 345c6e51f0b..ca72557242f 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { and for creating libraries which extend those applications. ''; platforms = platforms.linux; + license = licenses.mit; }; } From e180966f6b929720f72ccb2a5f91c465451ca3fa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 20:01:58 +0200 Subject: [PATCH 11/13] mono-zeroconf: add license --- pkgs/development/libraries/mono-zeroconf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index d96f90b4bfd..37195d38562 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A cross platform Zero Configuration Networking library for Mono and .NET"; homepage = http://www.mono-project.com/archived/monozeroconf/; platforms = platforms.linux; + license = licenses.mit; }; } From 4b3349b6934f094ceabc97c060a7d404fc7eb0f2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 20:04:29 +0200 Subject: [PATCH 12/13] msilbc: add license + description --- pkgs/development/libraries/msilbc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index cfb02ddbf9d..601e70427a1 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Mediastreamer plugin for the iLBC audio codec"; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 3371821d74182b1d397ce9bbe91a39c7423a8bdb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Oct 2018 20:12:15 +0200 Subject: [PATCH 13/13] mythes: add license --- pkgs/development/libraries/mythes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index dd40a396244..28888e551ef 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hunspell.sourceforge.net/; description = "Thesaurus library from Hunspell project"; + license = stdenv.lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; }