aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-02-07 17:34:00 +0100
committerAlex Auvolat <alex@adnab.me>2024-02-08 12:33:09 +0100
commit33e6db8b72cc19ce140d3d52428d6d23ed364046 (patch)
tree40ae7b834d41f572f2ad253c3376dd9dc54c2fc6
parent3a49f860731cfe1ba9924a0041b78456af9565a4 (diff)
downloadgarage-33e6db8b72cc19ce140d3d52428d6d23ed364046.tar.gz
garage-33e6db8b72cc19ce140d3d52428d6d23ed364046.zip
[dep-upgrade-202402] update rustc to 1.73
-rw-r--r--flake.lock14
-rw-r--r--flake.nix8
-rw-r--r--nix/compile.nix2
3 files changed, 12 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock
index 8de99c3e..2479fb5a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,17 +95,17 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1682423271,
- "narHash": "sha256-WHhl1GiOij1ob4cTLL+yhqr+vFOUH8E5wAX8Ir8fvjE=",
+ "lastModified": 1707091808,
+ "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "94517a501434a627c5d9e72ac6e7f26174b978d3",
+ "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "94517a501434a627c5d9e72ac6e7f26174b978d3",
+ "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
"type": "github"
}
},
@@ -126,11 +126,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1682389182,
- "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
+ "lastModified": 1707271822,
+ "narHash": "sha256-/DZsoPH5GBzOpVEGz5PgJ7vh8Q6TcrJq5u8FcBjqAfI=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
+ "rev": "7a94fe7690d2bdfe1aab475382a505e14dc114a6",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index c3da239d..236b2310 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
description =
"Garage, an S3-compatible distributed object store for self-hosted deployments";
- # Nixpkgs unstable as of 2023-04-25, has rustc v1.68
+ # Nixpkgs 23.11 as of 2024-02-07, has rustc v1.73
inputs.nixpkgs.url =
- "github:NixOS/nixpkgs/94517a501434a627c5d9e72ac6e7f26174b978d3";
+ "github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e";
inputs.flake-compat.url = "github:nix-community/flake-compat";
@@ -17,9 +17,9 @@
# - rustc v1.66
# url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
- # Rust overlay as of 2023-04-25
+ # Rust overlay as of 2024-02-07
inputs.rust-overlay.url =
- "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c";
+ "github:oxalica/rust-overlay/7a94fe7690d2bdfe1aab475382a505e14dc114a6";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
diff --git a/nix/compile.nix b/nix/compile.nix
index efd88bbf..c51188fe 100644
--- a/nix/compile.nix
+++ b/nix/compile.nix
@@ -32,7 +32,7 @@ let
*/
toolchainOptions = if target == null || target == "x86_64-unknown-linux-musl"
|| target == "aarch64-unknown-linux-musl" then {
- rustVersion = "1.68.0";
+ rustVersion = "1.73.0";
extraRustComponents = [ "clippy" ];
} else {
rustToolchain = pkgs.symlinkJoin {