From 08efbbd13b858ea223a28ed1d24df2048f036a92 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Aug 2018 11:13:29 +0200 Subject: [PATCH 1/5] libzip: add license --- pkgs/development/libraries/libzip/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 131b64c1c7f2d7..76f5d6567dd36c 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; }; } From 2ff7660178b1331c5cfbfd8b247f3f1278fa8e01 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Aug 2018 11:13:44 +0200 Subject: [PATCH 2/5] zlib: add license --- pkgs/development/libraries/zlib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b8537896d791ff..fa6b8fb13b5a3c 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + homepage = https://zlib.net; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; From 0aed6cc5724c18598ac965189dfb0ae2547a202c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Aug 2018 11:13:59 +0200 Subject: [PATCH 3/5] zip: add license --- pkgs/tools/archivers/zip/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b022a..20d85405bbacf5 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = { + meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = [ ]; }; } From 33818a2627bfd783ca273ced1b8a81a6d3994fa7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Aug 2018 11:14:15 +0200 Subject: [PATCH 4/5] zlib,minizip: add license, update meta data --- pkgs/development/libraries/minizip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index d9bac46230ac10..c88a978574a77c 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { sourceRoot = "zlib-${zlib.version}/contrib/minizip"; meta = { + inherit (zlib.meta) license homepage; platforms = stdenv.lib.platforms.unix; }; } From 3bc155dfd040a26163076aea37cbc6c602ff0f02 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Aug 2018 11:14:50 +0200 Subject: [PATCH 5/5] bzip2: update license --- pkgs/tools/compression/bzip2/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 0d2e63c7d59deb..4b127417ca8dd1 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; - meta = { - homepage = http://www.bzip.org; + meta = with stdenv.lib; { description = "High-quality data compression program"; - - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = []; }; }