From 78c6f9a41a084c9743a0f3bf7b60b2a116f3028c Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 4 Jan 2024 14:40:34 +0100
Subject: [PATCH] ci: use nix-update to update vendorHash

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .github/workflows/lint.yml |  2 +-
 flake.lock                 | 57 +-------------------------------------
 flake.nix                  |  8 ++----
 3 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9f3f449..4e4ae25 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -95,7 +95,7 @@ jobs:
           token: ${{ !github.event.pull_request.head.repo.fork && secrets.UPLOSI_CI_COMMIT_PUSH_PR || '' }}
       - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
       - name: Update uplosi vendor hash
-        run: nix run .#nixutils.update-vendor-hash -- uplosi
+        run: nix run .#nixpkgs.nix-update -- --flake --version=skip uplosi
       - name: Check diff
         id: check-diff
         run: |
diff --git a/flake.lock b/flake.lock
index be6afdc..846ebb0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,24 +18,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1704008649,
@@ -52,32 +34,10 @@
         "type": "github"
       }
     },
-    "nixutils": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1704297688,
-        "narHash": "sha256-w7114CtzgFPGCEvVHBBsCWpWDVig6yzl1J/MeePXPNs=",
-        "owner": "katexochen",
-        "repo": "nixutils",
-        "rev": "2c6fd8f52b60470c010062f53a4f24800e1915f1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "katexochen",
-        "repo": "nixutils",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "nixutils": "nixutils"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
@@ -94,21 +54,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 c72bbbb..f6ff09a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,13 +8,9 @@
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
-    nixutils = {
-      url = "github:katexochen/nixutils";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, nixutils }:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
@@ -56,7 +52,7 @@
           };
 
           legacyPackages = {
-            nixutils = nixutils.packages.${system};
+            nixpkgs = nixpkgs.legacyPackages.${system};
           };
 
           formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;