From 477af55f8c29808b242a1d7113b2713725b314fa Mon Sep 17 00:00:00 2001 From: kurogeek Date: Mon, 26 Oct 2026 06:53:34 +0000 Subject: [PATCH] flake: switch nixpkgs to nixos-unstable, bump to 3ec6363 nixos-unstable dropped nixVersions.nix_2_31, which clan-core still pins for clan-cli (pkgs/clan-cli/flake-module.nix); override it to pkgs.nix in the devshell. --- flake.lock | 8 ++++---- flake.nix | 2 +- shell.nix | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 79018d30..d8f83f60 100644 --- a/flake.lock +++ b/flake.lock @@ -890,16 +890,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1792506237, - "narHash": "sha256-Q/8KLB6jNfpaUN1HAedE/u/Et9feE/zYSsutBLKrCFk=", + "lastModified": 1792773339, + "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5adc50831c259f87faeb09ddf930d43597197473", + "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8a52b7d4..66d01fa3 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ inputs.home-manager.follows = "home-manager"; }; import-tree.url = "github:vic/import-tree"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/shell.nix b/shell.nix index 001796aa..5b4cbd94 100644 --- a/shell.nix +++ b/shell.nix @@ -4,12 +4,14 @@ inputs.devshell.flakeModule ]; perSystem = - { system, ... }: + { pkgs, system, ... }: { devshells.default = { devshell = { packages = [ - inputs.clan-core.packages.${system}.clan-cli + # clan-core pins `nixVersions.nix_2_31` for a CI perf A/B test; + # nixos-unstable has dropped that attribute. Use nixpkgs' default nix. + (inputs.clan-core.packages.${system}.clan-cli.override { nix = pkgs.nix; }) ]; }; };