From 2ed07fdb2bf30a202a44976d0263d8c44e20b5b3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:42:12 +0200 Subject: [PATCH 01/13] drgeo: add license + homepage --- pkgs/applications/science/geometry/drgeo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 8db1beedebb..e233b91bbc9 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { cp drgeo.desktop.in drgeo.desktop ''; - meta = { + meta = with stdenv.lib; { description = "Interactive geometry program"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/ofset; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 258c202565cae23ad4e6b17670d9ab4313c31090 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:44:43 +0200 Subject: [PATCH 02/13] prooftree: add license --- pkgs/applications/science/logic/prooftree/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 01dfc35f6e0..2d5fcfd2d26 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { shift-click). ''; homepage = http://askra.de/software/prooftree; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = platforms.unix; + maintainers = [ maintainers.jwiegley ]; + license = licenses.gpl3; }; }) From 1cff2dd135ef9d267017cf414dff9e0baf48452d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:48:19 +0200 Subject: [PATCH 03/13] pynac: add license --- pkgs/applications/science/math/pynac/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 1a059aeb167..9bbb695a331 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { of the full GiNaC, and it is *only* meant to be used as a Python library. ''; homepage = http://pynac.org; + license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; }; From 70e254d6bd2100b09bf869137d87640ae27b89fe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:51:28 +0200 Subject: [PATCH 04/13] root: add license --- pkgs/applications/science/misc/root/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index e966e798ae6..2ec1ded68a2 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -67,10 +67,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { homepage = https://root.cern.ch/; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + license = licenses.lgpl21; }; } From c2ff374951cbd743b6189750bbfc616b58b9f1fb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 14:55:41 +0200 Subject: [PATCH 05/13] bazaar: add license --- pkgs/applications/version-management/bazaar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index fea6fb35830..097c1e86a89 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec { --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - meta = { + meta = with stdenv.lib; { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } From 499b7e892713ec104de26cece63bcfac055adc4c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:01:25 +0200 Subject: [PATCH 06/13] bzr-tools: add license --- pkgs/applications/version-management/bazaar/tools.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 0ad3c6079ac..82c87f30b71 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -3,7 +3,7 @@ python2Packages.buildPythonApplication rec { name = "bzr-tools-${version}"; version = "2.6.0"; - + src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; @@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Bazaar plugins"; homepage = http://wiki.bazaar.canonical.com/BzrTools; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 9f29e4c9c7c42085e9e3ed8b9833a02eb1b5380d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:04:33 +0200 Subject: [PATCH 07/13] cvs2svn: add license --- pkgs/applications/version-management/cvs2svn/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 90a9f26045f..5dc0c48b0f7 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { /* !!! maybe we should absolutise the program names in $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */ - meta = { + meta = with stdenv.lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = http://cvs2svn.tigris.org/; - maintainers = [ lib.maintainers.makefu ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.makefu ]; + platforms = platforms.unix; + license = licenses.asl20; }; } From edb1bfcd320e6c0184d4a80951f7c2b5fc702d5f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:07:58 +0200 Subject: [PATCH 08/13] guitone: add license --- pkgs/applications/version-management/guitone/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 88074a0862c..33d2eb89ad0 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; - homepage = http://guitone.thomaskeller.biz; + homepage = https://guitone.thomaskeller.biz; downloadPage = https://code.monotone.ca/p/guitone/; + license = stdenv.lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } From ae795a6acd5923b179f1a30a9f40fb6edd5e1d69 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:12:27 +0200 Subject: [PATCH 09/13] monotone: add license --- .../applications/version-management/monotone/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 4282f48654e..0606c58c09d 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite expect + buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; postInstall = '' @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { #doCheck = true; # some tests fail (and they take VERY long) - meta = { + meta = with stdenv.lib; { description = "A free distributed version control system"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.gpl2; }; } From ffb5eca618071552eb9e88286b3cce222c454a44 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:15:58 +0200 Subject: [PATCH 10/13] vcprompt: add license --- pkgs/applications/version-management/vcprompt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 4afb1b20e32..c2bf0a4183c 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://hg.gerg.ca/vcprompt; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2Plus; }; } From 2be3ed40622e5b8baeb6f6998389be781d43763f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:27:50 +0200 Subject: [PATCH 11/13] tivodecode: add license --- pkgs/applications/video/tivodecode/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index b158bc92460..83ca41e201c 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q"; }; - meta = { + meta = with stdenv.lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = http://tivodecode.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From 6e6e41b56e2fe1b02a2a5c1576ebbfb54b3aed27 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:28:10 +0200 Subject: [PATCH 12/13] xine-ui: add license --- pkgs/applications/video/xine-ui/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 69fc68a69de..4dfc3fd052a 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "xine-ui-0.99.10"; - + src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; }; - + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; configureFlags = [ "--with-readline=${readline.dev}" ]; - + LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; #NIX_LDFLAGS = "-lXext -lgcc_s"; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "Xlib-based interface to Xine, a video player"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From d18bf127350bc6de4b2370d295e09e3ced8bc1bd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 8 Sep 2018 15:28:25 +0200 Subject: [PATCH 13/13] fbpanel: add license --- pkgs/applications/window-managers/fbpanel/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index b521240b48f..0c13691a36a 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.mit; }; passthru = {