From 804e86c00439b17bcae00f2041ece0b527df567a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:48:47 +0200 Subject: [PATCH 01/23] libjson: add license + refactor longDescription --- pkgs/development/libraries/libjson/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index a53918fd5f77..c83143dd6b13 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -11,10 +11,17 @@ in stdenv.mkDerivation rec { buildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = { + + meta = with stdenv.lib; { homepage = http://libjson.sourceforge.net/; description = "A JSON reader and writer"; - longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; - platforms = stdenv.lib.platforms.unix; + longDescription = '' + A JSON reader and writer which is super-efficient and + usually runs circles around other JSON libraries. + It's highly customizable to optimize for your particular project, and + very lightweight. For Windows, OSX, or Linux. Works in any language. + ''; + platforms = platforms.unix; + license = licenses.bsd2; }; } From 53194bf4f2a2f195320869eae1b1364847e2db4e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:49:56 +0200 Subject: [PATCH 02/23] libkate: add license --- pkgs/development/libraries/libkate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 6c7e5881a784..7eff302397aa 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = { + meta = with stdenv.lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = https://code.google.com/archive/p/libkate/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From 014c5c4b67f27350012ebbf6840a813f47cde830 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:51:13 +0200 Subject: [PATCH 03/23] liblastfm: add license --- pkgs/development/libraries/liblastfm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 331422dd8929..b7d90100837c 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; + maintainers = [ maintainers.phreedom ]; + license = licenses.gpl3; }; } From beabd0bb65aaea50cc9a48d6fc232d32989eab1c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:53:07 +0200 Subject: [PATCH 04/23] liblastfm-SF: add licenses --- pkgs/development/libraries/liblastfmSF/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 73d996c5ec86..d9f460d44e8c 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liblastfm.sourceforge.net; description = "Unofficial C lastfm library"; + license = stdenv.lib.licenses.gpl3; }; } From b1800e3c18ed89afcb7be869fb4c355a04075005 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:54:39 +0200 Subject: [PATCH 05/23] liblqr: add licenses --- pkgs/development/libraries/liblqr-1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 4b445c93175f..aa6922ea3421 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ ]; + license = with licenses; [ gpl3 lgpl3 ]; }; } From f5b9a9455ff68fb60a5b3ac64526d132005ca7a4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:00:17 +0200 Subject: [PATCH 06/23] libmilter: add license --- lib/licenses.nix | 5 +++++ pkgs/development/libraries/libmilter/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index c370af346791..611e6ddb35b7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -585,6 +585,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Ruby License"; }; + sendmail = spdx { + spdxId = "Sendmail"; + fullName = "Sendmail License"; + }; + sgi-b-20 = spdx { spdxId = "SGI-B-2.0"; fullName = "SGI Free Software License B v2.0"; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index bd0cd9fe9041..7e3c45634d9e 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "Sendmail Milter mail filtering API library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.sendmail; }; } From b8253570a168997fce8d905642f4c87b642176ad Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:03:23 +0200 Subject: [PATCH 07/23] libmms: add license + description --- pkgs/development/libraries/libmms/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index d1dd7860de4e..7f73fb09cd16 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { + description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; homepage = http://libmms.sourceforge.net; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } From 21a518cd3561e1b0ca735b2cc5e6d372fa828451 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:05:05 +0200 Subject: [PATCH 08/23] libmp3splt: add license --- pkgs/development/libraries/libmp3splt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index af8297e98549..52072000115c 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; + license = licenses.gpl2; }; } From 07b14d21ecfeadd5193551f75b0af8bafce4e6fd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:06:37 +0200 Subject: [PATCH 09/23] libmtp: add license --- pkgs/development/libraries/libmtp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index c3061626a6ae..1d8dd7e20f14 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; - meta = { + meta = with stdenv.lib; { homepage = http://libmtp.sourceforge.net; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From 2f28a5bccba809738a3ca775107cf35c563b07ff Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:09:34 +0200 Subject: [PATCH 10/23] libmusicbrainz: add license --- pkgs/development/libraries/libmusicbrainz/5.x.nix | 6 +++--- pkgs/development/libraries/libmusicbrainz/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index f197d5bcef98..2b59adf8f922 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 596399c4fa8f..5335b6577f0a 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } From 2ebc15f208a5f806b4c1d279a9a00ac7f12c17c9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:11:49 +0200 Subject: [PATCH 11/23] libnatspec: add license --- pkgs/development/libraries/libnatspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 9b692e9e3b2e..db4f6f5d4688 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; - meta = { + meta = with stdenv.lib; { homepage = http://natspec.sourceforge.net/ ; description = "A library intended to smooth national specificities in using of programs"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; From 4e6d420d915478cb71d1307ee30b2f63a87dc61d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:13:21 +0200 Subject: [PATCH 12/23] libnetfilter_queue: add license --- pkgs/development/libraries/libnetfilter_queue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 12a45d088ef6..94b3dc90a0b6 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmnl libnfnetlink ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.netfilter.org/projects/libnetfilter_queue/; description = "Userspace API to packets queued by the kernel packet filter"; - - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From e7411d6eb5a4ffa9da3db6c96fc72a83eca083b3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:15:37 +0200 Subject: [PATCH 13/23] libnice: add licenses --- pkgs/development/libraries/libnice/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 1f58545574cd..8582dc4e1d90 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory" - meta = { + meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ lgpl21 mpl11 ]; }; } From 4877761ab8c3c2920895da814266dfbc1565dd1e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:17:47 +0200 Subject: [PATCH 14/23] libnotify: add license --- pkgs/development/libraries/libnotify/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index fbde49a54d08..11f2731eb725 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ]; buildInputs = [ glib gdk_pixbuf ]; - meta = { + meta = with stdenv.lib; { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From cee94fd5f28f5d8ec0d118ef808eeec8d3ad12f6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:19:20 +0200 Subject: [PATCH 15/23] libnova: add license --- pkgs/development/libraries/libnova/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index a66a1a88c743..cb70d803ac0c 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "libnova-0.12.3"; - + src = fetchurl { url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; }; - - meta = { + + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = http://libnova.sf.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 4520ced68f13cb1cfe2c3a0aa7ddb1c44f841f31 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:23:39 +0200 Subject: [PATCH 16/23] liboauth: add license --- pkgs/development/libraries/liboauth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 855d921206e9..ea792b007bae 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "C library implementing the OAuth secure authentication protocol"; homepage = http://liboauth.sourceforge.net/; repositories.git = https://github.com/x42/liboauth.git; + license = licenses.mit; }; } From 4d291d5a77d4717171fdd67ec6b97b7a2c3930da Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:26:36 +0200 Subject: [PATCH 17/23] libofa: add license --- pkgs/development/libraries/libofa/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 531e30ba7552..8131420cfd65 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/archive/p/musicip-libofa/; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 4009fa08d11add1b50730c679b1733701802c354 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:27:58 +0200 Subject: [PATCH 18/23] liboggz: add license --- pkgs/development/libraries/liboggz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index f6fe9ecd03a0..d7c3b747924a 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://xiph.org/oggz/; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From a504cfa19069465491793aa3a5146410627d70b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:33:10 +0200 Subject: [PATCH 19/23] libpcap: add license --- pkgs/development/libraries/libpcap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f94f327ea02e..267859cb217c 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.bsd3; }; } From 0d12ce52e4117766681640c5bfab811ba3724b43 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:38:37 +0200 Subject: [PATCH 20/23] redland: add license + description --- pkgs/development/libraries/librdf/redland.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 422ace462a94..30d8d8a94e9d 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 17 tests with a segmentation fault - meta = { + meta = with stdenv.lib; { + description = "C libraries that provide support for the Resource Description Framework (RDF)"; homepage = http://librdf.org/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.asl20; }; } From 3bd7ada09960d86c6a765ea657394942088e5631 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:47:12 +0200 Subject: [PATCH 21/23] libdbusmenu-qt: fix license --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 501341d202ba..72c3ca0e2b05 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; inherit (qt4.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index e8651de2b346..60572e7676b2 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } From 4e6d2f8ec9547bd92b289dbc2ed03beb820d5bef Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:53:46 +0200 Subject: [PATCH 22/23] libgnome-keyring: fix license --- pkgs/development/libraries/libgnome-keyring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 0b496ff593b3..8dcbab95e976 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { inherit (glib.meta) platforms maintainers; - license = stdenv.lib.licenses.gpl2; + license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; }; } From 96b77d8d4d34972b54ffdfea83913c06f47cc00c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:56:33 +0200 Subject: [PATCH 23/23] libite: fix license --- pkgs/development/libraries/libite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 1616aa1e0cc1..0b00cf90ba00 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; - license = with licenses; [ mit isc ]; + license = with licenses; [ mit isc bsd2 bsd3 ]; }; }