From b97ea32ff07d38ef41dd8962fbf681adfcb614ee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:40:22 +0200 Subject: [PATCH 1/9] batik: add meta data --- pkgs/applications/graphics/batik/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index a27590ccd4da25..4032e2e3fee358 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [unzip]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java based toolkit for handling SVG"; + homepage = https://xmlgraphics.apache.org/batik; + license = licenses.asl20; + platforms = platforms.unix; }; } From b76029d568c8cba5ece45bd05be2197e612a45c6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:42:05 +0200 Subject: [PATCH 2/9] dia: add license --- pkgs/applications/graphics/dia/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 4780c823697a88..a1f26f7bc09f4c 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 4cee9af6093d0d10ed20be920551814604cc29e2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:47:20 +0200 Subject: [PATCH 3/9] gqview: add license --- pkgs/applications/graphics/gqview/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index a892f98ac4753e..75140bd005d56e 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "A fast image viewer"; homepage = http://gqview.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; }; } From 74a12299dd7601f92f845ad3159ac7673f98cbbf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:51:23 +0200 Subject: [PATCH 4/9] imagemagick: add license --- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 86aafa9697df82..c4afd6b3bed3cf 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; maintainers = with maintainers; [ the-kenny wkennington ]; }; } From 7a052946396f95190317cf19fe4fe2d1c17c1689 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:55:25 +0200 Subject: [PATCH 5/9] photivo: add license --- pkgs/applications/graphics/photivo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 73bbd5003bd883..4843898eb645a6 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.gpl3; }; } From c365453fed32b553aa1eba8f6a8023a2dcb2c41a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 Aug 2018 23:58:11 +0200 Subject: [PATCH 6/9] qiv: add license --- pkgs/applications/graphics/qiv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 02f5f33f6e6b6d..8e6058d699803a 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation (rec { substituteInPlace Makefile --replace /man/ /share/man/ ''; - meta = { + meta = with stdenv.lib; { description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; }) From a58466596f508b34d7feaa919a8511734608817e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 00:01:38 +0200 Subject: [PATCH 7/9] flac: add license --- pkgs/applications/audio/flac/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 99aedae19124bd..fb5390cb46effd 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = [ ]; + license = licenses.bsd3; }; } From 2acd90106243c14a4d920d93d37ec7d4d871be67 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 00:04:35 +0200 Subject: [PATCH 8/9] cdparanoia: add licenses --- pkgs/applications/audio/cdparanoia/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 96330d4e955719..c419d141d1baae 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { cp ${gnu-config}/config.guess configure.guess ''; - meta = { + meta = with stdenv.lib; { homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; - platforms = stdenv.lib.platforms.unix; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.unix; }; } From 2025bd892e13107669e5bb90298501155de2f302 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 Aug 2018 11:57:07 +0200 Subject: [PATCH 9/9] epeg: add license --- pkgs/applications/graphics/epeg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index ef694dec6527fa..3645cc565728eb 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { homepage = https://github.com/mattes/epeg; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; + license = { + url = "https://github.com/mattes/epeg#license"; + }; maintainers = with maintainers; [ nh2 ]; }; }