Merge pull request #44813 from markuskowa/licenses-zip

Add licenses: libzip, minizip, bzip2, zip
NixOS · Aug 9, 2018 · 1d4de0d · 1d4de0d
2 parents 9c33863 + 3bc155d
commit 1d4de0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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;
   };
 }
diff --git 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;
   };
 }
diff --git 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;

diff --git 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 = [ ];
   };
 }
diff --git 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 = [];
   };
 }