Merge pull request #1228 from dsalaza4/main

feat(cross): #1202 use fetch tarball
fluidattacks · Dec 19, 2023 · bab198e · bab198e
2 parents 9aaa28e + a56f0f6
commit bab198e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,5 +1,5 @@
 Andres Cuberos <acuberos@fluidttacks.com> Andres Cuberos <31192632+acuberosatfluid@users.noreply.github.com>
-Andres Cuberos <acuberos@fluidttacks.com> Andres Cuberos <acuberos@fluidttacks.com>
+Andres Cuberos <acuberos@fluidttacks.com> Andres Cuberos <acuberos@fluidattacks.com>
 Daniel Murcia <danmur97@outlook.com> Daniel F. Murcia Rivera <danmur97@outlook.com>
 Daniel Murcia <danmur97@outlook.com> Daniel Murcia <42251914+danmur97@users.noreply.github.com>
 Daniel Salazar <podany270895@gmail.com> Daniel Salazar <dsalaza4@eafit.edu.co>

diff --git a/docs/src/api/builtins/deploy.md b/docs/src/api/builtins/deploy.md
@@ -85,6 +85,7 @@ Example:
 
     ```nix
     {
+      computeOnAwsBatch,
       outputs,
       ...
     }: {
@@ -103,7 +104,7 @@ Example:
           ];
           tags = {
             "Management:Product" = "awesome_app";
-          }
+          };
           vcpus = 1;
         };
       };

diff --git a/docs/src/getting-started.md b/docs/src/getting-started.md
@@ -121,10 +121,9 @@ You can also import Makes from Nix:
 ```nix
 let
   # Import the framework
-  makes = import "${builtins.fetchGit {
-    url = "https://github.com/fluidattacks/makes";
-    ref = "refs/tags/24.01";
-    rev = ""; # Add a commit here
+  makes = import "${builtins.fetchTarball {
+    sha256 = ""; # Tarball sha256
+    url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.01";
   }}/src/args/agnostic.nix" { };
 in
 # Use the framework

diff --git a/docs/src/versioning.md b/docs/src/versioning.md
@@ -35,14 +35,20 @@ for instance:
 ```nix
 # /path/to/my/project/makes.lock.nix
 {
-  makesSrc = builtins.fetchGit {
-    url = "https://github.com/fluidattacks/makes";
-    ref = "refs/tags/24.01";
-    rev = ""; # Add a commit here
+  makesSrc = builtins.fetchTarball {
+    sha256 = ""; # Tarball sha256
+    url = "https://api.github.com/repos/fluidattacks/makes/tarball/24.01";
   };
 }
 ```
 
+???+ tip
+
+    We recommend using `builtins.fetchTarball`
+    over `builtins.fetchGit`
+    due to reproducibility issues
+    mentioned in [nixpkgs](https://github.com/NixOS/nix/issues/3533).
+
 ## Compatibility information
 
 For the whole ecosystem to work

diff --git a/src/args/compute-on-aws-batch/batch-client/build/deps/arch_lint.nix b/src/args/compute-on-aws-batch/batch-client/build/deps/arch_lint.nix
@@ -2,10 +2,10 @@
   nixpkgs,
   python_version,
 }: let
-  src = builtins.fetchGit {
-    url = "https://gitlab.com/dmurciaatfluid/arch_lint";
-    rev = "72a495bb933f052ad812292b468ca3e18fd9dde4";
-    ref = "refs/tags/2.4.0+1";
+  commit = "72a495bb933f052ad812292b468ca3e18fd9dde4";
+  src = builtins.fetchTarball {
+    sha256 = "sha256:0413zl4y92dbdfmck070x7dhp5cxx66xd2pxpxg3gbhaw0yqzhqd";
+    url = "https://gitlab.com/dmurciaatfluid/arch_lint/-/archive/${commit}/arch_lint-${commit}.tar";
   };
 in
   import "${src}/build" {

diff --git a/src/args/compute-on-aws-batch/batch-client/build/deps/fa_purity.nix b/src/args/compute-on-aws-batch/batch-client/build/deps/fa_purity.nix
@@ -2,10 +2,10 @@
   nixpkgs,
   python_version,
 }: let
-  src = builtins.fetchGit {
-    url = "https://gitlab.com/dmurciaatfluid/purity";
-    rev = "e0b5cf459a16eb92d86ca6c024edbedd52d72589";
-    ref = "refs/tags/v1.38.0";
+  commit = "e0b5cf459a16eb92d86ca6c024edbedd52d72589";
+  src = builtins.fetchTarball {
+    sha256 = "sha256:08h1b94mn74lqz47cj8m5dmm5xddddfd1clrb6zqi898w3q1bylr";
+    url = "https://gitlab.com/dmurciaatfluid/purity/-/archive/${commit}/purity-${commit}.tar";
   };
 in
   import "${src}/build" {

diff --git a/src/args/compute-on-aws-batch/batch-client/entrypoint.nix b/src/args/compute-on-aws-batch/batch-client/entrypoint.nix
@@ -3,9 +3,9 @@
   nixpkgs,
 }: let
   nix-filter = let
-    src = builtins.fetchGit {
-      url = "https://github.com/numtide/nix-filter";
-      rev = "fc282c5478e4141842f9644c239a41cfe9586732";
+    src = builtins.fetchTarball {
+      sha256 = "sha256:155cmq1w8s5v2l4d5zlhbph8r4fh0k2cl503z94ma7yizmmx9ll5";
+      url = "https://api.github.com/repos/numtide/nix-filter/tarball/fc282c5478e4141842f9644c239a41cfe9586732";
     };
   in
     import src;