diff options
author | Alex Auvolat <alex@adnab.me> | 2023-04-25 14:46:47 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-04-25 14:46:47 +0200 |
commit | 5efcdc0de3121da18e7531a9f8196ef38cecd93c (patch) | |
tree | eeca4d33aabec4150296f6c475224a8510563204 /nix | |
parent | a16eb7e4b8344d2f58c09a249b7b1bd17d339a35 (diff) | |
download | garage-nix-update-simplify.tar.gz garage-nix-update-simplify.zip |
Update rust toolchain to 1.68 and simplify Nix stuffnix-update-simplify
Diffstat (limited to 'nix')
-rw-r--r-- | nix/common.nix | 25 | ||||
-rw-r--r-- | nix/compile.nix | 2 | ||||
-rw-r--r-- | nix/kaniko.nix | 4 |
3 files changed, 13 insertions, 18 deletions
diff --git a/nix/common.nix b/nix/common.nix index 57f354dd..acc5ce7e 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -1,19 +1,14 @@ -rec { - # * Fixed dependencies - pkgsSrc = fetchTarball { - # As of 2022-10-13 +let + lock = builtins.fromJSON (builtins.readFile ../flake.lock); + flakeCompatRev = lock.nodes.flake-compat.locked.rev; + flakeCompat = fetchTarball { url = - "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip"; - sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s"; + "https://github.com/edolstra/flake-compat/archive/${flakeCompatRev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; }; - 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"; - }; - - # * Shared objects - cargo2nix = import cargo2nixSrc; + flake = ((import flakeCompat) { src = ../.; }).defaultNix; +in rec { + pkgsSrc = flake.inputs.nixpkgs; + cargo2nix = flake.inputs.cargo2nix; cargo2nixOverlay = cargo2nix.overlays.default; } diff --git a/nix/compile.nix b/nix/compile.nix index 54e920db..c2f557da 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.63.0"; + rustVersion = "1.68.0"; extraRustComponents = [ "clippy" ]; } else { rustToolchain = pkgs.symlinkJoin { diff --git a/nix/kaniko.nix b/nix/kaniko.nix index 64cadd14..8380fa2f 100644 --- a/nix/kaniko.nix +++ b/nix/kaniko.nix @@ -1,13 +1,13 @@ pkgs: pkgs.buildGoModule rec { pname = "kaniko"; - version = "1.6.0"; + version = "1.9.2"; src = pkgs.fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - sha256 = "1fnclr556avxay6pvgw5ya3xbxfnf2gv4njq2hr4fd6fcjyslq5h"; + sha256 = "dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY="; }; vendorSha256 = null; |