From b868f24475e26cce6edd73c280a8651a75043484 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 22:58:39 +0100 Subject: [PATCH 01/11] samba3: add license --- pkgs/servers/samba/3.x.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 4d9fc46dcf7..1f432c18988 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -87,10 +87,11 @@ stdenv.mkDerivation rec { '' # */ + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - meta = { + meta = with stdenv.lib; { homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl3; knownVulnerabilities = [ "Numerous CVEs and no patches from upstream for 3.x since 2014." ]; From b9c5598b3cfdd99e4da7c35970d9cbab49141eb1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:10:06 +0100 Subject: [PATCH 02/11] mysql: add licenses --- pkgs/servers/sql/mysql/5.5.x.nix | 9 +++++++-- pkgs/servers/sql/mysql/5.7.x.nix | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 15f82a90208..36f5200d43b 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -69,9 +69,14 @@ self = stdenv.mkDerivation rec { mysqlVersion = "5.5"; }; - meta = { + meta = with stdenv.lib; { homepage = https://www.mysql.com/; description = "The world's most popular open source database"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + # See https://downloads.mysql.com/docs/licenses/mysqld-5.5-gpl-en.pdf + license = with licenses; [ + artistic1 bsd0 bsd2 bsd3 bsdOriginal + gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib + ]; }; }; in self diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index b5912dd9ab9..51fca399759 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -75,9 +75,13 @@ self = stdenv.mkDerivation rec { mysqlVersion = "5.7"; }; - meta = { + meta = with stdenv.lib; { homepage = https://www.mysql.com/; description = "The world's most popular open source database"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ + artistic1 bsd0 bsd2 bsd3 bsdOriginal + gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib + ]; }; }; in self From 41c619a191e5872b5a3aa570cc28a532befd02e8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:12:06 +0100 Subject: [PATCH 03/11] pgtap: add license --- pkgs/servers/sql/postgresql/pgtap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index 2f37d3a85d3..6386049be39 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ willibutz ]; homepage = https://pgtap.org; inherit (postgresql.meta) platforms; + license = licenses.mit; }; } From 7d279b4780e0e6e6a889374b712795e73f8cd10e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:14:09 +0100 Subject: [PATCH 04/11] virtuoso-opensource: add license --- pkgs/servers/sql/virtuoso/6.x.nix | 2 +- pkgs/servers/sql/virtuoso/7.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index eda1f060df2..0daf7533a60 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; platforms = platforms.linux; - maintainers = [ ]; + license = licenses.gpl2; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 536e96354d9..17ec49d1613 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; - maintainers = [ ]; + license = licenses.gpl2; }; } From d76c2756051dc90e4e9e302f3a1275fda6b49cca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:20:04 +0100 Subject: [PATCH 05/11] pyIRCt,pyMAILt: add license --- pkgs/servers/xmpp/pyIRCt/default.nix | 5 +++-- pkgs/servers/xmpp/pyMAILt/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index ebdc73aec30..535fb061de9 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with stdenv.lib; { description = "IRC transport module for XMPP"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index aeed7484f82..b1c4d93f687 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with stdenv.lib; { description = "Email transport module for XMPP"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From a6b854c9a23b746f1ca5d3a81844a0ef3f60c315 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:24:09 +0100 Subject: [PATCH 06/11] dash: add licenses --- pkgs/shells/dash/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 2db8edd5e0c..f8d592748b3 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = http://gondor.apana.org.au/~herbert/dash/; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ bsd3 gpl2 ]; }; passthru = { From 89d0ad5c8507f47604b6d7189e65aff09ed85f6e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:26:22 +0100 Subject: [PATCH 07/11] obex-data-server: add license --- pkgs/tools/bluetooth/obex-data-server/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 5c272e3dbaf..5c8f65ae514 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; - meta = { + meta = with stdenv.lib; { homepage = http://wiki.muiline.com/obex-data-server; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 932861cacbb326fad7bc63eb629d247f07c1da83 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:30:55 +0100 Subject: [PATCH 08/11] obexd: add licenese --- pkgs/tools/bluetooth/obexd/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 4d872c3d9ac..0771505b726 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: - + stdenv.mkDerivation rec { name = "obexd-0.48"; - + src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2"; sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.bluez.org/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl3; }; } From d190d8af0c9c06508e3a9085dbc048a5c61555ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:37:54 +0100 Subject: [PATCH 09/11] lkproof: add license --- pkgs/tools/typesetting/tex/lkproof/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 844eadc4440..db0ec6d9bea 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { name = "lkproof-3.1"; - + src = fetchurl { url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip; sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; - + buildInputs = [ unzip ]; installPhase = " @@ -15,7 +15,8 @@ stdenv.mkDerivation { cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof "; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl1Plus; }; } From d458a1869f0f13ea978fbe1534dbc6416f043949 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:40:09 +0100 Subject: [PATCH 10/11] pgfplots: add meta data --- pkgs/tools/typesetting/tex/pgfplots/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index 2fe3daee699..fcdebedb7d8 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "TeX package to draw plots directly in TeX in two and three dimensions"; + homepage = http://pgfplots.sourceforge.net; + platforms = platforms.unix; + license = licenses.gpl3Plus; }; } From 142717e3ab16f7c822980333474c398fb6ee1060 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 14 Nov 2018 23:42:23 +0100 Subject: [PATCH 11/11] pgf: add license --- pkgs/tools/typesetting/tex/pgf/1.x.nix | 5 +++-- pkgs/tools/typesetting/tex/pgf/2.x.nix | 5 +++-- pkgs/tools/typesetting/tex/pgf/3.x.nix | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index de5ef2abccf..9215a1e0ac4 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = { + meta = with stdenv.lib; { branch = "1"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index cb8d2dbdf48..56e50e44408 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = { + meta = with stdenv.lib; { branch = "2"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 28225ebf28a..0835c7c547d 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -24,8 +24,9 @@ stdenv.mkDerivation { cp -prd * $out/share/texmf-nix "; - meta = { + meta = with stdenv.lib; { branch = "3"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; }