From 26d7b0c793b389b71218fc38e613d3f75ad72299 Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Thu, 21 Dec 2023 22:45:21 +0100
Subject: [PATCH 1/2] Move url-name utility to libexpr/flake

---
 src/{libutil => libexpr/flake}/url-name.cc        | 0
 src/{libutil => libexpr/flake}/url-name.hh        | 0
 src/nix/profile.cc                                | 2 +-
 tests/unit/{libutil => libexpr/flake}/url-name.cc | 2 +-
 tests/unit/libexpr/local.mk                       | 3 ++-
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{libutil => libexpr/flake}/url-name.cc (100%)
 rename src/{libutil => libexpr/flake}/url-name.hh (100%)
 rename tests/unit/{libutil => libexpr/flake}/url-name.cc (99%)

diff --git a/src/libutil/url-name.cc b/src/libexpr/flake/url-name.cc
similarity index 100%
rename from src/libutil/url-name.cc
rename to src/libexpr/flake/url-name.cc
diff --git a/src/libutil/url-name.hh b/src/libexpr/flake/url-name.hh
similarity index 100%
rename from src/libutil/url-name.hh
rename to src/libexpr/flake/url-name.hh
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 1d89815e2..abd56e4f4 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -11,7 +11,7 @@
 #include "profiles.hh"
 #include "names.hh"
 #include "url.hh"
-#include "url-name.hh"
+#include "flake/url-name.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>
diff --git a/tests/unit/libutil/url-name.cc b/tests/unit/libexpr/flake/url-name.cc
similarity index 99%
rename from tests/unit/libutil/url-name.cc
rename to tests/unit/libexpr/flake/url-name.cc
index f637efa89..84d32837c 100644
--- a/tests/unit/libutil/url-name.cc
+++ b/tests/unit/libexpr/flake/url-name.cc
@@ -1,4 +1,4 @@
-#include "url-name.hh"
+#include "flake/url-name.hh"
 #include <gtest/gtest.h>
 
 namespace nix {
diff --git a/tests/unit/libexpr/local.mk b/tests/unit/libexpr/local.mk
index 5743880d7..25810ad9c 100644
--- a/tests/unit/libexpr/local.mk
+++ b/tests/unit/libexpr/local.mk
@@ -16,7 +16,8 @@ endif
 
 libexpr-tests_SOURCES := \
     $(wildcard $(d)/*.cc) \
-    $(wildcard $(d)/value/*.cc)
+    $(wildcard $(d)/value/*.cc) \
+    $(wildcard $(d)/flake/*.cc)
 
 libexpr-tests_EXTRA_INCLUDES = \
     -I tests/unit/libexpr-support \

From 4b4111866358b39d5bfc352fa58040c8a54a2759 Mon Sep 17 00:00:00 2001
From: Felix Uhl <github@mail.felix-uhl.de>
Date: Fri, 22 Dec 2023 09:38:13 +0100
Subject: [PATCH 2/2] Move flakeref tests to new flake/ subdirectory

---
 tests/unit/libexpr/{ => flake}/flakeref.cc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/unit/libexpr/{ => flake}/flakeref.cc (100%)

diff --git a/tests/unit/libexpr/flakeref.cc b/tests/unit/libexpr/flake/flakeref.cc
similarity index 100%
rename from tests/unit/libexpr/flakeref.cc
rename to tests/unit/libexpr/flake/flakeref.cc