From 88bdfc3b6cdd489abf480880aa01d71b6965a53c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 10 Oct 2021 20:43:02 +0100 Subject: [PATCH 1/3] bison: 3.7.6 -> 3.8.2 --- pkgs/development/tools/parsing/bison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 1de45b08447b..7aa90d626fff 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.6"; + version = "3.8.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-adwLtG6o/DB9TKHgthyMNV6yB9Cwxp9PhGIyjnTXueo="; + sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs="; }; nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; From faf06a88de74364d4544e1ae8adbc5a31b51e4fe Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 10 Oct 2021 21:12:42 +0100 Subject: [PATCH 2/3] bison: enable tests, enable parallelism --- pkgs/development/tools/parsing/bison/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 7aa90d626fff..58e86331508e 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; - doCheck = false; # fails - doInstallCheck = false; # fails + enableParallelBuilding = true; + + doCheck = true; + doInstallCheck = true; meta = { homepage = "https://www.gnu.org/software/bison/"; From 10ac0a893783e2c1a100e68ae96a1fb8d349cd33 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 17 Oct 2021 14:48:19 +0100 Subject: [PATCH 3/3] pkgsMusl.bison: fix tests by adding iconv workaround for musl gnulib relies on --host= to check if iconv() on the platform might convert unsupported symbols to '*'. Noticed as failed tests. --- pkgs/development/tools/parsing/bison/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 58e86331508e..3d2daba239a3 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs="; }; + # gnulib relies on --host= to detect iconv() features on musl(). + # Otherwise tests fail due to incorrect unicode symbol oconversion. + configurePlatforms = [ "build" "host" ]; + nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ];