Unverified Commit 424b0e74 authored by Colin's avatar Colin Committed by GitHub
Browse files

zrok: 1.0.4 -> 1.1.10, add Darwin support (#464419)

parents 9622ef88 95cf6e8a

pkgs/by-name/zr/zrok/package.nix

+20 −16
Original line number Diff line number Diff line
@@ -13,20 +13,24 @@ let 
      x86_64-linux = "linux_amd64";

      aarch64-linux = "linux_arm64";

      armv7l-linux = "linux_armv7";

      x86_64-darwin = "darwin_amd64";

      aarch64-darwin = "darwin_arm64";

    }

    .${system} or throwSystem;



  hash =

    {

      x86_64-linux = "sha256-Ewez2QUsIAmxyjxR8wvt7UJpXVHjIb8s6gGF1YNgrec=";

      aarch64-linux = "sha256-5hZaOqnTYWeUJXGObzUZMqE62ZgNvJ9Wi8shVng10l8=";

      armv7l-linux = "sha256-MOM0OS2/mhYaxowsBVnZH0poR+wXsbjsJKldU/nAfjU=";

      x86_64-linux = "sha256-wCrMB2rUr4HGAAGxYeygnBR5cCpoxUbuVVYPR7p004I=";

      aarch64-linux = "sha256-CUjuYspPQQw4L3SZSkgEAUoySBxB1X/AQHns9j4zfr0=";

      armv7l-linux = "sha256-83Rul8eikB2+AcgVQK8M/vVGj5eAR4dPNqx8lHAcgBQ=";

      x86_64-darwin = "sha256-fwfemZe1KTtRgdTPuCR+FBah5SrQnzevgsuZsoe8U0U=";

      aarch64-darwin = "sha256-492zgY6rdipxeoXiK5BXTbXeD0x2DtrGxEt4lqr9ZLE=";

    }

    .${system} or throwSystem;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "zrok";

  version = "1.0.4";

  version = "1.1.10";



  src = fetchzip {

    url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";
@@ -36,17 +40,15 @@ stdenv.mkDerivation (finalAttrs: { 


  updateScript = ./update.sh;



  installPhase =

    let

      interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";

    in

    ''

  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin

    cp zrok $out/bin/

    chmod +x $out/bin/zrok

      patchelf --set-interpreter "${interpreter}" "$out/bin/zrok"

    ${lib.optionalString stdenv.hostPlatform.isLinux ''

      patchelf --set-interpreter "$(< "$NIX_CC/nix-support/dynamic-linker")" "$out/bin/zrok"

    ''}



    runHook postInstall

  '';
@@ -61,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { 
      "x86_64-linux"

      "aarch64-linux"

      "armv7l-linux"

      "x86_64-darwin"

      "aarch64-darwin"

    ];

    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

  };

pkgs/by-name/zr/zrok/update.sh

+6 −2
Original line number Diff line number Diff line
@@ -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
@@ -30,9 +30,13 @@ ZROK_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/openzi 
ZROK_LINUX_X64_SHA256=$(fetch_arch "$ZROK_VER" "linux_amd64")

ZROK_LINUX_AARCH64_SHA256=$(fetch_arch "$ZROK_VER" "linux_arm64")

ZROK_LINUX_ARMV7L_SHA256=$(fetch_arch "$ZROK_VER" "linux_armv7")

ZROK_DARWIN_X64_SHA256=$(fetch_arch "$ZROK_VER" "darwin_amd64")

ZROK_DARWIN_ARM64_SHA256=$(fetch_arch "$ZROK_VER" "darwin_arm64")



sed -i "s/version = \".*\"/version = \"$ZROK_VER\"/" "$NIX_DRV"



replace_sha "x86_64-linux" "$ZROK_LINUX_X64_SHA256"

replace_sha "aarch64-linux" "$ZROK_LINUX_AARCH64_SHA256"

replace_sha "armv7l-linux" "$ZROK_LINUX_ARMV7L_SHA256"

replace_sha "x86_64-darwin" "$ZROK_DARWIN_X64_SHA256"

replace_sha "aarch64-darwin" "$ZROK_DARWIN_ARM64_SHA256"