diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-09 12:43:10 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-09 13:21:37 +0100 |
| commit | b337895fcefd35d2a1c8965fe30c8eecb5dcd964 (patch) | |
| tree | 69c98f1ac53385dada8ac0a5e738756c395ad6b8 /nix | |
| parent | 49b5d18554c67b84777d97f24423207c2375ae5e (diff) | |
| download | garage-b337895fcefd35d2a1c8965fe30c8eecb5dcd964.tar.gz garage-b337895fcefd35d2a1c8965fe30c8eecb5dcd964.zip | |
Update Rust Nix toolchain
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/common.nix | 8 | ||||
| -rw-r--r-- | nix/compile.nix | 2 | ||||
| -rw-r--r-- | nix/kaniko.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nix/common.nix b/nix/common.nix index 90e3afaf..80b89102 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -3,15 +3,15 @@ rec { * Fixed dependencies */ pkgsSrc = fetchTarball { - # As of 2022-10-13 - url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip"; - sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s"; + # As of 2023-01-09 + url = "https://github.com/NixOS/nixpkgs/archive/baed728abe983508cabc99d05cccc164fe748744.zip"; + sha256 = "1m7kmcjhnj3lx7xqs0nh262c4nxs5n8p7k9g6kc4gv1k5nrcrnpf"; }; cargo2nixSrc = fetchGit { # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection url = "https://github.com/Alexis211/cargo2nix"; ref = "custom_unstable"; - rev = "a7a61179b66054904ef6a195d8da736eaaa06c36"; + rev = "505caa32110d42ee03bd68b47031142eff9c827b"; }; /* diff --git a/nix/compile.nix b/nix/compile.nix index 3ea5035e..5c6b02e3 100644 --- a/nix/compile.nix +++ b/nix/compile.nix @@ -42,7 +42,7 @@ let */ toolchainOptions = if target == null || target == "x86_64-unknown-linux-musl" || target == "aarch64-unknown-linux-musl" then { - rustVersion = "1.63.0"; + rustVersion = "1.65.0"; extraRustComponents = [ "clippy" ]; } else { rustToolchain = pkgs.symlinkJoin { diff --git a/nix/kaniko.nix b/nix/kaniko.nix index 140328b8..e27aaee3 100644 --- a/nix/kaniko.nix +++ b/nix/kaniko.nix @@ -7,7 +7,7 @@ pkgs.buildGoModule rec { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - sha256 = "1fnclr556avxay6pvgw5ya3xbxfnf2gv4njq2hr4fd6fcjyslq5h"; + sha256 = "TXgzO/NfLXVo5a7yyO3XYSk+9H1CwMF+vwbRx3kchQ8="; }; vendorSha256 = null; |