Merge pull request #9655 from iFreilicht/move-flake-url-name-util

Move url-name utility to libexpr/flake
2023-12-22 10:26:42 -05:00 · 2023-12-22 10:26:42 -05:00 · d65d56fa77
parent d2016c6b59 4b41118663
commit d65d56fa77
6 changed files with 4 additions and 3 deletions
--- a/src/libexpr/flake/url-name.cc
+++ b/src/libexpr/flake/url-name.cc
--- a/src/libexpr/flake/url-name.hh
+++ b/src/libexpr/flake/url-name.hh
--- 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>
--- a/tests/unit/libexpr/flake/flakeref.cc
+++ b/tests/unit/libexpr/flake/flakeref.cc
--- a/tests/unit/libexpr/flake/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 {
--- 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 \