Test baseNameOf behaviour on the root of a flake

edolstra · Apr 30, 2024 · 2101916 · 2101916
1 parent 0950094
commit 2101916
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -1648,7 +1648,6 @@ static std::string_view legacyBaseNameOf(std::string_view path)
 static void prim_baseNameOf(EvalState & state, const PosIdx pos, Value * * args, Value & v)
 {
     NixStringContext context;
-    // FIXME: handle roots of source trees (should return "<hash>-source").
     v.mkString(legacyBaseNameOf(*state.coerceToString(pos, *args[0], context,
             "while evaluating the first argument passed to builtins.baseNameOf",
             false, false)), context);

diff --git a/tests/functional/flakes/common.sh b/tests/functional/flakes/common.sh
@@ -23,6 +23,8 @@ writeSimpleFlake() {
     legacyPackages.$system.hello = import ./simple.nix;
 
     parent = builtins.dirOf ./.;
+
+    baseName = builtins.baseNameOf ./.;
   };
 }
 EOF

diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
@@ -235,6 +235,9 @@ nix build -o "$TEST_ROOT/result" --expr "(builtins.getFlake \"git+file://$flake1
 # Regression test for dirOf on the root of the flake.
 [[ $(nix eval --json flake1#parent) = \""$NIX_STORE_DIR"\" ]]
 
+# Regression test for baseNameOf on the root of the flake.
+[[ $(nix eval --raw flake1#baseName) =~ ^[a-z0-9]*-source$ ]]
+
 # Building a flake with an unlocked dependency should fail in pure mode.
 (! nix build -o "$TEST_ROOT/result" flake2#bar --no-registries)
 (! nix build -o "$TEST_ROOT/result" flake2#bar --no-use-registries)
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ writeSimpleFlake() { @@
         legacyPackages.$system.hello = import ./simple.nix;
         parent = builtins.dirOf ./.;
+        baseName = builtins.baseNameOf ./.;
       };
     }
     EOF
@@ Expand Down @@