about summary refs log tree commit diff
path: root/pkgs/servers/matrix-synapse/matrix-appservice-irc
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2021-11-25 11:08:01 +0100
committerGitHub <noreply@github.com>2021-11-25 11:08:01 +0100
commitee31eb664c2c2d7d46a2e0ea0495a988e77076fc (patch)
treec2109f8d0c3db611568f66cb7a452974f0426be1 /pkgs/servers/matrix-synapse/matrix-appservice-irc
parent47b35f569e84eb6dbbcf0a9fc75d8729ab8837fd (diff)
parent2b7ab562eac330d451942fb11010a55a9190b811 (diff)
Merge pull request #145796 from piegamesde/update-appservice-irc
Diffstat (limited to 'pkgs/servers/matrix-synapse/matrix-appservice-irc')
-rw-r--r--pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION1
-rw-r--r--pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix4
-rwxr-xr-xpkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh3
3 files changed, 3 insertions, 5 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 c25c8e5b74165..0000000000000
--- 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 33ac1fca46726..1465b9518ffa7 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";
@@ -30,7 +30,7 @@ ourNodePackages.package.override {
 
   meta = with lib; {
     description = "Node.js IRC bridge for Matrix";
-    maintainers = with maintainers; [ piegames ];
+    maintainers = with maintainers; [ ];
     homepage = "https://github.com/matrix-org/matrix-appservice-irc";
     license = licenses.asl20;
   };
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh
index 462512dd0f4db..d2c16dedfcd2c 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