summary refs log tree commit diff
path: root/pkgs/tools/misc/gavin-bc
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2023-04-16 20:35:50 -0300
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-04-18 07:09:37 -0300
commite956ce0a46ec1fa958ceff40e75531894e52ff70 (patch)
treec2de668f13eff63a046e5448209e557790c31175 /pkgs/tools/misc/gavin-bc
parent47651eba67d099d863f54b5a7e11515d7c2cd137 (diff)
downloadnixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar.gz
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar.bz2
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar.lz
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar.xz
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.tar.zst
nixpkgs-e956ce0a46ec1fa958ceff40e75531894e52ff70.zip
gavin-bc: 6.2.4 -> 6.5.0
Diffstat (limited to 'pkgs/tools/misc/gavin-bc')
-rw-r--r--pkgs/tools/misc/gavin-bc/default.nix12
1 files 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