From 024cab5905e49bb16bbdeae315580e920e726c30 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 17:11:12 -0300 Subject: [PATCH 1/3] gavin-bc: init at 6.2.4 This is an implementation of the bc calculator by Gavin Howard. --- pkgs/tools/misc/gavin-bc/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/gavin-bc/default.nix diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix new file mode 100644 index 000000000000..0ccfbc2f9dfc --- /dev/null +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchFromGitea +}: + +stdenv.mkDerivation (self: { + pname = "gavin-bc"; + version = "6.2.4"; + + src = fetchFromGitea { + domain = "git.gavinhoward.com"; + owner = "gavin"; + repo = "bc"; + rev = self.version; + hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; + }; + + meta = { + homepage = "https://git.gavinhoward.com/gavin/bc"; + description = "Gavin Howard's BC calculator implementation"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a657e77af38..1513ae7436e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,6 +3658,8 @@ with pkgs; bc = callPackage ../tools/misc/bc { }; + gavin-bc = callPackage ../tools/misc/gavin-bc { }; + bdf2psf = callPackage ../tools/misc/bdf2psf { }; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; From 98157f131dac8d56997673abd69d9f154d35e00e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 19:38:54 -0300 Subject: [PATCH 2/3] gavin-bc: mark as broken on Darwin --- pkgs/tools/misc/gavin-bc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index 0ccfbc2f9dfc..a5a7e64d27a7 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation (self: { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; }) From d37bd519ba0dffd075dfd4b67b5caec0d020ef0f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Feb 2023 18:03:44 -0300 Subject: [PATCH 3/3] gavin-bc: enable extra options --- pkgs/tools/misc/gavin-bc/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index a5a7e64d27a7..ade42a7d0d3a 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -1,8 +1,14 @@ { lib , stdenv , fetchFromGitea +, editline +, readline +, historyType ? "internal" +, predefinedBuildType ? "BSD" }: +assert lib.elem historyType [ "editline" "readline" "internal" ]; +assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ]; stdenv.mkDerivation (self: { pname = "gavin-bc"; version = "6.2.4"; @@ -15,6 +21,17 @@ stdenv.mkDerivation (self: { hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; }; + buildInputs = + (lib.optional (historyType == "editline") editline) + ++ (lib.optional (historyType == "readline") readline); + + configureFlags = [ + "--disable-nls" + "--predefined-build-type=${historyType}" + ] + ++ (lib.optional (historyType == "editline") "--enable-editline") + ++ (lib.optional (historyType == "readline") "--enable-readline"); + meta = { homepage = "https://git.gavinhoward.com/gavin/bc"; description = "Gavin Howard's BC calculator implementation";