diff options
| author | piegames <git@piegames.de> | 2021-11-07 22:18:22 +0100 |
|---|---|---|
| committer | piegames <git@piegames.de> | 2021-11-13 22:11:05 +0100 |
| commit | be0c385a5dbff42eece4b9efec028932cf1b3bc7 (patch) | |
| tree | 22db7ab4ff440fc5fadac1ebb942daea6e33f7c3 /pkgs/servers/matrix-synapse | |
| parent | 7f54eb086126b32d31f1a356bc3f7c186625e84c (diff) | |
| download | nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar.gz nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar.bz2 nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar.lz nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar.xz nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.tar.zst nixpkgs-be0c385a5dbff42eece4b9efec028932cf1b3bc7.zip | |
matrix-appservice-irc: improve update script
Diffstat (limited to 'pkgs/servers/matrix-synapse')
3 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION b/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION deleted file mode 100644 index c25c8e5b741..00000000000 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION +++ /dev/null @@ -1 +0,0 @@ -0.30.0 diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 33ac1fca467..f440a27acb6 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -5,7 +5,7 @@ let inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; - version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION); + version = (lib.importJSON ./package.json).version; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index 462512dd0f4..d2c16dedfcd 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -6,7 +6,7 @@ set -euo pipefail cd "$(dirname "$0")" CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') -TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq -r ".tag_name")" +TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}" @@ -18,7 +18,6 @@ echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION" rm -f package.json package-lock.json wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json -echo "$TARGET_VERSION" > ./REVISION ./generate-dependencies.sh |