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

Merge branch 'staging'

Browse Source 
It's only half-rebuilt on Hydra, but it brings a security fix.
This commit is contained in:
Vladimír Čunát
2018-06-03 13:52:13 +02:00
parent 318920725a 52fdec3c1d
commit 448d7d648d
19 changed files with 151 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,13 @@
# We need the same Python as is used to build libxml2Python
stdenv.mkDerivation rec {
name = "itstool-2.0.4";
# 2.0.3+ breaks the build of gnome3.gnome-desktop
# https://github.com/itstool/itstool/issues/17
name = "itstool-2.0.2";
src = fetchurl {
url = "http://files.itstool.org/itstool/${name}.tar.bz2";
sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp";
sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
};
buildInputs = [ python2 libxml2Python ];

6
pkgs/development/tools/parsing/bison/3.x.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }:
stdenv.mkDerivation rec {
name = "bison-3.0.4";
name = "bison-3.0.5";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.gz";
sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e";
sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd";
};
patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
patches = []; # remove on another rebuild
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
propagatedBuildInputs = [ m4 ];