Merge pull request #13072 from NixOS/mergify/bp/2.28-maintenance/pr-13067

Move libflake/flake/* to libflake (backport #13067)

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/config\.cc$''
-              ''^src/libflake/flake/flake\.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$''

src/libflake/meson.build

@@ -39,13 +39,13 @@ foreach header : [
 endforeach
 
 sources = files(
-  'flake/config.cc',
+  'config.cc',
-  'flake/flake.cc',
+  'flake.cc',
-  'flake/flakeref.cc',
+  'flakeref.cc',
-  'flake/lockfile.cc',
+  'lockfile.cc',
-  'flake/flake-primops.cc',
+  'flake-primops.cc',
-  'flake/settings.cc',
+  'settings.cc',
-  'flake/url-name.cc',
+  'url-name.cc',
 )
 
 subdir('include/nix/flake')