From 5e887094c38d9ff65f1e1b8881375193000f3804 Mon Sep 17 00:00:00 2001
From: Valentin Gagarin <valentin.gagarin@tweag.io>
Date: Wed, 11 Jun 2025 18:23:27 +0200
Subject: [PATCH] normalise, remove unrelated

---
 default.nix                           | 5 ++++-
 deployment/check/cli/flake-part.nix   | 2 +-
 panel/env.nix                         | 8 ++++----
 panel/nix/package.nix                 | 2 +-
 panel/nix/python-packages/default.nix | 2 +-
 panel/shell.nix                       | 2 +-
 shell.nix                             | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/default.nix b/default.nix
index 4c71ec49..2c631d6a 100644
--- a/default.nix
+++ b/default.nix
@@ -18,7 +18,10 @@ let
       };
     }).run
       {
-        src = ./.;
+        src = builtins.path {
+          path = ./.;
+          name = "source";
+        };
         hooks =
           let
             ## Add a directory here if pre-commit hooks shouldn't apply to it.
diff --git a/deployment/check/cli/flake-part.nix b/deployment/check/cli/flake-part.nix
index 6bbc2eaf..ac6ce40e 100644
--- a/deployment/check/cli/flake-part.nix
+++ b/deployment/check/cli/flake-part.nix
@@ -60,7 +60,7 @@ in
         (import (
           builtins.path {
             path = ../..;
-            name = "deployment";
+            name = "source";
           }
         ))
           {
diff --git a/panel/env.nix b/panel/env.nix
index af1f4096..07ce4193 100644
--- a/panel/env.nix
+++ b/panel/env.nix
@@ -3,11 +3,11 @@
   pkgs,
   ...
 }:
+let
+  inherit (builtins) toString;
+in
 {
-  REPO_DIR = builtins.path {
-    path = ../.;
-    name = "root";
-  };
+  REPO_DIR = toString ../.;
   # explicitly use nix, as e.g. lix does not have configurable-impure-env
   BIN_PATH = lib.makeBinPath [
     # explicitly use nix, as e.g. lix does not have configurable-impure-env
diff --git a/panel/nix/package.nix b/panel/nix/package.nix
index e1859bb2..e13e015a 100644
--- a/panel/nix/package.nix
+++ b/panel/nix/package.nix
@@ -14,7 +14,7 @@ let
       root = ../src;
       fileset = intersection (gitTracked ../../.) ../src;
     };
-  pyproject = fromTOML pyproject-toml;
+  pyproject = with lib; fromTOML pyproject-toml;
   # TODO: define this globally
   name = "panel";
   # TODO: we may want this in a file so it's easier to read statically
diff --git a/panel/nix/python-packages/default.nix b/panel/nix/python-packages/default.nix
index d3481398..0405c928 100644
--- a/panel/nix/python-packages/default.nix
+++ b/panel/nix/python-packages/default.nix
@@ -21,7 +21,7 @@ let
     let
       dir = builtins.path {
         path = ./.;
-        name = "python-packages";
+        name = "source";
       };
     in
     with builtins;
diff --git a/panel/shell.nix b/panel/shell.nix
index 85db36d2..65b28312 100644
--- a/panel/shell.nix
+++ b/panel/shell.nix
@@ -1,4 +1,4 @@
 (import (builtins.path {
   path = ./.;
-  name = "panel";
+  name = "source";
 }) { }).shell
diff --git a/shell.nix b/shell.nix
index 0cec318c..65b28312 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
 (import (builtins.path {
   path = ./.;
-  name = "root";
+  name = "source";
 }) { }).shell