aboutsummaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorAlex <lx@deuxfleurs.fr>2025-01-13 10:19:53 +0000
committerAlex <lx@deuxfleurs.fr>2025-01-13 10:19:53 +0000
commit39ac034de55c7040b61a08ecb95c58afa983501c (patch)
tree9776372019bdc60906e65e0021a09bf4b5d856c5 /flake.nix
parent4b1a7fb5e3c2f6a58780165955e49d8e24a1d018 (diff)
parent8ddb0dd485cf8290b7e3462f5614ca6d858ea8c3 (diff)
downloadgarage-39ac034de55c7040b61a08ecb95c58afa983501c.tar.gz
garage-39ac034de55c7040b61a08ecb95c58afa983501c.zip
Merge pull request 'update toolchain' (#924) from nix-update into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/924
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/flake.nix b/flake.nix
index e690aef1..b1cb7dbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,24 +2,27 @@
description =
"Garage, an S3-compatible distributed object store for self-hosted deployments";
- # Nixpkgs 24.05 as of 2024-08-26 has rustc v1.77
+ # Nixpkgs 24.11 as of 2025-01-12 has rustc v1.82
inputs.nixpkgs.url =
- "github:NixOS/nixpkgs/0239aeb2f82ea27ccd6b61582b8f7fb8750eeada";
+ "github:NixOS/nixpkgs/7c4869c47090dd7f9f1bdfb49a22aea026996815";
inputs.flake-compat.url = "github:nix-community/flake-compat";
inputs.cargo2nix = {
# As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
- url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
+ #url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
# As of 2023-04-25:
# - my two patches were merged into unstable (one for clippy and one to "fix" feature detection)
# - rustc v1.66
# url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
- # Rust overlay as of 2024-08-26
+ # Mainline cargo2nix as of of 2025-01-12 (branch release-0.11.0)
+ url = "github:cargo2nix/cargo2nix/ae19a9e1f8f0880c088ea155ab66cee1fa001f59";
+
+ # Rust overlay as of 2025-01-12
inputs.rust-overlay.url =
- "github:oxalica/rust-overlay/19b70f147b9c67a759e35824b241f1ed92e46694";
+ "github:oxalica/rust-overlay/162ab0edc2936508470199b2e8e6c444a2535019";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";