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

Merge recent master into staging

Browse Source 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
This commit is contained in:
Vladimír Čunát
2014-11-05 15:00:44 +01:00
parent c0e2aceef4 8e02bde1a8
commit 52404a868d
288 changed files with 8123 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/automake/automake-1.11.x.nix
+1
View File
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
branch = "1.11";
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
pkgs/development/tools/misc/automake/automake-1.12.x.nix
+1
View File
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
meta = {
branch = "1.12";
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
pkgs/development/tools/misc/automake/automake-1.13.x.nix
+1
View File
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
meta = {
branch = "1.13";
homepage = "http://www.gnu.org/software/automake/";
description = "GNU standard-compliant makefile generator";
license = stdenv.lib.licenses.gpl2Plus;
pkgs/development/tools/misc/automake/automake-1.14.x.nix
+1
View File
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
meta = {
branch = "1.14";
homepage = "http://www.gnu.org/software/automake/";
description = "GNU standard-compliant makefile generator";
license = stdenv.lib.licenses.gpl2Plus;