diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-22 18:01:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-22 18:01:07 +0000 |
commit | 68dd6912f3672d764b7dc896108bd7ba97d5944a (patch) | |
tree | fd4a1c5636effa3b40503b43ac76fa53fd04bb85 /pkgs/tools/misc | |
parent | 0f910f5664b451af1fb6b6bf8258db8527277052 (diff) | |
parent | 2308c637ef1b66ad718a5418501b196c4c3243c8 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/engage/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/misc/tbls/default.nix | 6 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/tools/misc/engage/default.nix new file mode 100644 index 0000000000000..c01dcc2e68796 --- /dev/null +++ b/pkgs/tools/misc/engage/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchgit +}: + +let + pname = "engage"; + version = "0.1.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + # fetchFromGitLab doesn't work on GitLab's end for unknown reasons + src = fetchgit { + url = "https://or.computer.surgery/charles/${pname}"; + rev = "v${version}"; + hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo="; + }; + + cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; + + meta = { + description = "A task runner with DAG-based parallelism"; + homepage = "https://or.computer.surgery/charles/engage"; + changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +} diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index bca16be194f16..f0f87fbfab9f5 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.62.0"; + version = "1.62.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU="; + hash = "sha256-x3Bh/xB/x71xNjVL5zqp1ag8TPQoxOpuOyDE1f54sGQ="; }; - vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; + vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; CGO_CFLAGS = [ "-Wno-format-security" ]; |