From 2d1be9cd9a67f3cf7dbcf9762008d78a814dfb21 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 11 Nov 2021 11:45:26 +0100
Subject: [PATCH 1/2] nix: Install nlohmann_json headers

---
 pkgs/tools/package-management/nix/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index fc55902ce5fc..f365348607aa 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -58,7 +58,7 @@ common =
            ];
 
       buildInputs =
-        [ curl libsodium openssl sqlite xz bzip2 nlohmann_json
+        [ curl libsodium openssl sqlite xz bzip2
           brotli boost editline
         ]
         ++ lib.optionals stdenv.isDarwin [ Security ]
@@ -209,6 +209,13 @@ common =
     ];
   });
 
+  # master: https://github.com/NixOS/nix/pull/5536
+  # 2.4: https://github.com/NixOS/nix/pull/5537
+  installNlohmannJsonPatch = fetchpatch {
+    url = "https://github.com/NixOS/nix/pull/5536.diff";
+    sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo=";
+  };
+
 in rec {
 
   nix = nixStable;
@@ -241,6 +248,8 @@ in rec {
 
     boehmgc = boehmgc_nixUnstable;
 
+    patches = [ installNlohmannJsonPatch ];
+
     inherit storeDir stateDir confDir;
   });
 
@@ -258,6 +267,8 @@ in rec {
 
     boehmgc = boehmgc_nixUnstable;
 
+    patches = [ installNlohmannJsonPatch ];
+
     inherit storeDir stateDir confDir;
 
   });

From f4c24b78d337f411cd4a7fc6d40570a82a15e49f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 11 Nov 2021 11:45:47 +0100
Subject: [PATCH 2/2] hercules-ci-*, cachix: nix: 2.3 -> 2.4

---
 pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 1418a8d6fe82..e9ac40d3dfcf 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -935,11 +935,11 @@ self: super: builtins.intersectAttrs super {
 
   rel8 = addTestToolDepend super.rel8 pkgs.postgresql;
 
-  cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_3; });
+  cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; });
 
-  hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nix_2_3; };
-  hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_3; };
-  hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_3; };
+  hercules-ci-agent = appendConfigureFlag (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
+  hercules-ci-cnix-expr = appendConfigureFlag (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
+  hercules-ci-cnix-store = appendConfigureFlag (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
 
   # Enable extra optimisations which increase build time, but also
   # later compiler performance, so we should do this for user's benefit.