public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-11-06 10:16:39 +01:00
parent c964077200 782a12e450
commit 0518ccf5af
232 changed files with 3422 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/archivers/unzip/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.info-zip.org;
description = "An extraction utility for archives compressed in .zip format";
license = "free"; # http://www.info-zip.org/license.html
license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html
platforms = stdenv.lib.platforms.all;
};
}