From 4fdc3b2ca0313ee8acf9fcd488f3218646e30c27 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 12 Sep 2024 00:24:36 -0400 Subject: [PATCH 1/4] boundary: fix update script --- pkgs/tools/networking/boundary/default.nix | 5 +++-- pkgs/tools/networking/boundary/update.sh | 23 ++++++++++------------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 6a7ddd1d7306..2446e513d955 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; - sha256 = selectSystem { + hash = selectSystem { x86_64-linux = "sha256-43Q69Pp5NLB4fITy2X8d0XHp5EX+gFLnwtHOontISoU="; aarch64-linux = "sha256-z87peCBv50eJr/kiFWPZUOeb0WCN4X+0JnxCvn3lCXo="; x86_64-darwin = "sha256-SAhlZNGq5rkNitKVd+EjLOeeTErhWg14tHFG4Bsexv8="; @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { in fetchzip { url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; - inherit sha256; + inherit hash; + stripRoot = false; }; dontConfigure = true; diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/tools/networking/boundary/update.sh index 0533c07967c1..6cd3609f8503 100755 --- a/pkgs/tools/networking/boundary/update.sh +++ b/pkgs/tools/networking/boundary/update.sh @@ -10,15 +10,12 @@ if [ ! -f "$NIX_DRV" ]; then exit 1 fi -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://releases.hashicorp.com/boundary/${VER}/boundary_${VER}_${ARCH}.zip" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"boundary\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" +function calc_hash () { + local version=$1 + local arch=$2 + url="https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${arch}.zip" + zip_hash=$(nix-prefetch-url --unpack $url) + nix hash to-sri --type sha256 "$zip_hash" } replace_sha() { @@ -28,10 +25,10 @@ replace_sha() { # https://releases.hashicorp.com/boundary/0.1.4/boundary_0.1.4_linux_amd64.zip BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') -BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") -BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") -BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") -BOUNDARY_DARWIN_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_arm64") +BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64") +BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64") +BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64") +BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" From 9d06beb162a3d0f4853a1ed0427994b39aaa9dcc Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 12 Sep 2024 00:27:24 -0400 Subject: [PATCH 2/4] boundary: 0.15.4 -> 0.17.1 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 2446e513d955..40f6f95b76ce 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.15.4"; + version = "0.17.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-43Q69Pp5NLB4fITy2X8d0XHp5EX+gFLnwtHOontISoU="; - aarch64-linux = "sha256-z87peCBv50eJr/kiFWPZUOeb0WCN4X+0JnxCvn3lCXo="; - x86_64-darwin = "sha256-SAhlZNGq5rkNitKVd+EjLOeeTErhWg14tHFG4Bsexv8="; - aarch64-darwin = "sha256-2DJgOdgJY6eUR2sqWS47vNjdkQGXOEEsSXhZeUBZxxs="; + x86_64-linux = "sha256-U7ZCmpmcZpgLkf2jwc35Q9jezxUzaKp85WX2Tqs5IFI="; + aarch64-linux = "sha256-gYbeC+f/EXfhzUtwojjvyEATri1XpHpu+JPQtj4oRb4="; + x86_64-darwin = "sha256-N6Uy5JiU9mW1/muHYF6Rf1KLX1iXYt/5ct1IHeFUgds="; + aarch64-darwin = "sha256-Oxfzy/9ggcJXS+tXiYmJXSiqbMKw4vv9RMquUuOlJ08="; }; in fetchzip { From 9c116ffab332dcc1c7b6e1d5072816289f30f6b0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 12 Sep 2024 00:27:55 -0400 Subject: [PATCH 3/4] boundary: nixfmt --- pkgs/tools/networking/boundary/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 40f6f95b76ce..33a77d0b5788 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchzip }: +{ + stdenv, + lib, + fetchzip, +}: stdenv.mkDerivation rec { pname = "boundary"; @@ -65,7 +69,10 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; - maintainers = with maintainers; [ jk techknowlogick ]; + maintainers = with maintainers; [ + jk + techknowlogick + ]; platforms = platforms.unix; mainProgram = "boundary"; }; From f131e4ffd10a54420dbe7b2d0f7c812704074c61 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 12 Sep 2024 00:31:52 -0400 Subject: [PATCH 4/4] boundary: move to pkgs/by-name --- .../boundary/default.nix => by-name/bo/boundary/package.nix} | 0 pkgs/{tools/networking => by-name/bo}/boundary/update.sh | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{tools/networking/boundary/default.nix => by-name/bo/boundary/package.nix} (100%) rename pkgs/{tools/networking => by-name/bo}/boundary/update.sh (94%) mode change 100755 => 100644 diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/by-name/bo/boundary/package.nix similarity index 100% rename from pkgs/tools/networking/boundary/default.nix rename to pkgs/by-name/bo/boundary/package.nix diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh old mode 100755 new mode 100644 similarity index 94% rename from pkgs/tools/networking/boundary/update.sh rename to pkgs/by-name/bo/boundary/update.sh index 6cd3609f8503..0418b2b3dd0a --- a/pkgs/tools/networking/boundary/update.sh +++ b/pkgs/by-name/bo/boundary/update.sh @@ -4,9 +4,9 @@ set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" + echo "ERROR: cannot find package.nix in $ROOT" exit 1 fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12c64eac07b..883754c9cc52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3296,8 +3296,6 @@ with pkgs; boxxy = callPackage ../tools/misc/boxxy { }; - boundary = callPackage ../tools/networking/boundary { }; - chamber = callPackage ../tools/admin/chamber { }; chaos = callPackage ../tools/networking/chaos { };