public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-17 06:22:23 +00:00
committed by GitHub
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
+2 -2
View File
@@ -3,8 +3,8 @@ let
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-slack";
rev = "1.7.0";
sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg=";
rev = "1.8.0";
sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0=";
};
nodePackages = import ./node-composition.nix {
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+3 -3
View File
@@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v1.7.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json
# Download package.json and package-lock.json from the v1.8.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json
node2nix \
--nodejs-12 \
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
Generated
+557 -597
View File
File diff suppressed because it is too large Load Diff