aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <lx@deuxfleurs.fr>2025-01-04 15:43:41 +0000
committerAlex <lx@deuxfleurs.fr>2025-01-04 15:43:41 +0000
commitd2246baab7d8716f4bf3287ade6f3195fa1a949c (patch)
tree23a6a6f1d6ba3a2748aec320e39cdf8330ca29fd
parentb8f301a61d633354762918ca63eb5fc02de52f5f (diff)
parentafac1d4d4a77aa83f9adb48a57f942c0538beb43 (diff)
downloadgarage-d2246baab7d8716f4bf3287ade6f3195fa1a949c.tar.gz
garage-d2246baab7d8716f4bf3287ade6f3195fa1a949c.zip
Merge pull request 'update flake.lock' (#918) from update-flake into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/918
-rw-r--r--flake.lock24
1 files changed, 6 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock
index a8ebe3c2..bc9431a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,22 +58,6 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1724395761,
- "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
"lastModified": 1724681257,
"narHash": "sha256-EJRuc5Qp7yfXko5ZNeEMYAs4DzAvkCyALuJ/tGllhN4=",
"owner": "NixOS",
@@ -96,12 +80,15 @@
"cargo2nix",
"flake-utils"
],
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs"
}
},
"rust-overlay": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": [
+ "cargo2nix",
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1724638882,
@@ -114,6 +101,7 @@
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
+ "rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
"type": "github"
}
}