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

Merge recent master into staging

Browse Source 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
This commit is contained in:
Vladimír Čunát
2014-08-30 10:04:02 +02:00
parent a283bec71c 4e0d2706f1
commit e51f73652d
756 changed files with 18877 additions and 13683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.gnu.org/software/gzip/;
description = "Gzip, the GNU zip compression program";
description = "GNU zip compression program";
longDescription =
''gzip (GNU zip) is a popular data compression program written by

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

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://rzip.samba.org/;
description = "The RZIP compression program";
description = "Compression program";
license = stdenv.lib.licenses.gpl2Plus;
};
}