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

Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream

Browse Source 
This is a partial commit from staging in an attempt to make merges
smaller.
This commit is contained in:
William A. Kennington III
2015-09-23 14:35:23 -07:00
parent 0d0be13878 2d464f75ed
commit 5cfe893cc4
32 changed files with 3689 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.3";
minorVersion = "1";
minorVersion = "2";
version = "${majorVersion}.${minorVersion}";
in
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd";
sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7";
};
enableParallelBuilding = true;

6
pkgs/development/tools/misc/autogen/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "autogen-${version}";
version = "5.18.5";
version = "5.18.6";
src = fetchurl {
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs";
};
nativeBuildInputs = [ which pkgconfig perl ];