From f9c24d67b96f7d2cc4293ac8c3fbed70eb8328a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 17 Mar 2023 21:10:55 +0100 Subject: [PATCH 1/2] Add a test with flake.nix in a submodule I noticed a regression in the lazy-trees branch, which I'm trying to capture with this test. While the tests succeeds in master, the lazy-trees branch gives the following error message: error: access to path '/build/nix-test/tests/flakes/flake-in-submodule/rootRepo/submodule/flake.nix' is forbidden because it is not under Git control; maybe you should 'git add' it to the repository '/build/nix-test/tests/flakes/flake-in-submodule/rootRepo'? --- tests/flakes/flake-in-submodule.sh | 54 ++++++++++++++++++++++++++++++ tests/local.mk | 1 + 2 files changed, 55 insertions(+) create mode 100644 tests/flakes/flake-in-submodule.sh diff --git a/tests/flakes/flake-in-submodule.sh b/tests/flakes/flake-in-submodule.sh new file mode 100644 index 000000000..9df47921e --- /dev/null +++ b/tests/flakes/flake-in-submodule.sh @@ -0,0 +1,54 @@ +source common.sh + +# Tests that: +# - flake.nix may reside inside of a git submodule +# - the flake can access content outside of the submodule +# +# rootRepo +# ├── root.nix +# └── submodule +# ├── flake.nix +# └── sub.nix + + +requireGit + +clearStore + +# Submodules can't be fetched locally by default. +# See fetchGitSubmodules.sh +export XDG_CONFIG_HOME=$TEST_HOME/.config +git config --global protocol.file.allow always + + +rootRepo=$TEST_ROOT/rootRepo +subRepo=$TEST_ROOT/submodule + +rm -rf $rootRepo $subRepo $TEST_HOME/.cache/nix + + +createGitRepo $subRepo +cat > $subRepo/flake.nix < $subRepo/sub.nix +git -C $subRepo add flake.nix sub.nix +git -C $subRepo commit -m Initial + +createGitRepo $rootRepo + +git -C $rootRepo submodule init +git -C $rootRepo submodule add $subRepo submodule +echo '"expression in root repo"' > $rootRepo/root.nix +git -C $rootRepo add root.nix +git -C $rootRepo commit -m "Add root.nix" + +# Flake can live inside a submodule and can be accessed via ?dir=submodule +[[ $(nix eval --json git+file://$rootRepo\?submodules=1\&dir=submodule#sub ) = '"expression in submodule"' ]] +# The flake can access content outside of the submodule +[[ $(nix eval --json git+file://$rootRepo\?submodules=1\&dir=submodule#root ) = '"expression in root repo"' ]] diff --git a/tests/local.mk b/tests/local.mk index 4c4383c38..328f27e90 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -13,6 +13,7 @@ nix_tests = \ flakes/unlocked-override.sh \ flakes/absolute-paths.sh \ flakes/build-paths.sh \ + flakes/flake-in-submodule.sh \ ca/gc.sh \ gc.sh \ remote-store.sh \ From bf0c8c34e7c621999fdbf6f32be639d3a1495e17 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 18 Mar 2023 14:39:38 +0100 Subject: [PATCH 2/2] tests/flake-in-submodule: Remove unnecessary rm -rf --- tests/flakes/flake-in-submodule.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/flakes/flake-in-submodule.sh b/tests/flakes/flake-in-submodule.sh index 9df47921e..21a4b52de 100644 --- a/tests/flakes/flake-in-submodule.sh +++ b/tests/flakes/flake-in-submodule.sh @@ -24,8 +24,6 @@ git config --global protocol.file.allow always rootRepo=$TEST_ROOT/rootRepo subRepo=$TEST_ROOT/submodule -rm -rf $rootRepo $subRepo $TEST_HOME/.cache/nix - createGitRepo $subRepo cat > $subRepo/flake.nix <