diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-09 06:04:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 06:04:00 +0000 |
| commit | efe8ad8714c0527272b29d368833048919420d2d (patch) | |
| tree | 5c7b57b854fba305f899f8833f1273fed8af035a /pkgs/tools | |
| parent | 130aa9ca683614c52029aa0a2ca75edba490b0cc (diff) | |
| parent | 8ff7b290e6dd47d7ed24c6d156ba60fc3c83f100 (diff) | |
| download | nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar.gz nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar.bz2 nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar.lz nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar.xz nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.tar.zst nixpkgs-efe8ad8714c0527272b29d368833048919420d2d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/trivy/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/opentelemetry-collector/contrib.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/hysteria/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/cfssl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/gotop/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/languagetool/default.nix | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 32dacb1ec17..c6676a89d94 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-iXc70QOZZjnFuvRDm9e1uWqjkJNqV/1uAu1EdZNjL70="; + vendorSha256 = "sha256-h9GydAVW2mIFNMlz9aEW6hUioD9noQwnueatkoQDkpY="; excludedPackages = "misc"; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index cd63ca305ea..83585f41149 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-Fl2/rPrtbL3/gcM5hm4MgQwcS0PValuxa+nThYAE4l0="; + vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 695c580917c..f37c0aa04ba 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-xL8xRVJdCyaP39TO+cJLAPbdc7WHxgBQMEyxkyhWlA8="; }; - vendorSha256 = "sha256-DxbH0vtNnuOycvUp2TBN2TS9sF6RYVqwfUbVH11HDN8="; + vendorSha256 = "sha256-VCQHkkYmGU0ZPmTuYu2XFa5ezDJ3x7dZGN+Usmq4sOY="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index d1f0d2e9739..8d1c0df11a8 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-cyriV6z904QlkDlP80CSpakISJn7S81/2fcspAf5uk4="; + sha256 = "sha256-aZjb4mWoevRnPyL+b7H+VjIVklNe+u054OsmJbxPx4g="; }; subPackages = [ diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index a39e2788a57..93cf8ea6b5a 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-gpgduZbFCMMg/mXefhwMHvs4omml3RZ0h5XexO5vslM="; + vendorSha256 = "sha256-KLeVSrPDS1lKsKFemRmgxT6Pxack3X3B/btSCOUSUFY="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 537a9dc8402..bbfcd5a681b 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.8"; + version = "5.9"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-xwwC+I4cThl2iq3eKcjInFciWlhBfQvNA5LBalaXBuQ="; + sha256 = "sha256-x4xGgYeMi7KbD2WGHOd/ixmZ+5EY5g6CLd7/CBYldNQ="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; |