diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
| commit | af8cd3c74e80ff532b17568039ecc4f143992813 (patch) | |
| tree | 58f3d9e423eec59b42a6a7533a094fabeeb17c12 /pkgs/tools/archivers | |
| parent | 8915ed06b30f6d48d99d0d9d2bc713b40a8db063 (diff) | |
| parent | 1d4de0d552ae9aa66a5b8dee5fb0650a4372d148 (diff) | |
| download | nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.gz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.bz2 nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.lz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.xz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.zst nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b02..20d85405bbac 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 = [ ]; }; } |