From 8a17e66f76aec2e4a47db5782bf50aec5b840e85 Mon Sep 17 00:00:00 2001
From: Thomas Jensen <32744171+Mast3rwaf1z@users.noreply.github.com>
Date: Tue, 4 Mar 2025 21:26:58 +0100
Subject: [PATCH] update branch (#10)

* Fix/ci deprecation (#7)

* module skeleton

* fix caching

* Revert "module skeleton"

This reverts commit 11d2916fc77bc067e0cc6dbcbc06431df1405383.

* fixed inputs (#5)

* fixed inputs

* fix inputs
---
 .github/workflows/nix-build.yml |  2 +-
 flake.lock                      | 66 ++++-----------------------------
 flake.nix                       |  7 ++++
 3 files changed, 15 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml
index 64c9255..5738c29 100644
--- a/.github/workflows/nix-build.yml
+++ b/.github/workflows/nix-build.yml
@@ -18,6 +18,6 @@ jobs:
       - name: Install nix
         uses: DeterminateSystems/nix-installer-action@main
       - name: Nix cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
+        uses: DeterminateSystems/flakehub-cache-action@main
       - name: build system
         run: nix build .#${{ matrix.package }}
diff --git a/flake.lock b/flake.lock
index 1a529a1..d655897 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,27 +18,11 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "folkevognen": {
       "inputs": {
-        "gradle2nix": "gradle2nix",
+        "gradle2nix": [
+          "gradle2nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -61,30 +45,6 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": [
-          "folkevognen",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738375406,
-        "narHash": "sha256-dvJxvDZCDnh4pY5T99thmQOqjnEeXmMAUeC0Hc4T7U4=",
-        "owner": "tadfisher",
-        "repo": "gradle2nix",
-        "rev": "2ca058c5b7f3b37f0c11258a78bd0110a675caae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tadfisher",
-        "ref": "v2",
-        "repo": "gradle2nix",
-        "type": "github"
-      }
-    },
-    "gradle2nix_2": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "rp-utils",
           "nixpkgs"
         ]
       },
@@ -181,6 +141,7 @@
     "root": {
       "inputs": {
         "folkevognen": "folkevognen",
+        "gradle2nix": "gradle2nix",
         "homepage": "homepage",
         "nix-velocity": "nix-velocity",
         "nixpkgs": "nixpkgs",
@@ -190,7 +151,9 @@
     },
     "rp-utils": {
       "inputs": {
-        "gradle2nix": "gradle2nix_2",
+        "gradle2nix": [
+          "gradle2nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -223,21 +186,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 471a4df..cf1fd27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,11 @@
     inputs = {
         nixpkgs.url = "nixpkgs/nixos-unstable";
         # i would use the // operator together with builtins.mapAttrs, but noooo, inputs are cursed
+        # pin gradle2nix
+        gradle2nix = {
+            url = "github:tadfisher/gradle2nix/v2";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
         homepage = {
             url = "github:Skademaskinen/homepage";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -10,6 +15,7 @@
         rp-utils = {
             url = "github:Skademaskinen/RP-Utils";
             inputs.nixpkgs.follows = "nixpkgs";
+            inputs.gradle2nix.follows = "gradle2nix";
         };
         putricide = {
             url = "github:Skademaskinen/Putricide";
@@ -22,6 +28,7 @@
         folkevognen = {
             url = "github:Skademaskinen/Folkevognen";
             inputs.nixpkgs.follows = "nixpkgs";
+            inputs.gradle2nix.follows = "gradle2nix";
         };
     };