diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-21 06:01:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-21 06:01:00 +0000 |
commit | af79979d5887fae3d2c24f45221241ab5ad1e12e (patch) | |
tree | 634f89b6b2d4fc1b8d14b35f68266a70e1e26d25 /pkgs/tools/misc | |
parent | e3e8374b6ff7ed1608897078beb92c4a55cdc4f3 (diff) | |
parent | b139b6056c8ad4ef7e0cffb81304d59cf077589b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/broot/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/gavin-bc/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/misc/sagoin/default.nix | 8 |
3 files changed, 50 insertions, 7 deletions
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 4daab1ef99c6f..c2c60414e9818 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-W8B4e8x9IoINR4NSm8jVBqXZbe1T/4z3RVmNrLVzV1M="; + hash = "sha256-TSaHngDLD2Tit4ixFDT2OhoqLGMIXj5rgxLwX06nHNw="; }; - cargoHash = "sha256-XEvIqzSkusOv+boNZbTRxXVN566SduNDcZSkomJRMsk="; + cargoHash = "sha256-66iEMcgd3Tx6134ggqckOf61RMn/w5x2a61Dlfs1GUc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix new file mode 100644 index 0000000000000..ade42a7d0d3a8 --- /dev/null +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -0,0 +1,43 @@ +{ 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"; + + src = fetchFromGitea { + domain = "git.gavinhoward.com"; + owner = "gavin"; + repo = "bc"; + rev = self.version; + 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"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix index 638acb962df69..704267da2793f 100644 --- a/pkgs/tools/misc/sagoin/default.nix +++ b/pkgs/tools/misc/sagoin/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCsNsBD+ZkxhIy1yC+N0AqbEsQ2ElfWLtnBOG+0hHXk="; + sha256 = "sha256-CSkij/3WCeEq26Uhlrgdf503hGf0OwSUQNmx5mspD08="; }; - cargoSha256 = "sha256-B8P92utlmZlxNfzBidNUaGw7BhgkOPwD0yahtKZ2yto="; + cargoSha256 = "sha256-Zos3ox6VQv9t1KoblAJhVblTOQOn9rJyvaXK48Y/K1c="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices ]; postInstall = '' |