From a71f67b5bdeae985e250c2a63513d426f2ef8f38 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 9 Dec 2022 08:15:34 -0500 Subject: [PATCH] vector: 0.25.2 -> 0.26.0 --- pkgs/tools/misc/vector/default.nix | 7 ++++--- pkgs/tools/misc/vector/pin.json | 5 +++++ pkgs/tools/misc/vector/update.sh | 33 ++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/vector/pin.json create mode 100755 pkgs/tools/misc/vector/update.sh diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 257f036ed0ea..7f274a0886e3 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -32,7 +32,8 @@ let pname = "vector"; - version = "0.25.2"; + pinData = lib.importJSON ./pin.json; + version = pinData.version; in rustPlatform.buildRustPackage { inherit pname version; @@ -41,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-gkhVabfAV250zofss7b/3ulb09Wk5EMGz9GSaS5eCzA="; + sha256 = pinData.sha256; }; - cargoHash = "sha256-zxwwXFCdcbB+Kx2SNyAIDsII6SN5+QHJQlzOUx+us2o="; + cargoSha256 = pinData.cargoSha256; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/vector/pin.json b/pkgs/tools/misc/vector/pin.json new file mode 100644 index 000000000000..705ddaf8e537 --- /dev/null +++ b/pkgs/tools/misc/vector/pin.json @@ -0,0 +1,5 @@ +{ + "version": "0.26.0", + "sha256": "sha256-0h9hcNgaVBDBeSKo39TvrMlloTS5ZoXrbVhm7Y43U+o=", + "cargoSha256": "sha256-UHc8ZyLJ1pxaBuP6bOXdbAI1oVZD4CVHAIa8URnNdaI=" +} diff --git a/pkgs/tools/misc/vector/update.sh b/pkgs/tools/misc/vector/update.sh new file mode 100755 index 000000000000..789437a21a0a --- /dev/null +++ b/pkgs/tools/misc/vector/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep + +# TODO set to `verbose` or `extdebug` once implemented in oil +shopt --set xtrace +# we need failures inside of command subs to get the correct cargoSha256 +shopt --unset inherit_errexit + +const directory = $(dirname $0 | xargs realpath) +const owner = "vectordotdev" +const repo = "vector" +const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ + jq -r '.tag_name') +const latest_version = $(echo $latest_rev | sd 'v' '') +const current_version = $(jq -r '.version' $directory/pin.json) +if ("$latest_version" === "$current_version") { + echo "$repo is already up-to-date" + return 0 +} else { + const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") + const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" + + jq ".version = \"$latest_version\" | \ + .\"sha256\" = \"$tarball_hash\" | \ + .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json + + const new_cargo_sha256 = $(nix-build -A vector 2>&1 | \ + tail -n 2 | \ + head -n 1 | \ + sd '\s+got:\s+' '') + + jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json +}