Get rid of custom fetchgit

codedownio · Nov 26, 2022 · 29353ef · 29353ef
1 parent 0bab98b
commit 29353ef
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 557 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,6 @@ This will create a few files:
 * `packages.nix`: Nix expressions for the packages and artifacts.
 * `common.nix`: common code for building your environment. Please don't edit this by hand.
 * `default.nix`: the main entry point. You can edit some settings in here.
-* `fetchgit`: this contains a patched version of the Nix fetchgit function, necessary until [this PR](https://github.com/NixOS/nixpkgs/pull/104714) lands.
 
 > You should make sure the `baseJulia` in `default.nix` matches the Julia version you used in Step 1.
 

diff --git a/julia2nix b/julia2nix
@@ -25,12 +25,6 @@ def main():
     # Always copy the common code
     shutil.copy(script_dir.joinpath("templates").joinpath("common.nix"), output_dir)
 
-    # Always copy the modified fetchgit
-    fetchgit_dest = output_dir.joinpath("fetchgit")
-    if fetchgit_dest.exists():
-        shutil.rmtree(fetchgit_dest)
-    shutil.copytree(script_dir.joinpath("templates").joinpath("fetchgit"), fetchgit_dest)
-
     # Only copy default.nix if it doesn't exist yet, since the user is meant to modify it
     if not output_dir.joinpath("default.nix").exists():
         shutil.copy(script_dir.joinpath("templates").joinpath("default.nix"), output_dir)

diff --git a/templates/common.nix b/templates/common.nix
@@ -5,6 +5,7 @@
   git,
   stdenvNoCC,
   cacert,
+  fetchgit,
   jq,
   julia,
   lib,
@@ -21,10 +22,6 @@
 }:
 
 let
-  # We need to use a specially modified fetchgit that understands tree hashes, until
-  # https://github.com/NixOS/nixpkgs/pull/104714 lands
-  fetchgit = callPackage ./fetchgit {};
-
   packages = callPackage ./packages.nix {};
 
   ### Repoify packages

diff --git a/templates/fetchgit/builder.sh b/templates/fetchgit/builder.sh
diff --git a/templates/fetchgit/default.nix b/templates/fetchgit/default.nix