From 09e97124882ef039805cb708346354d64fd7fd07 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Wed, 27 Nov 2024 15:37:41 +0700
Subject: [PATCH] bump nix version

---
 pkgs/nix-plugins-overlay.nix       |  8 ++++----
 pkgs/rename-nix-plugin-files.patch | 33 +++++++++++++++++++++---------
 system/modules/common.nix          |  1 -
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/pkgs/nix-plugins-overlay.nix b/pkgs/nix-plugins-overlay.nix
index a80c81f..1e3b913 100644
--- a/pkgs/nix-plugins-overlay.nix
+++ b/pkgs/nix-plugins-overlay.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  unpatchedNixForNixPlugins = pkgs.nixVersions.nix_2_18;
+  unpatchedNixForNixPlugins = pkgs.nixVersions.nix_2_24;
   nixForNixPlugins = unpatchedNixForNixPlugins.overrideAttrs (old: {
     patches = (old.patches or [ ]) ++ [ ./rename-nix-plugin-files.patch ];
     # some tests fail on bcachefs due to insufficient permissions
@@ -20,9 +20,9 @@ in {
       })
     ];
   });*/
-  hydra_unstable = (pkgs.hydra_unstable.override {
+  hydra = (pkgs.hydra.override {
     nix = nixForNixPlugins;
-  }).overrideAttrs (old: {
+  })/*.overrideAttrs (old: {
     version = "2023-12-01";
     # who cares about tests amirite
     doCheck = false;
@@ -30,5 +30,5 @@ in {
       rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
       hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
     };
-  });
+  })*/;
 }
diff --git a/pkgs/rename-nix-plugin-files.patch b/pkgs/rename-nix-plugin-files.patch
index f74d9bb..988f94f 100644
--- a/pkgs/rename-nix-plugin-files.patch
+++ b/pkgs/rename-nix-plugin-files.patch
@@ -1,13 +1,26 @@
-diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
-index dba7d78ef..f102f08f9 100644
---- a/src/libstore/globals.hh
-+++ b/src/libstore/globals.hh
-@@ -959,7 +959,7 @@ public:
-         "Number of seconds between checking free disk space."};
- 
+diff --git a/src/libmain/plugin.cc b/src/libmain/plugin.cc
+index ccfd7f900..c1b737ad6 100644
+--- a/src/libmain/plugin.cc
++++ b/src/libmain/plugin.cc
+@@ -40,7 +40,7 @@ struct PluginSettings : Config
      PluginFilesSetting pluginFiles{
--        this, {}, "plugin-files",
-+        this, {}, "plugin-files-2",
+         this,
+         {},
+-        "plugin-files",
++        "plugin-files-2",
          R"(
            A list of plugin files to be loaded by Nix. Each of these files will
-           be dlopened by Nix, allowing them to affect execution through static
+           be dlopened by Nix. If they contain the symbol `nix_plugin_entry()`,
+diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
+index 555936c18..26db2b7cb 100644
+--- a/src/libstore/remote-store.cc
++++ b/src/libstore/remote-store.cc
+@@ -134,7 +134,7 @@ void RemoteStore::setOptions(Connection & conn)
+         overrides.erase(settings.useSubstitutes.name);
+         overrides.erase(loggerSettings.showTrace.name);
+         overrides.erase(experimentalFeatureSettings.experimentalFeatures.name);
+-        overrides.erase("plugin-files");
++        overrides.erase("plugin-files-2");
+         conn.to << overrides.size();
+         for (auto & i : overrides)
+             conn.to << i.first << i.second.value;
diff --git a/system/modules/common.nix b/system/modules/common.nix
index f9568a8..91081ad 100644
--- a/system/modules/common.nix
+++ b/system/modules/common.nix
@@ -59,7 +59,6 @@ in {
           "flakes"
           "nix-command"
           "no-url-literals"
-          "repl-flake"
         ];
       };
       gc = {