From e956ce0a46ec1fa958ceff40e75531894e52ff70 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 20:35:50 -0300 Subject: [PATCH] gavin-bc: 6.2.4 -> 6.5.0 --- pkgs/tools/misc/gavin-bc/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index 2de74484c6b..ad8364d41ce 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -8,17 +8,17 @@ }: assert lib.elem historyType [ "editline" "readline" "internal" ]; -assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ]; +assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" "" ]; stdenv.mkDerivation (finalAttrs: { pname = "gavin-bc"; - version = "6.2.4"; + version = "6.5.0"; src = fetchFromGitea { domain = "git.gavinhoward.com"; owner = "gavin"; repo = "bc"; rev = finalAttrs.version; - hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; + hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo="; }; buildInputs = @@ -27,10 +27,11 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-nls" - "--predefined-build-type=${predefinedBuildType}" ] + ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}") ++ (lib.optional (historyType == "editline") "--enable-editline") - ++ (lib.optional (historyType == "readline") "--enable-readline"); + ++ (lib.optional (historyType == "readline") "--enable-readline") + ++ (lib.optional (historyType == "internal") "--enable-internal-history"); meta = { homepage = "https://git.gavinhoward.com/gavin/bc"; @@ -42,3 +43,4 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; }; }) +# TODO: cover most of configure settings