diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-14 12:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 12:01:32 +0000 |
| commit | e196e68bee289193e4e133dd378addd8572dc4c5 (patch) | |
| tree | e622670eff2b4242c48ed397843a12e593ab6f52 /pkgs/development/tools | |
| parent | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (diff) | |
| parent | 514826ddf2b14eb20c4fac2a19f5f8e4b5858577 (diff) | |
| download | nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.gz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.bz2 nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.lz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.xz nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.tar.zst nixpkgs-e196e68bee289193e4e133dd378addd8572dc4c5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/buildkit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/merlin/4.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/protoc-gen-go/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/twilio-cli/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index b17e8d348d8..1455dc38e66 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester marsam ]; + maintainers = with maintainers; [ vdemeester marsam developer-guy ]; mainProgram = "buildctl"; }; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 29667566454..ae57eb31529 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,13 +15,13 @@ }: let - merlinVersion = "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; - "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; + "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68="; + "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; }; ocamlVersionShorthand = lib.substring 0 3 diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 53ddf571df2..a9c826a9304 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-su8upKXi7mvalk+Fa/sGGFizAXisHiBCc5OVIizujwI="; + sha256 = "sha256-xlRHhr25+gXlO6ggIQgijWYzIVZCpRVCnuLnSW1r15s="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 3187fb28eef..0842a07049c 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.4.1"; + version = "5.4.2"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-UEfnwYMiYE+DAENwf3cfSE20ctAxVjbko428rDNIMzI="; + sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is="; }; buildInputs = [ nodejs ]; |