Expose buildTerraform / Update update_versions script

Author: sestrella

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -1,3 +1,4 @@
-templates/*/flake.lock
-result
+.direnv
 .env
+result
+templates/*/flake.lock

flake.lock

@@ -14,24 +14,7 @@
       (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
           versions = builtins.fromJSON (builtins.readFile ./versions.json);
-          buildTerraform = { version, hash, vendorHash }:
-            # https://www.hashicorp.com/blog/hashicorp-adopts-business-source-license
-            if builtins.compareVersions version "1.6.0" >= 0
-            then
-            # https://github.com/NixOS/nixpkgs/blob/nixpkgs-unstable/pkgs/applications/networking/cluster/terraform/default.nix
-              pkgs-unstable.mkTerraform
-                {
-                  inherit version hash vendorHash;
-                  patches = [ "${nixpkgs-unstable}/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch" ];
-                }
-            else
-            # https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/applications/networking/cluster/terraform/default.nix
-              pkgs.mkTerraform {
-                inherit version hash vendorHash;
-                patches = [ "${nixpkgs}/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch" ];
-              };
         in
         {
           # https://github.com/NixOS/nix/issues/7165
@@ -40,8 +23,8 @@
             (builtins.map
               (version: {
                 name = version;
-                value = buildTerraform {
-                  inherit version;
+                value = self.lib.buildTerraform {
+                  inherit system version;
                   inherit (versions.${version}) hash vendorHash;
                 };
               })
@@ -56,6 +39,28 @@
             ];
           };
         }) // {
-      lib.packageFromVersion = { system, version }: self.packages.${system}.${version};
+      lib = {
+        buildTerraform = { system, version, hash, vendorHash }:
+          let
+            pkgs = nixpkgs.legacyPackages.${system};
+            pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
+          in
+          # https://www.hashicorp.com/blog/hashicorp-adopts-business-source-license
+          if builtins.compareVersions version "1.6.0" >= 0
+          then
+          # https://github.com/NixOS/nixpkgs/blob/nixpkgs-unstable/pkgs/applications/networking/cluster/terraform/default.nix
+            pkgs-unstable.mkTerraform
+              {
+                inherit version hash vendorHash;
+                patches = [ "${nixpkgs-unstable}/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch" ];
+              }
+          else
+          # https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/applications/networking/cluster/terraform/default.nix
+            pkgs.mkTerraform {
+              inherit version hash vendorHash;
+              patches = [ "${nixpkgs}/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch" ];
+            };
+        packageFromVersion = { system, version }: self.packages.${system}.${version};
+      };
     };
 }

flake.nix

@@ -25,9 +25,21 @@ def by_version(release):
 def to_version(versions, release):
     version = release.tag_name.removeprefix("v")
     print(f"Calculating hash for {version}")
-    # TODO: Use `nix-prefetch` to calculate the hash
-    hash_output = subprocess.check_output(["nix-prefetch-git", "--quiet", "https://github.com/hashicorp/terraform", release.title])
-    vendor_hash_output = subprocess.check_output([
+    calculated_hash = subprocess.check_output([
+        "nix-prefetch",
+        "fetchFromGitHub",
+        "--silent",
+        "--option",
+        "extra-experimental-features",
+        "--owner",
+        "hashicorp",
+        "--repo",
+        "terraform",
+        "--rev",
+        release.title
+    ]).decode("utf-8")
+    print(f"Calculating vendorHash for {version}")
+    calculated_vendor_hash = subprocess.check_output([
         "nix-prefetch",
         "--silent",
         "--option",
@@ -37,11 +49,14 @@ def to_version(versions, release):
         "../vendor_hash.nix",
         "--argstr",
         "version",
-        version
-    ])
+        version,
+        "--argstr",
+        "hash",
+        calculated_hash
+    ]).decode("utf-8")
     versions[version] = {
-        "hash": json.loads(hash_output.decode("utf-8"))["hash"],
-        "vendorHash": vendor_hash_output.decode("utf-8")
+        "hash": calculated_hash,
+        "vendorHash": calculated_vendor_hash
     }
     return versions
 

scripts/update_versions

@@ -1,5 +1,6 @@
-{ version }: { sha256 }:
-((builtins.getFlake (toString ./.)).lib.packageFromVersion {
-  inherit version;
+{ version, hash }: { sha256 }:
+((builtins.getFlake (toString ./.)).lib.buildTerraform {
+  inherit version hash;
   system = builtins.currentSystem;
+  vendorHash = "";
 }).go-modules.overrideAttrs (_: { vendorSha256 = sha256; })