From 5a2ee1b9520ebb6fbb033a033558b181bcb8f411 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Apr 2025 17:11:55 +0200 Subject: [PATCH] Move libflake/flake/* to libflake (cherry picked from commit bc67e47298022d6d0bcc270421b01e0697d63030) --- maintainers/flake-module.nix | 10 +++++----- src/libflake/{flake => }/config.cc | 0 src/libflake/{flake => }/flake-primops.cc | 0 src/libflake/{flake => }/flake.cc | 0 src/libflake/{flake => }/flakeref.cc | 0 src/libflake/{flake => }/lockfile.cc | 0 src/libflake/meson.build | 14 +++++++------- src/libflake/{flake => }/settings.cc | 0 src/libflake/{flake => }/url-name.cc | 0 9 files changed, 12 insertions(+), 12 deletions(-) rename src/libflake/{flake => }/config.cc (100%) rename src/libflake/{flake => }/flake-primops.cc (100%) rename src/libflake/{flake => }/flake.cc (100%) rename src/libflake/{flake => }/flakeref.cc (100%) rename src/libflake/{flake => }/lockfile.cc (100%) rename src/libflake/{flake => }/settings.cc (100%) rename src/libflake/{flake => }/url-name.cc (100%) diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix index a8c52eb46..ff40b09d1 100644 --- a/maintainers/flake-module.nix +++ b/maintainers/flake-module.nix @@ -172,14 +172,14 @@ ''^src/libfetchers/include/nix/fetchers/tarball\.hh$'' ''^src/libfetchers/git\.cc$'' ''^src/libfetchers/mercurial\.cc$'' - ''^src/libflake/flake/config\.cc$'' - ''^src/libflake/flake/flake\.cc$'' + ''^src/libflake/config\.cc$'' + ''^src/libflake/flake\.cc$'' ''^src/libflake/include/nix/flake/flake\.hh$'' - ''^src/libflake/flake/flakeref\.cc$'' + ''^src/libflake/flakeref\.cc$'' ''^src/libflake/include/nix/flake/flakeref\.hh$'' - ''^src/libflake/flake/lockfile\.cc$'' + ''^src/libflake/lockfile\.cc$'' ''^src/libflake/include/nix/flake/lockfile\.hh$'' - ''^src/libflake/flake/url-name\.cc$'' + ''^src/libflake/url-name\.cc$'' ''^src/libmain/common-args\.cc$'' ''^src/libmain/include/nix/main/common-args\.hh$'' ''^src/libmain/loggers\.cc$'' diff --git a/src/libflake/flake/config.cc b/src/libflake/config.cc similarity index 100% rename from src/libflake/flake/config.cc rename to src/libflake/config.cc diff --git a/src/libflake/flake/flake-primops.cc b/src/libflake/flake-primops.cc similarity index 100% rename from src/libflake/flake/flake-primops.cc rename to src/libflake/flake-primops.cc diff --git a/src/libflake/flake/flake.cc b/src/libflake/flake.cc similarity index 100% rename from src/libflake/flake/flake.cc rename to src/libflake/flake.cc diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flakeref.cc similarity index 100% rename from src/libflake/flake/flakeref.cc rename to src/libflake/flakeref.cc diff --git a/src/libflake/flake/lockfile.cc b/src/libflake/lockfile.cc similarity index 100% rename from src/libflake/flake/lockfile.cc rename to src/libflake/lockfile.cc diff --git a/src/libflake/meson.build b/src/libflake/meson.build index f4c034490..bc8533e15 100644 --- a/src/libflake/meson.build +++ b/src/libflake/meson.build @@ -39,13 +39,13 @@ foreach header : [ endforeach sources = files( - 'flake/config.cc', - 'flake/flake.cc', - 'flake/flakeref.cc', - 'flake/lockfile.cc', - 'flake/flake-primops.cc', - 'flake/settings.cc', - 'flake/url-name.cc', + 'config.cc', + 'flake.cc', + 'flakeref.cc', + 'lockfile.cc', + 'flake-primops.cc', + 'settings.cc', + 'url-name.cc', ) subdir('include/nix/flake') diff --git a/src/libflake/flake/settings.cc b/src/libflake/settings.cc similarity index 100% rename from src/libflake/flake/settings.cc rename to src/libflake/settings.cc diff --git a/src/libflake/flake/url-name.cc b/src/libflake/url-name.cc similarity index 100% rename from src/libflake/flake/url-name.cc rename to src/libflake/url-name.cc