fix(images): improve jupyter and base

wi2trier · Nov 17, 2024 · 10f4fe5 · 10f4fe5
1 parent bd058f9
commit 10f4fe5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/flake-modules/images.nix b/flake-modules/images.nix
@@ -4,7 +4,7 @@
     { config, pkgs, ... }:
     {
       packages = {
-        image-base = pkgs.callPackage ../images/base.nix { };
+        image-base = pkgs.callPackage ../images/base.nix { name = "base"; };
         image-jupyter = pkgs.callPackage ../images/jupyter.nix { base = config.packages.image-base; };
         image-poetry = pkgs.callPackage ../images/poetry.nix { base = config.packages.image-base; };
         image-uv = pkgs.callPackage ../images/uv.nix { base = config.packages.image-base; };

diff --git a/images/base.nix b/images/base.nix
@@ -14,7 +14,7 @@
   glibc,
   gcc,
   nix-ld,
-  name ? "base",
+  name,
   contents ? [ ],
   entrypoint ? [ "/bin/sh" ],
   cmd ? [ ],

diff --git a/images/jupyter.nix b/images/jupyter.nix
@@ -14,7 +14,10 @@ let
       echo "Remove '${venvPath}' to force venv recreation with 'rm -rf ${venvPath}'"
     else
       echo "Creating new venv environment in path: '${venvPath}'"
-      ${lib.getExe uv} venv --seed ${venvPath}
+      ${lib.getExe uv} venv \
+        --seed \
+        --python ${lib.getExe python3} \
+        ${venvPath}
       ${lib.getExe uv} pip install \
         cbrkit \
         jupyterlab \
@@ -31,7 +34,6 @@ let
         torch \
         transformers \
         ;
-
     fi
   '';
 
@@ -50,14 +52,13 @@ let
   );
 in
 base.override {
+  name = "jupyter";
   entrypoint = [ (lib.getExe entrypoint) ];
-  contents = [
-    python3
-    uv
-  ];
+  contents = [ uv ];
   env = {
     VIRTUAL_ENV = venvPath;
     UV_PYTHON_PREFERENCE = "only-system";
+    UV_PYTHON_DOWNLOADS = "never";
     PATH = lib.concatStringsSep ":" [
       "${venvPath}/bin"
       "/usr/local/bin"