From aea312dae39d8cf2c2409b03b54ca6520e29732c Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Tue, 5 Aug 2025 02:10:21 +0300 Subject: [PATCH] nix-cli: Move nix2 binaries sources properly into nix subproject There have been prior concerns about reogranizing the repo, but this seems like a trivial simplification which will not interfere with either our packaging or the modular builds in nixpkgs. --- src/internal-api-docs/doxygen.cfg.in | 4 +-- src/nix/build-remote | 1 - src/{ => nix}/build-remote/build-remote.cc | 0 src/nix/nix-build | 1 - src/{ => nix}/nix-build/nix-build.cc | 0 src/nix/nix-channel | 1 - src/{ => nix}/nix-channel/nix-channel.cc | 0 src/{ => nix}/nix-channel/unpack-channel.nix | 0 src/nix/nix-collect-garbage | 1 - .../nix-collect-garbage.cc | 0 src/nix/nix-copy-closure | 1 - .../nix-copy-closure/nix-copy-closure.cc | 0 src/nix/nix-env | 1 - src/{ => nix}/nix-env/buildenv.nix | 0 src/{ => nix}/nix-env/nix-env.cc | 0 src/{ => nix}/nix-env/user-env.cc | 0 src/{ => nix}/nix-env/user-env.hh | 0 src/nix/nix-instantiate | 1 - .../nix-instantiate/nix-instantiate.cc | 0 src/nix/nix-store | 1 - src/{ => nix}/nix-store/dotgraph.cc | 0 src/{ => nix}/nix-store/dotgraph.hh | 0 src/{ => nix}/nix-store/graphml.cc | 0 src/{ => nix}/nix-store/graphml.hh | 0 src/{ => nix}/nix-store/nix-store.cc | 0 src/nix/package.nix | 35 ++++--------------- 26 files changed, 8 insertions(+), 39 deletions(-) delete mode 120000 src/nix/build-remote rename src/{ => nix}/build-remote/build-remote.cc (100%) delete mode 120000 src/nix/nix-build rename src/{ => nix}/nix-build/nix-build.cc (100%) delete mode 120000 src/nix/nix-channel rename src/{ => nix}/nix-channel/nix-channel.cc (100%) rename src/{ => nix}/nix-channel/unpack-channel.nix (100%) delete mode 120000 src/nix/nix-collect-garbage rename src/{ => nix}/nix-collect-garbage/nix-collect-garbage.cc (100%) delete mode 120000 src/nix/nix-copy-closure rename src/{ => nix}/nix-copy-closure/nix-copy-closure.cc (100%) delete mode 120000 src/nix/nix-env rename src/{ => nix}/nix-env/buildenv.nix (100%) rename src/{ => nix}/nix-env/nix-env.cc (100%) rename src/{ => nix}/nix-env/user-env.cc (100%) rename src/{ => nix}/nix-env/user-env.hh (100%) delete mode 120000 src/nix/nix-instantiate rename src/{ => nix}/nix-instantiate/nix-instantiate.cc (100%) delete mode 120000 src/nix/nix-store rename src/{ => nix}/nix-store/dotgraph.cc (100%) rename src/{ => nix}/nix-store/dotgraph.hh (100%) rename src/{ => nix}/nix-store/graphml.cc (100%) rename src/{ => nix}/nix-store/graphml.hh (100%) rename src/{ => nix}/nix-store/nix-store.cc (100%) diff --git a/src/internal-api-docs/doxygen.cfg.in b/src/internal-api-docs/doxygen.cfg.in index 950497ca3..2769edd9f 100644 --- a/src/internal-api-docs/doxygen.cfg.in +++ b/src/internal-api-docs/doxygen.cfg.in @@ -57,9 +57,7 @@ INPUT = \ @src@/libutil/args \ @src@/libutil-tests \ @src@/libutil-test-support/tests \ - @src@/nix \ - @src@/nix-env \ - @src@/nix-store + @src@/nix # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names # in the source code. If set to NO, only conditional compilation will be diff --git a/src/nix/build-remote b/src/nix/build-remote deleted file mode 120000 index 2cea44d46..000000000 --- a/src/nix/build-remote +++ /dev/null @@ -1 +0,0 @@ -../build-remote \ No newline at end of file diff --git a/src/build-remote/build-remote.cc b/src/nix/build-remote/build-remote.cc similarity index 100% rename from src/build-remote/build-remote.cc rename to src/nix/build-remote/build-remote.cc diff --git a/src/nix/nix-build b/src/nix/nix-build deleted file mode 120000 index 2954d8ac7..000000000 --- a/src/nix/nix-build +++ /dev/null @@ -1 +0,0 @@ -../nix-build \ No newline at end of file diff --git a/src/nix-build/nix-build.cc b/src/nix/nix-build/nix-build.cc similarity index 100% rename from src/nix-build/nix-build.cc rename to src/nix/nix-build/nix-build.cc diff --git a/src/nix/nix-channel b/src/nix/nix-channel deleted file mode 120000 index 29b759473..000000000 --- a/src/nix/nix-channel +++ /dev/null @@ -1 +0,0 @@ -../nix-channel \ No newline at end of file diff --git a/src/nix-channel/nix-channel.cc b/src/nix/nix-channel/nix-channel.cc similarity index 100% rename from src/nix-channel/nix-channel.cc rename to src/nix/nix-channel/nix-channel.cc diff --git a/src/nix-channel/unpack-channel.nix b/src/nix/nix-channel/unpack-channel.nix similarity index 100% rename from src/nix-channel/unpack-channel.nix rename to src/nix/nix-channel/unpack-channel.nix diff --git a/src/nix/nix-collect-garbage b/src/nix/nix-collect-garbage deleted file mode 120000 index b037fc1b0..000000000 --- a/src/nix/nix-collect-garbage +++ /dev/null @@ -1 +0,0 @@ -../nix-collect-garbage \ No newline at end of file diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix/nix-collect-garbage/nix-collect-garbage.cc similarity index 100% rename from src/nix-collect-garbage/nix-collect-garbage.cc rename to src/nix/nix-collect-garbage/nix-collect-garbage.cc diff --git a/src/nix/nix-copy-closure b/src/nix/nix-copy-closure deleted file mode 120000 index 9063c583a..000000000 --- a/src/nix/nix-copy-closure +++ /dev/null @@ -1 +0,0 @@ -../nix-copy-closure \ No newline at end of file diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix/nix-copy-closure/nix-copy-closure.cc similarity index 100% rename from src/nix-copy-closure/nix-copy-closure.cc rename to src/nix/nix-copy-closure/nix-copy-closure.cc diff --git a/src/nix/nix-env b/src/nix/nix-env deleted file mode 120000 index f2f19f580..000000000 --- a/src/nix/nix-env +++ /dev/null @@ -1 +0,0 @@ -../nix-env \ No newline at end of file diff --git a/src/nix-env/buildenv.nix b/src/nix/nix-env/buildenv.nix similarity index 100% rename from src/nix-env/buildenv.nix rename to src/nix/nix-env/buildenv.nix diff --git a/src/nix-env/nix-env.cc b/src/nix/nix-env/nix-env.cc similarity index 100% rename from src/nix-env/nix-env.cc rename to src/nix/nix-env/nix-env.cc diff --git a/src/nix-env/user-env.cc b/src/nix/nix-env/user-env.cc similarity index 100% rename from src/nix-env/user-env.cc rename to src/nix/nix-env/user-env.cc diff --git a/src/nix-env/user-env.hh b/src/nix/nix-env/user-env.hh similarity index 100% rename from src/nix-env/user-env.hh rename to src/nix/nix-env/user-env.hh diff --git a/src/nix/nix-instantiate b/src/nix/nix-instantiate deleted file mode 120000 index 2d7502ffa..000000000 --- a/src/nix/nix-instantiate +++ /dev/null @@ -1 +0,0 @@ -../nix-instantiate \ No newline at end of file diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix/nix-instantiate/nix-instantiate.cc similarity index 100% rename from src/nix-instantiate/nix-instantiate.cc rename to src/nix/nix-instantiate/nix-instantiate.cc diff --git a/src/nix/nix-store b/src/nix/nix-store deleted file mode 120000 index e6efcac42..000000000 --- a/src/nix/nix-store +++ /dev/null @@ -1 +0,0 @@ -../nix-store/ \ No newline at end of file diff --git a/src/nix-store/dotgraph.cc b/src/nix/nix-store/dotgraph.cc similarity index 100% rename from src/nix-store/dotgraph.cc rename to src/nix/nix-store/dotgraph.cc diff --git a/src/nix-store/dotgraph.hh b/src/nix/nix-store/dotgraph.hh similarity index 100% rename from src/nix-store/dotgraph.hh rename to src/nix/nix-store/dotgraph.hh diff --git a/src/nix-store/graphml.cc b/src/nix/nix-store/graphml.cc similarity index 100% rename from src/nix-store/graphml.cc rename to src/nix/nix-store/graphml.cc diff --git a/src/nix-store/graphml.hh b/src/nix/nix-store/graphml.hh similarity index 100% rename from src/nix-store/graphml.hh rename to src/nix/nix-store/graphml.hh diff --git a/src/nix-store/nix-store.cc b/src/nix/nix-store/nix-store.cc similarity index 100% rename from src/nix-store/nix-store.cc rename to src/nix/nix-store/nix-store.cc diff --git a/src/nix/package.nix b/src/nix/package.nix index 3d4f6f40b..8195e6c6f 100644 --- a/src/nix/package.nix +++ b/src/nix/package.nix @@ -33,15 +33,7 @@ mkMesonExecutable (finalAttrs: { # Symbolic links to other dirs ## exes - ./build-remote ./doc - ./nix-build - ./nix-channel - ./nix-collect-garbage - ./nix-copy-closure - ./nix-env - ./nix-instantiate - ./nix-store ## dirs ./scripts ../../scripts @@ -55,8 +47,8 @@ mkMesonExecutable (finalAttrs: { ../../doc/manual/generate-store-info.nix # Other files to be included as string literals - ../nix-channel/unpack-channel.nix - ../nix-env/buildenv.nix + ./nix-channel/unpack-channel.nix + ./nix-env/buildenv.nix ./get-env.sh ./help-stores.md ../../doc/manual/source/store/types/index.md.in @@ -65,24 +57,11 @@ mkMesonExecutable (finalAttrs: { # Files ] - ++ - lib.concatMap - (dir: [ - (fileset.fileFilter (file: file.hasExt "cc") dir) - (fileset.fileFilter (file: file.hasExt "hh") dir) - (fileset.fileFilter (file: file.hasExt "md") dir) - ]) - [ - ./. - ../build-remote - ../nix-build - ../nix-channel - ../nix-collect-garbage - ../nix-copy-closure - ../nix-env - ../nix-instantiate - ../nix-store - ] + ++ [ + (fileset.fileFilter (file: file.hasExt "cc") ./.) + (fileset.fileFilter (file: file.hasExt "hh") ./.) + (fileset.fileFilter (file: file.hasExt "md") ./.) + ] ); buildInputs = [