Update to version 0.2 (#11)

Author: elegios

misc/packaging/flake.lock

@@ -2,7 +2,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    treeppl.url = "github:elegios/treeppl/nix-flake?dir=misc/packaging";
+    treeppl.url = "github:treeppl/treeppl?dir=misc/packaging";
     treeppl.inputs.nixpkgs.follows = "nixpkgs";
   };
 

misc/packaging/flake.nix

@@ -5,7 +5,7 @@
 
 let
   distribution = "treeppl";
-  version = "0.1";
+  version = "0.2";
   os =
     if stdenv.hostPlatform.isLinux then "linux" else
     if stdenv.hostPlatform.isDarwin then "macosx_11_0" else
@@ -15,7 +15,8 @@ let
     if stdenv.hostPlatform.isAarch64 then "arm64" else
       throw "Unsupported host architecture";
   platform = "${os}_${architecture}";
-  selfcontainedDir = lib.strings.removeSuffix ".tar.gz" tpplc-tmp-tar-gz.name;
+  selfcontainedDir = tpplc-tmp-tar-gz.passthru.path;
+  tarName = tpplc-tmp-tar-gz.passthru.tarName;
   args = {
     buildInputs = [ tinyxxd zip ];
   };
@@ -25,9 +26,10 @@ runCommand "treeppl-python" args ''
   # Actual content we care about
   cp -r ${nix-gitignore.gitignoreSource [] ../..}/treeppl .
   chmod +w treeppl
-  cp ${tpplc-tmp-tar-gz}/${tpplc-tmp-tar-gz.name} treeppl/${tpplc-tmp-tar-gz.name}
+  cp ${tpplc-tmp-tar-gz}/${tarName} treeppl/${tarName}
   substituteInPlace treeppl/base.py \
-    --replace-fail "@DEPLOYED_BASENAME@" "${selfcontainedDir}"
+    --replace-fail "@DEPLOYED_BASENAME@" "${selfcontainedDir}" \
+    --replace-fail "@TARBALL_NAME@" "${tarName}"
 
   # Wheel stuff that's needed for it to be valid
   mkdir -p ${distribution}-${version}.dist-info

misc/packaging/treeppl-python.nix

@@ -37,9 +37,10 @@ def get_tpplc_binary():
     #   differing deployed directories.
     tmp_dir = '/tmp'
     deployed_basename = "@DEPLOYED_BASENAME@" # This will be substituted by nix when building the wheel
+    tarball_name = "@TARBALL_NAME@" # This will be substituted by nix when building the wheel
     tppl_dir_path = os.path.join(tmp_dir, deployed_basename)
     if not os.path.isdir(tppl_dir_path):
-        with importlib.resources.path('treeppl', deployed_basename + ".tar.gz") as tarball:
+        with importlib.resources.path('treeppl', tarball_name) as tarball:
             with tarfile.open(tarball) as tar:
                 tar.extractall(tmp_dir)
     return os.path.join(tppl_dir_path, "tpplc")