shell: cleanup 26.05 x86_64-darwin special case

Move the 26.05 x86_64-darwin special case directly into the `nixpkgs`
parameter default, avoiding the need for a `nixpkgs'` binding.

This allows reverting the formatting change to the `inherit (import ./ci { … })`
line, making post-26.05 cleanup easier.

Follow-up-to: f86bce2497
This commit is contained in:
Matt Sturgeon
2026-07-26 20:46:54 +01:00
parent e7a6fc44d8
commit a20ff8c3fb
+9 -19
View File
@@ -13,15 +13,10 @@
#
{
system ? builtins.currentSystem,
nixpkgs ? null,
}:
let
version = builtins.readFile ./.version;
# On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin.
# TODO: remove after 26.05 support ends.
nixpkgs' =
if nixpkgs == null && system == "x86_64-darwin" && version == "26.05" then
nixpkgs ? (
# On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin.
# TODO: remove after 26.05 support ends.
if system == "x86_64-darwin" && (builtins.readFile ./.version) == "26.05" then
let
pinned = (builtins.fromJSON (builtins.readFile ./ci/pinned.json)).pins;
warn = builtins.warn or (import ./lib).warn;
@@ -44,16 +39,11 @@ let
sha256 = hash;
}
else
nixpkgs;
inherit
(import ./ci {
inherit system;
nixpkgs = nixpkgs';
})
pkgs
fmt
;
null
),
}:
let
inherit (import ./ci { inherit nixpkgs system; }) pkgs fmt;
# For `nix-shell -A hello`
curPkgs = removeAttrs (import ./. { inherit system; }) [