From 5746259af694fc791743c322f2cf0d47e3d0d9bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 May 2020 01:39:42 +0300 Subject: [PATCH] gotify: adapt update script to use vendor sha --- pkgs/servers/gotify/default.nix | 2 +- pkgs/servers/gotify/update.sh | 12 ++++++------ pkgs/servers/gotify/vendor-sha.nix | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/gotify/vendor-sha.nix diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 47f5925edfc..5d305c1e412 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - vendorSha256 = "1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"; + vendorSha256 = import ./vendor-sha.nix; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index e26ffbde62e..dc39a15be73 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -11,9 +11,9 @@ echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 -echo zeroing modSha256 in $dirname/mod-sha.nix +echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -28,13 +28,13 @@ echo removed yarn.lock echo running nix-build for ui nix-build -A gotify-server.ui -echo running nix-build for gotify itself in order to get modSha256 +echo running nix-build for gotify itself in order to get vendorSha256 set +e -modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 -echo got modSha256 of: $modSha256 +echo got vendorSha256 of: $vendorSha256 tput sgr0 echo running nix-build -A gotify-server which should build gotify-server normally nix-build -A gotify-server diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix new file mode 100644 index 00000000000..0705f436316 --- /dev/null +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -0,0 +1 @@ +"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file