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

Merge master into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2014-01-18 14:35:07 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/automake/automake-1.14.x.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec {
name = "automake-1.14";
name = "automake-1.14.1";
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "0nc0zqq8j336kamizzd86wb19vhbwywv5avcjh3cyx230xfqy671";
sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59";
};
buildInputs = [ perl autoconf ];