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/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/readline/readline6.3.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation (rec {
homepage = http://savannah.gnu.org/projects/readline/;
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
pkgs/development/libraries/readline/readline6.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
homepage = http://savannah.gnu.org/projects/readline/;
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
};