From 8e8ca3c08186fd0c1e52b51e6125275d0820c913 Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Wed, 14 Oct 2026 15:18:37 +0200 Subject: [PATCH 1/2] nix: fix: update nix to 2.35.3 --- flake.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 868e74b69..8d41881a9 100644 --- a/flake.nix +++ b/flake.nix @@ -168,10 +168,18 @@ gradient-nix; }; - nix = final: prev: { - gradient-nix = ((prev.nixVersions.nixComponents_2_35.appendPatches ( + nix = final: prev: let + version = "2.35.3"; + src = prev.fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-qtlx8ywd1qj2ToZTNBunXE7JUajLtw44ja3r7+d47D4="; + }; + in { + gradient-nix = (((prev.nixVersions.nixComponents_2_35.overrideSource src).appendPatches ( map (patch: ./nix/patches/nix + "/${patch}") (builtins.attrNames (builtins.readDir ./nix/patches/nix)) - )).overrideScope (finalScope: prevScope: { withAWS = false; })).nix-everything; + )).overrideScope (finalScope: prevScope: { inherit version; withAWS = false; })).nix-everything; }; }; From e449155688032f7efb11ac6dc7a6f90df813e3e5 Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Wed, 14 Oct 2026 15:32:54 +0200 Subject: [PATCH 2/2] nix: fix: pin nix-bindings for nix 2.35.3 --- backend/Cargo.lock | 4 ++-- backend/Cargo.toml | 2 +- cli/Cargo.lock | 4 ++-- cli/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 24f51af20..f178bcd10 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -4744,7 +4744,7 @@ dependencies = [ [[package]] name = "nix-bindings" version = "0.2352.0" -source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Feval-metrics-stats#2ab37e6842365a4b4fda4ac3b403ebc2fc781bc3" +source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Fnix-2.35.3#b8aadf8622140447fa65ef4905a90da05c0510cc" dependencies = [ "nix-bindings-sys", ] @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "nix-bindings-sys" version = "0.2352.0" -source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Feval-metrics-stats#2ab37e6842365a4b4fda4ac3b403ebc2fc781bc3" +source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Fnix-2.35.3#b8aadf8622140447fa65ef4905a90da05c0510cc" dependencies = [ "bindgen", "cc", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 03c75e60d..1aa69e44c 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -219,7 +219,7 @@ debug = "line-tables-only" opt-level = 2 [patch.crates-io] -nix-bindings = { git = "https://github.com/DerDennisOP/nix-bindings", branch = "feat/eval-metrics-stats" } +nix-bindings = { git = "https://github.com/DerDennisOP/nix-bindings", branch = "feat/nix-2.35.3" } sqlx = { git = "https://github.com/launchbadge/sqlx", rev = "b54008a329541c0ce230d8b203e0c00fc8e8ea48" } sqlx-core = { git = "https://github.com/launchbadge/sqlx", rev = "b54008a329541c0ce230d8b203e0c00fc8e8ea48" } sqlx-macros = { git = "https://github.com/launchbadge/sqlx", rev = "b54008a329541c0ce230d8b203e0c00fc8e8ea48" } diff --git a/cli/Cargo.lock b/cli/Cargo.lock index 84077de97..e50dda6d3 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -2228,7 +2228,7 @@ dependencies = [ [[package]] name = "nix-bindings" version = "0.2352.0" -source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Feval-metrics-stats#2ab37e6842365a4b4fda4ac3b403ebc2fc781bc3" +source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Fnix-2.35.3#b8aadf8622140447fa65ef4905a90da05c0510cc" dependencies = [ "nix-bindings-sys", ] @@ -2236,7 +2236,7 @@ dependencies = [ [[package]] name = "nix-bindings-sys" version = "0.2352.0" -source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Feval-metrics-stats#2ab37e6842365a4b4fda4ac3b403ebc2fc781bc3" +source = "git+https://github.com/DerDennisOP/nix-bindings?branch=feat%2Fnix-2.35.3#b8aadf8622140447fa65ef4905a90da05c0510cc" dependencies = [ "bindgen", "cc", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 6e1054a48..50ef10ea1 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -145,4 +145,4 @@ tempfile = { workspace = true } wiremock = { workspace = true } [patch.crates-io] -nix-bindings = { git = "https://github.com/DerDennisOP/nix-bindings", branch = "feat/eval-metrics-stats" } +nix-bindings = { git = "https://github.com/DerDennisOP/nix-bindings", branch = "feat/nix-2.35.3" }