diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-09-11 08:37:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-11 08:37:03 +0200 |
| commit | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (patch) | |
| tree | aaca4e6d9683e0831cbc327ab5335ab5acd5a8dc /pkgs/development/tools | |
| parent | b728835bc129c4ef13ee7051e60e685c4b175439 (diff) | |
| parent | d55fb56690a7adc21eab7660d76fe4217860d914 (diff) | |
| download | nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar.gz nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar.bz2 nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar.lz nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar.xz nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.tar.zst nixlib-aa8e8303e1b42c5cf5195f3ce82f886664aa26d4.zip | |
Merge branch 'x-updates' into master
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.13.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/dejagnu/default.nix | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 3556b4f47aad..400d554b65e2 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.13.1"; + name = "automake-1.13.4"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf"; + sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9"; }; buildInputs = [ perl autoconf ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ca763a5e1fb3..6b93240ba057 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.system == "mips64el-linux") " --enable-fix-loongson2f-nop" + stdenv.lib.optionalString (cross != null) " --target=${cross.config}" - + stdenv.lib.optionalString gold " --enable-gold" + + stdenv.lib.optionalString gold " --enable-gold --enable-plugins" + stdenv.lib.optionalString deterministic " --enable-deterministic-archives"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 06c1d4fe76ba..beed6032393f 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.5"; + name = "dejagnu-1.5.1"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "1nx3x3h96a82q92q108q71giv2nz9xmbbn2nrlr3wvvs6l45id68"; + sha256 = "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0"; }; patches = [ ./wrapped-runtest-program-name.patch ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/runtest" \ - --prefix PATH ":" "${expect}/bin" + --prefix PATH ":" "${expect}/bin" ''; meta = { |