chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-03-27 17:06:31 +02:00
parent c566c48045
commit 27dd7638fa
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 15 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1679870413,
"narHash": "sha256-iTPk5QJ9GiXhjaT9sgMfVtisLUAinD/EMHdVyk+whss=",
"lastModified": 1679925704,
"narHash": "sha256-JuJzz5nG23npgl6kmnXwwfMzMXu84G2UQ4K1wSqCVRA=",
"owner": "accentor",
"repo": "api",
"rev": "1026f332dbf33d97b5b2f87a0bb6150f23851158",
"rev": "d94859f2d3ee949078844fd486ecc475545c2a40",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1679916809,
"narHash": "sha256-H9MH9i4Cft5AL3jH+jLvysKvp32m/GRurrIOhRln/G4=",
"lastModified": 1679925837,
"narHash": "sha256-eDfoh48a2TVvtVr2QPDfJU13rcww3ru427oTCL5PlsM=",
"owner": "accentor",
"repo": "web",
"rev": "a07362f6c44fe32d934231b972915b5bd1ab333d",
"rev": "ef691b71e998543c2b8d4fb8f3427461ce2ec60a",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1679797994,
"narHash": "sha256-Kr/O/UlfqAtoFmkZeAaphsxogeaN8a/IugBApFzPfpk=",
"lastModified": 1679865578,
"narHash": "sha256-sYQmxxqIYL3QFsRYjW0AufhGur8qWfwoOGPGHRJZlGc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5f9d1bb572e08ec432ae46c78581919d837a90f6",
"rev": "4361baa782dc3d3b35fd455a1adc370681d9187c",
"type": "github"
},
"original": {
@ -322,11 +322,11 @@
},
"nur": {
"locked": {
"lastModified": 1679902832,
"narHash": "sha256-mBsCytKhTOdCZm7JgdGSTMR9MlN2IZcWNb3OmfLDiJE=",
"lastModified": 1679925818,
"narHash": "sha256-PEhj6cNqZDh49hPr4W7TMiwgHTcyNJCPGl/qq64/Law=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c8d9ac47c6c0713060583280ca22501c5da03e26",
"rev": "23b8a1051adacc9f1b06974a74ddf7113dc0fd4c",
"type": "github"
},
"original": {
@ -367,11 +367,11 @@
]
},
"locked": {
"lastModified": 1679870147,
"narHash": "sha256-ziJ0Uaq4AKmH1Dlhs1J0SwYb1egXJfJI8dZknDyzFso=",
"lastModified": 1679928198,
"narHash": "sha256-x6RYS58wkFqdkBwyXxWLLIWlKvoDEtNJB6ORo/+Eut8=",
"owner": "chvp",
"repo": "tetris",
"rev": "7084e7264135efc71792f94ed2fc003b9a110ea4",
"rev": "aa12cc98fa4444ae4736ddd53da10a7534c648a4",
"type": "github"
},
"original": {

70
patches/222364.patch
View file

@ -1,70 +0,0 @@
From 49c4f0707bea5d75888b35ad6ef1e921875f8ff9 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 21 Mar 2023 16:06:00 +0100
Subject: [PATCH] matrix-hookshot: 3.0.0 -> 3.0.1
https://github.com/matrix-org/matrix-hookshot/releases/tag/3.0.1
---
pkgs/servers/matrix-synapse/matrix-hookshot/default.nix | 2 +-
pkgs/servers/matrix-synapse/matrix-hookshot/package.json | 2 +-
pkgs/servers/matrix-synapse/matrix-hookshot/pin.json | 7 ++++---
pkgs/servers/matrix-synapse/matrix-hookshot/update.sh | 4 +++-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
index ae5ac99b6645c..840860f90d914 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
@@ -35,7 +35,7 @@ mkYarnPackage rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-bxDqv7KofinDuYDB1F0ZKWUQnz+ErU+OZc6i77nzM9Q=";
+ sha256 = data.cargoHash;
};
packageResolutions = {
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
index 8b9701d09d765..23aa4ad34d250 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-hookshot",
- "version": "3.0.0",
+ "version": "3.0.1",
"description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
"main": "lib/app.js",
"repository": "https://github.com/matrix-org/matrix-hookshot",
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
index b4c0f27ecfa02..bd8bc6de75121 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
@@ -1,5 +1,6 @@
{
- "version": "3.0.0",
- "srcHash": "2fuDV2h97VdBADygMeyk2B5etFKkQdNZeOWlhMD4hJk=",
- "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz"
+ "version": "3.0.1",
+ "srcHash": "GQfQWOyiI/rxRsj9GYoc2wPaG8phl+2d9Hulxrar5Jc=",
+ "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz",
+ "cargoHash": "/yEupeMwzTh/Ujbh2mPXXQbUCajFK/yl1QM3XmFS/Cc="
}
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh
index 4d91ec7533297..1ffde25917d20 100755
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh
@@ -26,10 +26,12 @@ yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
curl -O "$src/package.json"
+# There is no prefetcher for the cargo hash, but care should still be taken to update it
cat > pin.json << EOF
{
"version": "$version",
"srcHash": "$src_hash",
- "yarnHash": "$yarn_hash"
+ "yarnHash": "$yarn_hash",
+ "cargoHash": "0000000000000000000000000000000000000000000000000000"
}
EOF