diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 12:15:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-09 12:15:33 +0200 |
commit | 1d4de0d552ae9aa66a5b8dee5fb0650a4372d148 (patch) | |
tree | 182734273a1485c1b81e3e9de7d27979f59a95c3 | |
parent | 9c338630a9ff956e25abd550314c6d8fd1cfc4c1 (diff) | |
parent | 3bc155dfd040a26163076aea37cbc6c602ff0f02 (diff) | |
download | nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar.gz nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar.bz2 nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar.lz nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar.xz nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.tar.zst nixpkgs-1d4de0d552ae9aa66a5b8dee5fb0650a4372d148.zip |
Merge pull request #44813 from markuskowa/licenses-zip
Add licenses: libzip, minizip, bzip2, zip
-rw-r--r-- | pkgs/development/libraries/libzip/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/minizip/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 7 |
5 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 131b64c1c7f..76f5d6567dd 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; }; } diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index d9bac46230a..c88a978574a 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; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b8537896d79..fa6b8fb13b5 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; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b0..20d85405bba 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 = [ ]; }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 0d2e63c7d59..4b127417ca8 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 = []; }; } |