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

Merge #54878: bison: 3.3 -> 3.3.1

Browse Source 
This mainly fixes some build-regressions from 3.3,
so we can drop the workarounds.
This commit is contained in:
Vladimír Čunát 2019-01-29 15:00:06 +01:00
commit 34a936340f
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc/common.nix
View File

@ -105,9 +105,6 @@ stdenv.mkDerivation ({
# nscd needs libgcc, and we don't want it dynamically linked # nscd needs libgcc, and we don't want it dynamically linked
# because we don't want it to depend on bootstrap-tools libs. # because we don't want it to depend on bootstrap-tools libs.
echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
# bison 3.3 is too strict
sed 's/^BISONFLAGS = --yacc /BISONFLAGS = --yacc -Wno-error=yacc /g' -i intl/Makefile
''; '';
configureFlags = configureFlags =

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bison"; pname = "bison";
version = "3.3"; version = "3.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1z8fjyn5gmlf97zdq88hpdf2njxg830bhrhylq25dq5dzxzzpspx"; sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1";
}; };
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;

6
pkgs/top-level/all-packages.nix
View File

@ -9174,9 +9174,7 @@ in
swig1 = callPackage ../development/tools/misc/swig { }; swig1 = callPackage ../development/tools/misc/swig { };
swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
swig3 = callPackage ../development/tools/misc/swig/3.x.nix { swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
bison = bison2;
};
swig = swig3; swig = swig3;
swigWithJava = swig; swigWithJava = swig;
@ -14284,7 +14282,7 @@ in
iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { };
inherit (callPackages ../os-specific/linux/apparmor { python = python3; bison = bison2; }) inherit (callPackages ../os-specific/linux/apparmor { python = python3; })
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
apparmor-profiles apparmor-kernel-patches; apparmor-profiles apparmor-kernel-patches;