From acedabeff79f25183ee6e63e0cdf5c4d648641d1 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 19 Mar 2019 20:03:27 +0100 Subject: [PATCH 1/3] ngrok-2: rename update to update.sh --- pkgs/tools/networking/ngrok-2/{update => update.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/tools/networking/ngrok-2/{update => update.sh} (100%) diff --git a/pkgs/tools/networking/ngrok-2/update b/pkgs/tools/networking/ngrok-2/update.sh similarity index 100% rename from pkgs/tools/networking/ngrok-2/update rename to pkgs/tools/networking/ngrok-2/update.sh From b1bfe7b4789d294054dde19a50c2db9ad63f2b05 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 19 Mar 2019 20:03:41 +0100 Subject: [PATCH 2/3] ngrok-2: set updateScript --- pkgs/tools/networking/ngrok-2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index da598c6fbd5..89d6a9b454d 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { install -D ngrok $out/bin/ngrok ''; + passthru.updateScript = ./update.sh; + meta = { description = "ngrok"; longDescription = '' From d394fa0d9605f94b64f9fe80fd37ccec176ee1f9 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 19 Mar 2019 20:05:51 +0100 Subject: [PATCH 3/3] ngrok2: cleanup update.sh --- pkgs/tools/networking/ngrok-2/update.sh | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok-2/update.sh index 62b0c7e545e..7908a1524e5 100755 --- a/pkgs/tools/networking/ngrok-2/update.sh +++ b/pkgs/tools/networking/ngrok-2/update.sh @@ -4,10 +4,8 @@ #!nix-shell -i bash set -eu -o pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" get_download_info() { - echo '{ "sys": "'"$1-$2"'", "response": ' http --body \ https://update.equinox.io/check \ 'Accept:application/json; q=1; version=1; charset=utf-8' \ @@ -16,25 +14,20 @@ get_download_info() { channel=stable \ os=$1 \ goarm= \ - arch=$2 - -# target_version=2.2.8 \ - - echo "}" + arch=$2 \ + | jq --arg sys "$1-$2" '{ + sys: $sys, + url: .download_url, + sha256: .checksum, + version: .release.version + }' } ( - echo "[" get_download_info linux 386 - echo "," get_download_info linux amd64 - echo "," get_download_info linux arm - echo "," get_download_info linux arm64 - # echo "," - # get_download_info darwin 386 - echo "," get_download_info darwin amd64 - echo "]" -) | jq 'map ({ (.sys): { "sys": .sys, "url": .response.download_url, "sha256": .response.checksum, "version": .response.release.version } }) | add' >versions.json +) | jq --slurp 'map ({ (.sys): . }) | add' \ + > pkgs/tools/networking/ngrok-2/versions.json