From 6558025e776d89f687c3c25adc5ae01870622db3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 3 Jun 2024 17:00:48 +0200
Subject: [PATCH] Fix eval remoteBuilds_*_2_13

---
 build/hydra.nix         |  2 +-
 flake.lock              | 17 +++++++++++++++++
 flake.nix               |  1 +
 tests/nixos/default.nix | 14 +++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/build/hydra.nix b/build/hydra.nix
index 84878fb5e..857b7f1f0 100644
--- a/build/hydra.nix
+++ b/build/hydra.nix
@@ -129,7 +129,7 @@ in
   };
 
   # System tests.
-  tests = import ../tests/nixos { inherit lib nixpkgs nixpkgsFor; } // {
+  tests = import ../tests/nixos { inherit lib nixpkgs nixpkgsFor self; } // {
 
     # Make sure that nix-env still produces the exact same result
     # on a particular version of Nixpkgs.
diff --git a/flake.lock b/flake.lock
index 7770484a6..ee976a3d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,6 +83,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-23-11": {
+      "locked": {
+        "lastModified": 1717159533,
+        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "type": "github"
+      }
+    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -131,6 +147,7 @@
         "flake-parts": "flake-parts",
         "libgit2": "libgit2",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-23-11": "nixpkgs-23-11",
         "nixpkgs-regression": "nixpkgs-regression",
         "pre-commit-hooks": "pre-commit-hooks"
       }
diff --git a/flake.nix b/flake.nix
index 896a2481c..b07e05684 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
   #      https://nixpk.gs/pr-tracker.html?pr=291954
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
+  inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
   inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
   inputs.libgit2 = { url = "github:libgit2/libgit2"; flake = false; };
 
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 4267db945..303fbc562 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -1,4 +1,4 @@
-{ lib, nixpkgs, nixpkgsFor }:
+{ lib, nixpkgs, nixpkgsFor, self }:
 
 let
 
@@ -60,7 +60,11 @@ in
     imports = [ ./remote-builds.nix ];
     builders.config = { lib, pkgs, ... }: {
       imports = [ checkOverrideNixVersion ];
-      nix.package = lib.mkForce pkgs.nixVersions.nix_2_3;
+      nix.package = lib.mkForce (
+        self.inputs.nixpkgs-23-11.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixVersions.nix_2_13.overrideAttrs (o: {
+          meta = o.meta // { knownVulnerabilities = []; };
+        })
+      );
     };
   });
 
@@ -82,7 +86,11 @@ in
     imports = [ ./remote-builds.nix ];
     nodes.client = { lib, pkgs, ... }: {
       imports = [ checkOverrideNixVersion ];
-      nix.package = lib.mkForce pkgs.nixVersions.nix_2_13;
+      nix.package = lib.mkForce (
+        self.inputs.nixpkgs-23-11.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixVersions.nix_2_13.overrideAttrs (o: {
+          meta = o.meta // { knownVulnerabilities = []; };
+        })
+      );
     };
   });