diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index c99456b9e486..d901f837c7eb 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.35.1"; + version = "1.35.2"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-tIBXnm6bGdA6tlYFL+aDf1bOjlUVof0MDNDpFi0tcbE="; - x86_64-linux = "sha256-emAbbVhEw0MA21rPxQD/z/p3yVuDi5JZg1yjuRkkmlo="; + aarch64-linux = "sha256-XfV0d4l8yTsEF9hDXAFnd0wgtu+Hm6VaEfPfXHF9wdE="; + x86_64-linux = "sha256-6Uo9Gya7lpkb5GAiB8yxIX81Yw1BWurBUF1ooDuJc9w="; } .${system} or throwSystem; in @@ -65,9 +65,7 @@ stdenv.mkDerivation { description = "Cloud-native edge and service proxy"; license = lib.licenses.asl20; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = with lib.maintainers; [ - adamcstephens - ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "envoy"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/en/envoy-bin/update.sh b/pkgs/by-name/en/envoy-bin/update.sh index e0ae167b10e7..e3b467e95059 100755 --- a/pkgs/by-name/en/envoy-bin/update.sh +++ b/pkgs/by-name/en/envoy-bin/update.sh @@ -1,24 +1,24 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch common-updater-scripts jq +#!nix-shell -i bash -p common-updater-scripts coreutils gnused ripgrep set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find package.nix in $ROOT" - exit 1 + echo "ERROR: cannot find package.nix in $ROOT" + exit 1 fi fetch_arch() { - VER="$1" - ARCH="$2" - URL="https://github.com/envoyproxy/envoy/releases/download/v${VER}/envoy-${VER}-linux-${ARCH}" - nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$URL")" + VER="$1" + ARCH="$2" + URL="https://github.com/envoyproxy/envoy/releases/download/v${VER}/envoy-${VER}-linux-${ARCH}" + nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$URL")" } replace_hash() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" } VER=$(list-git-tags --url=https://github.com/envoyproxy/envoy | rg 'v[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1)