From 6e8bc92ca51d4fe61d3c7e2646c3ecc2ff701dee Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 5 Jan 2025 01:19:12 +0100 Subject: [PATCH] flake: fix nixpkgs lib test the bump to 24.11 broke this, and buildbot simply ignored it. great. Change-Id: I9a6c177c0679beb87891c05c34272c6c437c65fa --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index e5bd157e8..e4bb598a8 100644 --- a/flake.nix +++ b/flake.nix @@ -350,10 +350,10 @@ name = "nixpkgs-lib-tests"; paths = [ testWithNix ] - # FIXME: This is disabled on darwin due to a nixpkgs bug https://github.com/NixOS/nixpkgs/issues/319147 - # After that is fixed, it should be restored to use lib/tests/release.nix as before, rather than this reimplementation. + # NOTE: nixpkgs 24.11 is being ... *creative*, and requires this dance to override + # the evaluator used for the test. it will break again in the future, don't worry. ++ lib.optionals pkgs.stdenv.isLinux [ - (import (nixpkgs + "/pkgs/test/release") { inherit pkgs lib nix; }) + (pkgs.callPackage "${nixpkgs}/ci/eval" { nixVersions.nix_2_24 = nix; }).attrpathsSuperset ]; } );