From 19d1cafb9e1bcddeae3cd8839cf8ad36d73832a7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:34:08 +0200 Subject: [PATCH 01/20] neon: add license --- pkgs/development/libraries/neon/0.29.nix | 5 +++-- pkgs/development/libraries/neon/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index d0f992efb2bc..87f9b5effacd 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 7aad5be36f70..61a40753a56f 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } From 46a495ac75c29b072d85a921aeb03b081ac841be Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:41:35 +0200 Subject: [PATCH 02/20] netcdf: add url to license --- pkgs/development/libraries/netcdf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911c..0c597fc4b335 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -43,5 +43,8 @@ in stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; homepage = https://www.unidata.ucar.edu/software/netcdf/; + license = { + url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + }; }; } From e999d40cef10a0b01eddf28484a11ea3529cac80 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:42:49 +0200 Subject: [PATCH 03/20] notify-sharp: add license --- pkgs/development/libraries/notify-sharp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index c7e133d94b23..3c5ae8537a41 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } From 395931cefe43e9d66b10cf0bd0ec04155473ed02 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:44:57 +0200 Subject: [PATCH 04/20] nspr: add license --- pkgs/development/libraries/nspr/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9cb7d701b9da..cdbd57d785f8 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mpl20; }; } From b21b369c6da50d1b02e90c031b2c0a6a42322ac6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:46:20 +0200 Subject: [PATCH 05/20] ntrack: add license --- pkgs/development/libraries/ntrack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 44c8f51e856a..25e084bfb74a 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = { + meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; }; } From 8e7f191c27d5261c3822678558a3bf5507d7db31 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:50:01 +0200 Subject: [PATCH 06/20] ode: add licenes --- pkgs/development/libraries/ode/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b67288296606..aa1886508609 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = { + meta = with stdenv.lib; { description = "Open Dynamics Engine"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/opende; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; } From d9e6d6ac33252ac01220159b477051ca6ff6ab62 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:54:43 +0200 Subject: [PATCH 07/20] opal: add licenes --- pkgs/development/libraries/opal/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d120976..1658e831ddd1 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; + propagatedBuildInputs = [ speex ]; configureFlags = [ "--enable-h323" ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - + meta = with stdenv.lib; { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; passthru = { From 8ff5a85c453c6463f914520b55fda5184885a8c6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:56:50 +0200 Subject: [PATCH 08/20] opencascade: add license --- pkgs/development/libraries/opencascade/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cefd..4a12217443c5 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } From 4afe65f253d1b5abcb3867a3fae6cde1f6710c12 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 21:58:46 +0200 Subject: [PATCH 09/20] opencsg: add license --- pkgs/development/libraries/opencsg/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 2724976c5ae8..e0a6c6a5705e 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { cp license.txt "$out/share/doc/opencsg" ''; - meta = { + meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } From 2d4b7f26e1f7888fb53425e4ce574345b2730bd7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:06:24 +0200 Subject: [PATCH 10/20] opendbx: add meta data --- pkgs/development/libraries/opendbx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507d..f954aaf72457 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline mysql.connector-c postgresql sqlite ]; + + meta = with stdenv.lib; { + description = "Extremely lightweight but extensible database access library written in C"; + license = licenses.lgpl21; + platforms = platforms.all; + }; } From 165f090e10e5c388cf0985034703996ef8dc3dfb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:07:31 +0200 Subject: [PATCH 11/20] openpam: add license --- pkgs/development/libraries/openpam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 7d84392d204a..339f60649997 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; - meta = { + meta = with lib; { homepage = https://www.openpam.org; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; }; } From 598ed197db923a39be6ac80d6b0cf17fc1eea71e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:09:50 +0200 Subject: [PATCH 12/20] openssl-chacha: add license --- pkgs/development/libraries/openssl/chacha.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb9817..973f83042737 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; + license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; } From d00487cad5c9ec08374f91848c4485bfae86b01a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:12:57 +0200 Subject: [PATCH 13/20] pangoxsl: add meta data --- pkgs/development/libraries/pangoxsl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688a..b69ded648397 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { pango ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + homepage = https://sourceforge.net/projects/pangopdf; + platforms = platforms.unix; + license = licenses.lgpl2; }; } From 0badfc2b6ec8d9d9d8c0dae594c523d765ecd896 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:16:40 +0200 Subject: [PATCH 14/20] phonon-backend-gstreamer: add license --- pkgs/development/libraries/phonon/backends/gstreamer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d02..67f343d60380 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; }; src = fetchurl { From 78b12734eed5d2aed12dce2a53bbdeda3019d3a4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:19:19 +0200 Subject: [PATCH 15/20] phonon-backend-vlc: add license --- pkgs/development/libraries/phonon/backends/vlc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 0487886a8966..773478f4dc03 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; }; src = fetchurl { From 91eea7482dfe6318a2037fada9ad28b77deaaa36 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:22:03 +0200 Subject: [PATCH 16/20] podofo: add licenses --- pkgs/development/libraries/podofo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index acf531390226..1704703f8012 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = with licenses; [ gpl2 lgpl2 ]; }; } From 6ff2c83d9f9f4d3bb7b422df7869b614ccf90226 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:23:38 +0200 Subject: [PATCH 17/20] polkit-qt-1: add license --- pkgs/development/libraries/polkit-qt-1/qt-4.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 54e10b965926..b13335561ac0 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } From f1fe677ab2b626d485253fea165bc9fe32330633 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:26:53 +0200 Subject: [PATCH 18/20] popt: add license --- pkgs/development/libraries/popt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f0699..592a1f1470a4 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "Command line option parsing library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } From 5383753beb44ada12ee19ea627d216f71b7687bf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:28:10 +0200 Subject: [PATCH 19/20] prison: add license --- pkgs/development/libraries/prison/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a2266..d40b4442e38e 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; inherit (qt4.meta) platforms; }; } From 1f46779eda4a2f55ab3171b55fc151fcd9cc6b95 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Oct 2018 22:30:34 +0200 Subject: [PATCH 20/20] ptlib: add licenses --- pkgs/development/libraries/ptlib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ae60a6f69d63..d425de243f50 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ beerware bsdOriginal mpl10 ]; }; passthru = {