From 363c9930d70f61f12d145c060419a6f517753b9a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 14:54:53 +0200 Subject: [PATCH 01/19] qjson: add meta data --- pkgs/development/libraries/qjson/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 29202396c05..a7077c69dd8 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; - meta = { - maintainers = [ ]; + meta = with stdenv.lib; { + description = "Lightweight data-interchange format"; + homepage = http://qjson.sourceforge.net/; + license = licenses.lgpl21; inherit (qt4.meta) platforms; }; } From 4dc8e779f6ed204f1dfcd8f4eba3d73591fc8f0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 14:56:07 +0200 Subject: [PATCH 02/19] qoauth: add licenes --- pkgs/development/libraries/qoauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index d09c0d9a6ce..0d9ae21e87e 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; NIX_LDFLAGS = [ "-lqca-qt5" ]; - meta = { + meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; inherit (qt5.qtbase.meta) platforms; - maintainers = [ ]; + license = licenses.lgpl21; }; } From ef5a7d4eb3e4d5f5dd994ef7437a3050d07f58f2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 14:59:39 +0200 Subject: [PATCH 03/19] qrupdate: add meta data --- pkgs/development/libraries/qrupdate/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index c8b01c46080..85e45d3fad0 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation { buildInputs = [ gfortran openblas ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for fast updating of qr and cholesky decompositions"; + homepage = https://sourceforge.net/projects/qrupdate/; + license = licenses.gpl3; + platforms = platforms.unix; }; } From b8fd2f234c4cb824423a16121b707494d75fbdbb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:02:30 +0200 Subject: [PATCH 04/19] qt-3: add licenses --- pkgs/development/libraries/qt-3/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 0691f26b471..95b82f8f3cf 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation { passthru = {inherit mysqlSupport;}; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = with licenses; [ gpl2 qpl ]; + platforms = platforms.linux; }; } From e91b5eead6413c831a18bc9849d11b2b38a5e228 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:06:47 +0200 Subject: [PATCH 05/19] qt-mobility: add license --- pkgs/development/libraries/qt-mobility/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 5cf49450422..ae99035d226 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 libX11 bluez perl ]; - meta = { + meta = with stdenv.lib; { description = "Qt Mobility"; homepage = http://qt.nokia.com/products/qt-addons/mobility; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; + license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; }; } From b3a1eb18d3b0ab5ec5f952cbf571bac6ea3fd3db Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:23:35 +0200 Subject: [PATCH 06/19] qtscriptgenerator: add license --- pkgs/development/libraries/qtscriptgenerator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 040072cb463..88591e880de 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; inherit (qt4.meta) platforms; - maintainers = [ ]; + license = stdenv.lib.licenses.lgpl21; }; } From a515ac69aef392cbba422c21cd3616d046d76233 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:25:36 +0200 Subject: [PATCH 07/19] readline-5: add license --- pkgs/development/libraries/readline/5.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 9e7c5c1d4e3..84062408d45 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; - meta = { + + meta = with stdenv.lib; { branch = "5"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 070891ce4359003344c6cc33b302c57dea340242 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:27:09 +0200 Subject: [PATCH 08/19] graphite2: add license --- pkgs/development/libraries/silgraphite/graphite2.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index dc3f4a118f6..f795dfef9e4 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { checkInputs = [ python ]; doCheck = false; # fails, probably missing something - meta = { + meta = with stdenv.lib; { description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From f32543dbbca15cb5d4493bf33894ec2471bdc6c5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:29:37 +0200 Subject: [PATCH 09/19] sofia-sip: add meta data --- pkgs/development/libraries/sofia-sip/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 9fe88b771be..ca2ff666b7a 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; + homepage = http://sofia-sip.sourceforge.net/; + platforms = platforms.linux; + license = licenses.lgpl2; }; } From 6ab64b3db8f41c7d90c30929289a414441fe386f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:33:08 +0200 Subject: [PATCH 10/19] t1lib: add meta data --- pkgs/development/libraries/t1lib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 8a76e886b4f..b8e7518cd33 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A type 1 font rasterizer library for UNIX/X11"; + homepage = http://www.t1lib.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.unix; }; } From 0f2d7e51f1a150e8d258752c70c1a0089fa43f86 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:37:35 +0200 Subject: [PATCH 11/19] taglib-extras: add license + description --- pkgs/development/libraries/taglib-extras/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 0059243890d..b667e604740 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Additional taglib plugins"; + platforms = platforms.unix; + license = licenses.lgpl2; }; } From 873b4ed6264ec5c470e36052d8c0a8300cd7e859 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:39:17 +0200 Subject: [PATCH 12/19] taglib-sharp: add license + homepage --- pkgs/development/libraries/taglib-sharp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 6da524c2339..86006806baa 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mono"; repo = "taglib-sharp"; - rev = "taglib-sharp-${version}"; sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; @@ -21,6 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing metadata in media files"; + homepage = https://github.com/mono/taglib-sharp; platforms = platforms.linux; + license = licenses.lgpl21; }; } From ab6cf6c57dcfa565206786896e47e4ef38a5eaf0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:41:45 +0200 Subject: [PATCH 13/19] taglib: add licenses --- pkgs/development/libraries/taglib/1.9.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 1caa8a376fb..99892a41fa4 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; repositories.git = git://github.com/taglib/taglib.git; - description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ ]; + license = with stdenv.lib.licenses; [ lgpl21 mpl11 ]; }; } From 0a2ebb03f4766e051a16c43d435bdbe938a685ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:43:09 +0200 Subject: [PATCH 14/19] tclap: add license --- pkgs/development/libraries/tclap/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index a92c7b74ebf..293baa492c5 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; - meta = { + meta = with stdenv.lib; { homepage = http://tclap.sourceforge.net/; description = "Templatized C++ Command Line Parser Library"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } From 500ea2661feafc4b20843d14e37df223bb26b820 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:45:24 +0200 Subject: [PATCH 15/19] telepathy-farstream: add meta data --- pkgs/development/libraries/telepathy/farstream/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index fae51aea477..1247d9ffa84 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; + homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/; + platforms = platforms.linux; + license = licenses.lgpl21; }; } From 154d5d993be3ddb518517406bc541d60ddba5cf8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:47:40 +0200 Subject: [PATCH 16/19] telepathy-glib: add licenses --- pkgs/development/libraries/telepathy/glib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 9ca2481c3b0..ca6a4997abf 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { passthru.python = python2; - meta = { + meta = with stdenv.lib; { homepage = https://telepathy.freedesktop.org; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; }; } From d513d6115fa6cbe257ba0600dc3601abc5b27b33 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:50:00 +0200 Subject: [PATCH 17/19] tidyp: add license --- pkgs/development/libraries/tidyp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index ba95da77b72..51dabbd2beb 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://tidyp.com/; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; }; } From 9aa4a78b9618561e8b7e5dde3be4b125e84d5e2d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:51:47 +0200 Subject: [PATCH 18/19] xbase: add license --- pkgs/development/libraries/xbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 79f75abfd91..3dd2cb5b874 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { homepage = http://linux.techass.com/projects/xdb/; description = "C++ class library formerly known as XDB"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl2; }; } From f59a7904589f6ee46cedb46e18a3e31af58d06d0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Oct 2018 15:53:47 +0200 Subject: [PATCH 19/19] xine-lib: add licenses --- pkgs/development/libraries/xine-lib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 69b5b95e761..d86dac05073 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "A high-performance, portable and reusable multimedia playback engine"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; }