diff options
| author | Moritz Hedtke <Moritz.Hedtke@t-online.de> | 2021-11-30 16:04:59 +0100 |
|---|---|---|
| committer | Moritz Hedtke <Moritz.Hedtke@t-online.de> | 2021-11-30 16:08:19 +0100 |
| commit | 225ffe5dd0a9d2e29fbfce87607046e2cacd304d (patch) | |
| tree | 4de16c7d35f953060272f6f9d8ab8137b16f59dd /pkgs | |
| parent | 428620c9c5b7a208bf5df34a6fa30ea8fde02947 (diff) | |
| download | nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar.gz nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar.bz2 nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar.lz nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar.xz nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.tar.zst nixpkgs-225ffe5dd0a9d2e29fbfce87607046e2cacd304d.zip | |
matrix-appservice-irc: improve updateScript
Diffstat (limited to 'pkgs')
3 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 2da3a81e187..020a3a28fe7 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -6,6 +6,7 @@ let inherit (stdenv.hostPlatform) system; }; version = (lib.importJSON ./package.json).version; + srcInfo = lib.importJSON ./src.json; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; @@ -15,7 +16,7 @@ ourNodePackages.package.override { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = version; - sha256 = "sha256-pJ024kIN7TJdOVV/mMB/DQJdaPQJI6yQci3uASyMZRs="; + inherit (srcInfo) sha256; }; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json new file mode 100644 index 00000000000..14eb6c69d6d --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/matrix-org/matrix-appservice-irc", + "rev": "6d5795ce9544c8d73f4846f1bd7190d352dddead", + "date": "2021-10-25T12:54:49+02:00", + "path": "/nix/store/by3iwfs5yayyv576qvfl650dgjw7jy5k-matrix-appservice-irc", + "sha256": "06v5ihn03vidfa8aq8q9yil5s0hdgz09hzsm75fk5v8d8bi3d7d4", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index d2c16dedfcd..5d26c26dc7d 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix +#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix nix-prefetch-git set -euo pipefail # cd to the folder containing this script @@ -23,6 +23,4 @@ wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-i rm ./package-lock-temp.json -# Apparently this is done by r-ryantm, so only uncomment for manual usage -#git add ./package.json ./node-packages.nix -#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +nix-prefetch-git --rev "$TARGET_VERSION" --url "https://github.com/matrix-org/matrix-appservice-irc" > ./src.json |