From c0cc98e541ebaf72d6ed31f46822887b6500dc50 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Wed, 16 Aug 2023 05:10:49 +0700
Subject: [PATCH] update inputs

---
 flake.lock       | 12 ++++++------
 pkgs/default.nix | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4a4f047..5233903 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1690933134,
-        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "lastModified": 1688254665,
+        "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "rev": "267149c58a14d15f7f81b4d737308421de9d7152",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1690881714,
-        "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
+        "lastModified": 1688049487,
+        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e1960bc196baf6881340d53dccb203a951745a2",
+        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ffc0893..cf0df6d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -30,6 +30,12 @@ in
   } else pkgs.linux-firmware;
   inherit (nix-gaming) faf-client osu-lazer-bin;
   inherit nixForNixPlugins;
+  nix = nixForNixPlugins;
+  nixVersions = pkgs.nixVersions.extend (self: super: {
+    stable = nixForNixPlugins;
+    unstable = nixForNixPlugins;
+  });
+  # Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf
   nix-plugins = pkgs.nix-plugins.overrideAttrs (old: {
     version = "12.0.0";
     patches = [
@@ -39,13 +45,14 @@ in
       })
     ];
   });
-  nix = nixForNixPlugins;
-  nixVersions = pkgs.nixVersions.extend (self: super: {
-    stable = nixForNixPlugins;
-    unstable = nixForNixPlugins;
-  });
-  # Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf
-  harmonia = pkgs.harmonia.override { nix = nixForNixPlugins; };
+  harmonia = (pkgs.harmonia.override { nix = nixForNixPlugins; }).overrideAttrs {
+    patches = [
+      (pkgs.fetchpatch {
+        url = "https://github.com/nix-community/harmonia/pull/145/commits/394c939a45fa9c590347e149400876c318610b1e.patch";
+        hash = "sha256-DvyE7/0PW3XRtFgIrl4IQa7RIQLQZoKLddxCZvhpu3I=";
+      })
+    ];
+  };
   nix-init = pkgs.nix-init.override { nix = nixForNixPlugins; };
   nix-serve = pkgs.nix-serve.override { nix = nixForNixPlugins; };
   nix-serve-ng = pkgs.nix-serve-ng.override { nix = nixForNixPlugins; };