From 04fcc879e6b13373a144b68df1c035e7adf53226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 Apr 2025 11:28:02 +0200
Subject: [PATCH] Revert "Actually ignore system/user registries during
 locking"

This reverts commit 77d4316353deaf8f429025738891b625eb0b5d8a.

(cherry picked from commit 3b5f0d9fb3af870b832bdcadcf8080649bcd0cd5)
---
 src/libflake/flakeref.cc          | 2 +-
 tests/functional/flakes/flakes.sh | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/libflake/flakeref.cc b/src/libflake/flakeref.cc
index 1580c2846..6e95eb767 100644
--- a/src/libflake/flakeref.cc
+++ b/src/libflake/flakeref.cc
@@ -39,7 +39,7 @@ FlakeRef FlakeRef::resolve(
     ref<Store> store,
     const fetchers::RegistryFilter & filter) const
 {
-    auto [input2, extraAttrs] = lookupInRegistries(store, input, filter);
+    auto [input2, extraAttrs] = lookupInRegistries(store, input);
     return FlakeRef(std::move(input2), fetchers::maybeGetStrAttr(extraAttrs, "dir").value_or(subdir));
 }
 
diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index b67a0964a..d8c9f254d 100755
--- a/tests/functional/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
@@ -220,13 +220,6 @@ nix store gc
 nix registry list --flake-registry "file://$registry" --refresh | grepQuiet flake3
 mv "$registry.tmp" "$registry"
 
-# Ensure that locking ignores the user registry.
-mkdir -p "$TEST_HOME/.config/nix"
-ln -sfn "$registry" "$TEST_HOME/.config/nix/registry.json"
-nix flake metadata flake1
-expectStderr 1 nix flake update --flake-registry '' --flake "$flake3Dir" | grepQuiet "cannot find flake 'flake:flake1' in the flake registries"
-rm "$TEST_HOME/.config/nix/registry.json"
-
 # Test whether flakes are registered as GC roots for offline use.
 # FIXME: use tarballs rather than git.
 rm -rf "$TEST_HOME/.cache"