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/development/libraries/readline/readline6.3.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
];
meta = with stdenv.lib; {
description = "GNU Readline, a library for interactive line editing";
description = "Library for interactive line editing";
longDescription = ''
The GNU Readline library provides a set of functions for use by

2
pkgs/development/libraries/readline/readline6.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation (rec {
import ./readline-6.2-patches.nix patch);
meta = {
description = "GNU Readline, a library for interactive line editing";
description = "Library for interactive line editing";
longDescription = ''
The GNU Readline library provides a set of functions for use by