yolo/agent-of-empires
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

revert(nix): drop rust-overlay pin, fix cfg_select via nixpkgs lock bump (#2192)

Browse Source 
* Revert "fix(nix): pin rustc via rust-overlay so the Cachix build tracks stable (#2181)"

This reverts commit c6d7394550.

* chore(nix): bump nixpkgs lock so the toolchain ships rustc >= 1.93

Replaces the reverted rust-overlay approach (#2181). The Cachix build only
needs a rustc new enough for libsqlite3-sys 0.38.1's cfg_select! macro
(stable in 1.93+). Bumping the pinned nixpkgs input from 2026-02-17 to
2026-06-10 moves the default rustc 1.92.0 -> 1.95.0, which is sufficient,
without adding a separate toolchain input.

Verified locally: the flake evaluates and pkgs.rustc.version is 1.95.0.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Nathan Brake
2026-06-15 21:23:59 -04:00
committed by GitHub
parent c6d7394550
commit 5e8d69fd91
2 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+4 -25
View File
@@ -35,11 +35,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"lastModified": 1781074563,
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb",
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
"type": "github"
},
"original": {
@@ -68,28 +68,7 @@
"inputs": {
"crane": "crane",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1781493707,
"narHash": "sha256-lzf7qdQWuiY0T9VEbfH2CmP1LZQAYooU/sZuSgEJEBk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "06f25b8e40805beb2121a4dae4cc37d6f981800f",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
"nixpkgs": "nixpkgs"
}
}
},
flake.nix
+2 -18
View File
@@ -5,31 +5,15 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
crane.url = "github:ipetkov/crane";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs @ { flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
perSystem = { config, self', inputs', system, ... }:
perSystem = { config, self', inputs', pkgs, system, ... }:
let
pkgs = import inputs.nixpkgs {
inherit system;
overlays = [ (import inputs.rust-overlay) ];
};
# Pin an explicit stable rustc instead of inheriting whatever rustc
# the pinned nixpkgs happens to ship. nixpkgs lags stable, which
# broke the nix build when libsqlite3-sys 0.38.1 started using the
# cfg_select! macro (stable in rustc >= 1.93) while nixpkgs still
# shipped 1.92.0. Tracking latest stable here keeps the nix
# toolchain in step with the rustup-stable used by the regular CI.
rustToolchain = pkgs.rust-bin.stable.latest.default;
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain;
craneLib = inputs.crane.mkLib pkgs;
# git2 uses vendored-openssl (needs perl to build OpenSSL)
# and libgit2-sys vendors libgit2 (needs cmake to build it)