new way to build rootfs, should correctly merge directories now. Also, garbage collection prevention now working

Author: TyberiusPrime

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "anysnake2"
-version = "0.5.3"
+version = "0.6.0"
 authors = ["Florian Finkernagel <[email protected]>"]
 edition = "2018"
 

examples/dev/anysnake2.toml

@@ -27,6 +27,7 @@ packages = [ # use https://search.nixos.org/packages to search
 	"ripgrep",
 	"strace",
 	"which",
+	"mercurial", # good test case for breaking site-packages
 	] # optional
 
 [outside_nixpkgs]
@@ -48,12 +49,19 @@ ecosystem_date="2021-10-11" # you get whatever packages the solver would have pr
 
 [python.packages]
 # you can use version specifiers from https://www.python.org/dev/peps/pep-0440/#id53
-scipy=""
-pypipegraph2=">2.1"
-mbf_r = "editable/code"  # see [clones.code] below
-mbf_sampledata = "editable/code"
-dppd = "editable/code"
-dppd_plotnine = "editable/code"
+#scipy=""
+#pypipegraph2=">2.1"
+##mbf_r = "editable/code"  # see [clones.code] below
+#mbf_sampledata = "editable/code"
+#dppd = "editable/code"
+#dppd_plotnine = "editable/code"
+#mercurial="5.8"
+
+pypipegraph2=""
+jupyter=""
+requests=""
+dppd_plotnine=""
+
 # pandas="<1.0"
 
 [clones.code] # target directory

src/flake_template.nix

@@ -29,8 +29,7 @@
           in {
             script_file = script_file;
 
-            derivation = pkgs.runCommand name {
-            } ''
+            derivation = pkgs.runCommand name { } ''
               set -o pipefail
               shopt -s nullglob
               mkdir -p $out/rootfs/usr/lib
@@ -50,18 +49,26 @@
               done
 
               # the later entries shadow the earlier ones. and the python environment beats everything else
+              set -x
+              # python packages beat the others# python packages beat the others..
+              #${pkgs.xorg.lndir}/bin/lndir $mypy2/bin $out/rootfs/bin/ || true
               for path in $(tac ${script_file});
                  do
-                 ln -s $path/bin/* $out/rootfs/bin/ || true
-                 ln -s $path/etc/* $out/rootfs/etc || true
-                 ln -s $path/lib/* $out/rootfs/usr/lib/ || true
-                 ln -s $path/share/* $out/rootfs/usr/share/ || true
+                 ${pkgs.xorg.lndir}/bin/lndir $path/bin $out/rootfs/bin/ || true
+                 ${pkgs.xorg.lndir}/bin/lndir $path/etc $out/rootfs/etc || true
+                 ${pkgs.xorg.lndir}/bin/lndir $path/lib $out/rootfs/usr/lib/ || true
+                 ${pkgs.xorg.lndir}/bin/lndir $path/share $out/rootfs/usr/share/ || true
+                 # fi
               done
               ln -s $out/rootfs/bin $out/rootfs/usr/bin
+              #mkdir $out/python_env
+              #ln -s $mypy2/* $out/python_env
 
               mkdir -p $out/rootfs/etc/profile.d
               echo "export SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt" >>$out/rootfs/etc/bashrc # singularity pulls that from the env otherwise apperantly
               echo "export SSL_CERT_DIR=/etc/ssl/certs" >>$out/rootfs/etc/bashrc # singularity pulls that from the env otherwise apperantly
+              #echo "export PATH=/python_env/bin:/bin:/usr/bin/" >>$out/rootfs/etc/bashrc 
+              #echo "export PYTHONPATH=$PYTHONPATH:/python_env/lib/python%PYTHON_MAJOR_DOT_MINOR%/site-packages" >>$out/rootfs/etc/bashrc 
 
             '';
           };
@@ -146,14 +153,15 @@
         defaultPackage = buildSymlinkImage _args;
         sif_image = buildSingularityImage _args;
         devShell = pkgs.stdenv.mkDerivation {
-           name="anysnake2-devshell";
-           shellHook = ''
-             export PATH=${defaultPackage}/rootfs/bin:$PATH;
-             '';
-             nativeBuildInputs = with pkgs; [
-               #%DEVSHELL_INPUTS%
-           ];
-         };
+          name = "anysnake2-devshell";
+          shellHook = ''
+            export PATH=${defaultPackage}/rootfs/bin:$PATH;
+          '';
+          nativeBuildInputs = with pkgs;
+            [
+              #%DEVSHELL_INPUTS%
+            ];
+        };
       });
 
 }

src/flake_writer.rs

@@ -125,6 +125,7 @@ pub fn write_flake(
                 bail!(
                         format!("Python version must be x.y (not x.y.z ,z is given by nixpkgs version). Was '{}'", &python.version));
             }
+            let python_major_dot_minor = &python.version;
             let python_major_minor = format!("python{}", python.version.replace(".", ""));
 
             let mut out_python_packages = extract_non_editable_python_packages(python_packages)?;
@@ -155,6 +156,7 @@ pub fn write_flake(
             flake_contents
                 //.replace("%PYTHON_MAJOR_MINOR%", &python_major_minor)
                 .replace("%PYTHON_PACKAGES%", &out_python_packages)
+                .replace("%PYTHON_MAJOR_DOT_MINOR%", &python_major_dot_minor)
                 .replace("%PYPI_DEPS_DB_REV%", &pypi_debs_db_rev)
                 .replace(
                     "\"%MACHNIX%\"",

src/main.rs

@@ -1053,10 +1053,11 @@ fn symlink_for_sure<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> Res
         &original.as_ref(),
         &link.as_ref()
     );
-    if link.as_ref().exists() {
+    if std::fs::read_link(&link).is_ok(){ // ie it existed...
+        debug!("removing old symlink {:?}", &link.as_ref());
         std::fs::remove_file(&link)?;
     }
-    Ok(std::os::unix::fs::symlink(&original, &link)?)
+    Ok(std::os::unix::fs::symlink(&original, &link).with_context(||format!("Failed to symlink {:?} to {:?}", &original.as_ref(), &link.as_ref()))?)
 }
 
 pub fn register_nix_gc_root(url: &str, flake_dir: impl AsRef<Path>) -> Result<()> {
@@ -1094,7 +1095,7 @@ pub fn register_nix_gc_root(url: &str, flake_dir: impl AsRef<Path>) -> Result<()
                 let j: NixFlakePrefetchOutput = serde_json::from_str(&stdout)?;
                 symlink_for_sure(&j.storePath, &flake_symlink_here)?;
                 symlink_for_sure(
-                    &flake_symlink_here,
+                    &gc_roots.canonicalize()?.join(&without_hash.replace("/", "_")),
                     &gc_per_user_base.join(&format!(
                         "{}_{}",
                         &flake_hash,
@@ -1142,7 +1143,7 @@ pub fn register_nix_gc_root(url: &str, flake_dir: impl AsRef<Path>) -> Result<()
         })?;
         symlink_for_sure(store_path, &out_dir)?;
         symlink_for_sure(
-            &out_dir,
+            &out_dir.parent().context("parent not found")?.canonicalize()?.join(&url.replace("/", "_")),
             &gc_per_user_base.join(&format!("{}_{}", &flake_hash, &url.replace("/", "_"))),
         )?;
     }