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

Merge pull request #111346 from beardhatcode/bump/matrix-appservice-slack

Browse Source
This commit is contained in:
Sandro 2021-04-02 17:53:04 +02:00 committed by GitHub
commit bc0144e5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1878 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -1106,6 +1106,12 @@
githubId = 14111; githubId = 14111;
name = "Brandon Dimcheff"; name = "Brandon Dimcheff";
}; };
beardhatcode = {
name = "Robbert Gurdeep Singh";
email = "nixpkgs@beardhatcode.be";
github = "beardhatcode";
githubId = 662538;
};
bendlas = { bendlas = {
email = "herwig@bendlas.net"; email = "herwig@bendlas.net";
github = "bendlas"; github = "bendlas";

7
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
View File

@ -1,11 +1,10 @@
{ pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }: { pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }:
let let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "matrix-appservice-slack"; repo = "matrix-appservice-slack";
rev = "1.4.0"; rev = "1.7.0";
sha256 = "1xm75rgg7yrz40y2w1njiwfwz17a8wwlvr7a6zyxvkl8cqrgzp6d"; sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg=";
}; };
nodePackages = import ./node-composition.nix { nodePackages = import ./node-composition.nix {
@ -25,7 +24,7 @@ nodePackages.package.override {
meta = with lib; { meta = with lib; {
description = "A Matrix <--> Slack bridge"; description = "A Matrix <--> Slack bridge";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ beardhatcode ];
license = licenses.asl20; license = licenses.asl20;
}; };
} }

6
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix #! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v1.4.0 release # Download package.json and package-lock.json from the v1.7.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package.json -o package.json 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/9462a75715ea9afba23b757ec90554f10f457a96/package-lock.json -o package-lock.json curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json
node2nix \ node2nix \
--nodejs-12 \ --nodejs-12 \

3033
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff