rel-eng: Flakify fetch_gitlabwip/fetch-gitlab

4 files changed, 72 insertions, 13 deletions

diff --git a/.gitlab/rel_eng/fetch-gitlab-artifacts/default.nix b/.gitlab/rel_eng/fetch-gitlab-artifacts/default.nix
deleted file mode 100644
index 5f552b2bfe..0000000000
--- a/.gitlab/rel_eng/fetch-gitlab-artifacts/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ nix-gitignore, python3Packages, unzip }:
-
-let
-  fetch-gitlab = { buildPythonPackage, python-gitlab, unzip }:
-    buildPythonPackage {
-      pname = "fetch-gitlab";
-      version = "0.0.1";
-      src = nix-gitignore.gitignoreSource [] ./.;
-      propagatedBuildInputs = [ python3Packages.python-gitlab unzip ];
-      preferLocalBuild = true;
-    };
-in 
-python3Packages.callPackage fetch-gitlab { inherit unzip; }
diff --git a/.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py b/.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
index d51c298a9f..0e3339f78d 100644
--- a/.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
+++ b/.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
@@ -29,6 +29,7 @@ def job_triple(job_name):
         'release-x86_64-linux-centos7-release': 'x86_64-centos7-linux',
         'release-x86_64-linux-alpine3_12-release+fully_static': 'x86_64-alpine3_12-linux-static',
         'release-x86_64-linux-alpine3_12-int_native-release+fully_static': 'x86_64-alpine3_12-linux-static-int_native',
+        'release-x86_64-linux-rocky8-release': 'x86_64-rocky8-linux',
         'release-x86_64-darwin-release': 'x86_64-apple-darwin',
         'release-i386-linux-deb9-release': 'i386-deb9-linux',
         'release-armv7-linux-deb10-release': 'armv7-deb10-linux',
diff --git a/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.lock b/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.lock
new file mode 100644
index 0000000000..b6bc263f88
--- /dev/null
+++ b/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.lock
@@ -0,0 +1,41 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1674899129,
+        "narHash": "sha256-6LGae8WbdCN4S9+o2wfYDJPpfxC2EnXEvoopVkguNtc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6b9c27b4c9c1c329b27a44ed1fa8935df79f9a8b",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.nix b/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.nix
new file mode 100644
index 0000000000..e9e6d968f2
--- /dev/null
+++ b/.gitlab/rel_eng/fetch-gitlab-artifacts/flake.nix
@@ -0,0 +1,30 @@
+{
+  description = "GHC release download utility";
+
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = nixpkgs.legacyPackages.${system}; in
+      {
+        packages = rec {
+          fetch-gitlab = 
+            let
+              pkg = { buildPythonPackage, python-gitlab, unzip }:
+                buildPythonPackage {
+                  pname = "fetch-gitlab";
+                  version = "0.0.1";
+                  src = ./.;
+                  propagatedBuildInputs = [ python-gitlab unzip ];
+                  preferLocalBuild = true;
+                };
+            in pkgs.python3Packages.callPackage pkg { inherit (pkgs) unzip; };
+          default = fetch-gitlab;
+        };
+        apps = rec {
+          fetch-gitlab = flake-utils.lib.mkApp { drv = self.packages.${system}.fetch-gitlab; };
+          default = fetch-gitlab;
+        };
+      }
+    );
+}