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

2
pkgs/tools/compression/ncompress/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://ncompress.sourceforge.net/;
license = "public domain";
license = stdenv.lib.licenses.publicDomain;
description = "A fast, simple LZW file compressor";
};
}

2
pkgs/tools/compression/zsync/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://zsync.moria.org.uk/;
description = "File distribution system using the rsync algorithm";
license = "free";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; all;
};