From 5ef89ae605b4401bedc87b7570bf9525c20dfd4b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 27 Jan 2019 10:26:13 -0600 Subject: [PATCH 1/3] bison: 3.3 -> 3.3.1 https://lists.gnu.org/archive/html/bison-announce/2019-01/msg00003.html --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 72c465b3a72..09d7daa97bf 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.3"; + version = "3.3.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1z8fjyn5gmlf97zdq88hpdf2njxg830bhrhylq25dq5dzxzzpspx"; + sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; From 444d0733325b755d6d6ec315ff2d6a17c8b0e319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2019 12:54:04 +0100 Subject: [PATCH 2/3] Revert "glibc: fix build with newer bison" This reverts commit aa9821bbb9ce1085205eeb01bcfe3529617ed712. --- pkgs/development/libraries/glibc/common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d8cc00738a9..7e99a0c18d7 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -105,9 +105,6 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. 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 = From 57a456112d76bad008b4393ae6ddaadc34328167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2019 12:54:20 +0100 Subject: [PATCH 3/3] Revert "swig3, libapparmor: switch to bison2" This reverts commit c4720cb200bfa611dc1800aa046c9cb7f1e6c0df. --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a313bb0e18f..eeab1784f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9174,9 +9174,7 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { - bison = bison2; - }; + swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; swig = swig3; swigWithJava = swig; @@ -14284,7 +14282,7 @@ in 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 apparmor-profiles apparmor-kernel-patches;