max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Move url-name utility to libexpr/flake
This commit is contained in:
John Ericson 2023-12-22 10:26:42 -05:00 committed by GitHub
commit d65d56fa77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/libutil/url-name.cc → src/libexpr/flake/url-name.cc
View file

0
src/libutil/url-name.hh → src/libexpr/flake/url-name.hh
View file

2
src/nix/profile.cc
View file

@ -11,7 +11,7 @@
#include "profiles.hh" #include "profiles.hh"
#include "names.hh" #include "names.hh"
#include "url.hh" #include "url.hh"
#include "url-name.hh" #include "flake/url-name.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <regex> #include <regex>

0
tests/unit/libexpr/flakeref.cc → tests/unit/libexpr/flake/flakeref.cc
View file

2
tests/unit/libutil/url-name.cc → tests/unit/libexpr/flake/url-name.cc
View file

@ -1,4 +1,4 @@
#include "url-name.hh" #include "flake/url-name.hh"
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace nix { namespace nix {

3
tests/unit/libexpr/local.mk
View file

@ -16,7 +16,8 @@ endif
libexpr-tests_SOURCES := \ libexpr-tests_SOURCES := \
$(wildcard $(d)/*.cc) \ $(wildcard $(d)/*.cc) \
$(wildcard $(d)/value/*.cc) $(wildcard $(d)/value/*.cc) \
$(wildcard $(d)/flake/*.cc)
libexpr-tests_EXTRA_INCLUDES = \ libexpr-tests_EXTRA_INCLUDES = \
-I tests/unit/libexpr-support \ -I tests/unit/libexpr-support \