Update dependencies

This commit is contained in:
Charlotte Van Petegem 2023-12-19 07:50:54 +01:00
parent f8a1b81548
commit 47a94567bb
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 15 additions and 66 deletions

30
flake.lock generated
View file

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1702807209,
"narHash": "sha256-4rU/+82/nhd6tyLZGpgU9Y4i0gKHnz5cAhtgdxxbMVk=",
"lastModified": 1702950091,
"narHash": "sha256-KvfK+HFUswxk0my0SKP0wtJ8Q3Rfkymp1quu4YcAOH8=",
"owner": "accentor",
"repo": "api",
"rev": "6f0b0dc596ec236744599326851f1fd7ccd103ca",
"rev": "ad35a527d0c3033acc89343b2ee1ad6df712c20e",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1702800260,
"narHash": "sha256-VtVPR0QxtZFnLFmSXX3/WS3/luSOPiZ42Ow6uRcMhBA=",
"lastModified": 1702950098,
"narHash": "sha256-RdHG+X+qJICg/nymF0E2YGx8NP/M05i/3FnHfhZoMoE=",
"owner": "accentor",
"repo": "web",
"rev": "b0a65d7e038936dc2293af306e4e0e1c8f1f511e",
"rev": "5193742a06097888f8271582ee6931e05a0be224",
"type": "github"
},
"original": {
@ -457,11 +457,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1702830618,
"narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
"type": "github"
},
"original": {
@ -535,11 +535,11 @@
},
"nur": {
"locked": {
"lastModified": 1702939520,
"narHash": "sha256-bXESjfxNDc11xYO1DCG+QmswQDGFCpVYWVASzgkrvOY=",
"lastModified": 1702968249,
"narHash": "sha256-eZ8pre1kFwttm6ttk3gbRsX8ntwBiLoIJmf3M6EMM6A=",
"owner": "nix-community",
"repo": "NUR",
"rev": "e3f15013fb1597e3cf88325f93035bfc7c4dc129",
"rev": "dea8ad34457611766f67dadd7c3db93297b15c1b",
"type": "github"
},
"original": {
@ -737,11 +737,11 @@
]
},
"locked": {
"lastModified": 1702413342,
"narHash": "sha256-WD0dISZbnvl7rYONqgWDcqn9Lz0EjBdCZ+CR8NfF5xY=",
"lastModified": 1702949836,
"narHash": "sha256-y1ORjFT6e2Ubb8o2iVjPqf6qPshZzw+pfHjuiqCNObU=",
"owner": "chvp",
"repo": "tetris",
"rev": "e5c69f76a15827e47f2b2457411c979ba93241b1",
"rev": "f5f5d79a1a3b865fc946663a3ba88e61036097f6",
"type": "github"
},
"original": {

View file

@ -1,25 +0,0 @@
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
index 1fc99bb203369a..bbfc36ad42688a 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
@@ -11,6 +11,8 @@ let
data = lib.importJSON ./pin.json;
in
mkYarnPackage rec {
+ inherit nodejs;
+
pname = "matrix-appservice-slack";
version = data.version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f89a1d73db67b..2b7b478aba3d12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10098,6 +10098,7 @@ with pkgs;
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {
matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
+ nodejs = nodejs_18;
};
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord {

View file

@ -1,26 +0,0 @@
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index f8e94264858baf..3423985f658406 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "0.10.4";
+ version = "0.10.5";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
- hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8=";
+ hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA=";
};
buildInputs = [ olm ];
- vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0=";
+ vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U=";
doCheck = false;