bump nix version

pkgs/nix-plugins-fix.patch

@@ -0,0 +1,22 @@
+diff --git a/extra-builtins.cc b/extra-builtins.cc
+index bae8f83..4c15c7f 100644
+--- a/extra-builtins.cc
++++ b/extra-builtins.cc
+@@ -39,9 +39,6 @@ static void extraBuiltins(EvalState & state, const PosIdx pos,
+         auto fun = state.allocValue();
+         state.evalFile(extraBuiltinsFile, *fun);
+         Value * arg;
+-        if (evalSettings.enableNativeCode) {
+-            arg = state.baseEnv.values[0];
+-        } else {
+             auto attrs = state.buildBindings(2);
+ 
+             auto sExec = state.symbols.create("exec");
+@@ -60,7 +57,6 @@ static void extraBuiltins(EvalState & state, const PosIdx pos,
+ 
+             arg = state.allocValue();
+             arg->mkAttrs(attrs);
+-        }
+         v.mkApp(fun, arg);
+         state.forceValue(v, pos);
+     } catch (SysError & e) {

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
@@ -10,25 +10,27 @@ let
 in {
   inherit unpatchedNixForNixPlugins 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.override { nix = nixForNixPlugins; }).overrideAttrs (old: {
-    version = "13.0.0";
+  nix-plugins = (pkgs.nix-plugins.override { nix = nixForNixPlugins; })
+  .overrideAttrs (old: {
+    # version = "13.0.0";
     patches = [
-      (pkgs.fetchpatch {
+      /*(pkgs.fetchpatch {
         # pull 16
         url = "https://github.com/chayleaf/nix-plugins/commit/8f945cadad7f2e60e8f308b2f498ec5e16961ede.patch";
         hash = "sha256-pOogMtjXYkSDtXW12TmBpGr/plnizJtud2nP3q2UldQ=";
-      })
+      })*/
+      ./nix-plugins-fix.patch
     ];
-  });*/
-  hydra_unstable = (pkgs.hydra_unstable.override {
+  });
+  hydra = (pkgs.hydra.override {
     nix = nixForNixPlugins;
   }).overrideAttrs (old: {
-    version = "2023-12-01";
+    # version = "2023-12-01";
     # who cares about tests amirite
     doCheck = false;
-    src = old.src.override {
-      rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
-      hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
-    };
+    # src = old.src.override {
+    #   rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
+    #   hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
+    # };
   });
 }

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;

system/modules/common.nix

@@ -59,7 +59,6 @@ in {
           "flakes"
           "nix-command"
           "no-url-literals"
-          "repl-flake"
         ];
       };
       gc = {