From c617ff672bc64fc180bd0f11d6e7fa745dff3fa4 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 19 Nov 2021 18:10:25 +0100
Subject: [PATCH] Update remote-building use nix 2.4

---
 home-manager/roles/zsh/zshrc        |  8 ++++----
 nixos/roles/laminar/kassandra.nix   |  2 +-
 nixos/roles/laminar/projects.nix    |  2 +-
 nixos/roles/laminar/test-config.nix |  2 +-
 overlays/10-previews.nix            | 11 ++---------
 overlays/writeHaskellScript.nix     |  2 +-
 private                             |  2 +-
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc
index 9bf8b747..fcee736b 100644
--- a/home-manager/roles/zsh/zshrc
+++ b/home-manager/roles/zsh/zshrc
@@ -41,10 +41,10 @@ function title {
 setopt prompt_subst
 autoload -U colors && colors # Enable colors in prompt
 
-alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 0"
-alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 0"
-alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
-alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
+alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 1"
+alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 1"
+alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 1"'
+alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 1"'
 alias accounting='hledger -f ~/git/buchhaltung/buchhaltung.ledger ui -- --watch --theme=terminal -T -E'
 alias o=xdg-open
 alias sudo='sudo -A'
diff --git a/nixos/roles/laminar/kassandra.nix b/nixos/roles/laminar/kassandra.nix
index 12a14652..40984a78 100644
--- a/nixos/roles/laminar/kassandra.nix
+++ b/nixos/roles/laminar/kassandra.nix
@@ -25,7 +25,7 @@ let
     git clone git@localhost:kassandra2 .
     git show -q
     echo "Evaluating nix-expression."
-    export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
+    export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
     drv=$(readlink -f $(nix-instantiate release.nix -A ${name} --add-root ./drv --indirect $FLAGS))
     echo "Evaluation done."
     nix-jobs realise $drv
diff --git a/nixos/roles/laminar/projects.nix b/nixos/roles/laminar/projects.nix
index 32a62975..b2ac11d2 100644
--- a/nixos/roles/laminar/projects.nix
+++ b/nixos/roles/laminar/projects.nix
@@ -7,7 +7,7 @@ let
     git clone git@localhost:${name} .
     git show -q --oneline
     echo "Evaluating nix-expression."
-    export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
+    export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
     if [[ -e "flake.nix" ]]; then
       echo "Flake detected. Using flake.nix"
       drv=$(${pkgs.nixFlakes}/bin/flix eval --raw .#defaultPackage.x86_64-linux.drvPath)
diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix
index 0b76c090..ad0b93f3 100644
--- a/nixos/roles/laminar/test-config.nix
+++ b/nixos/roles/laminar/test-config.nix
@@ -49,7 +49,7 @@ let
     git show -q
     REPODIR=.
   '';
-  remoteFlags = "--builders @/etc/nix/machines --max-jobs 0";
+  remoteFlags = "--builders @/etc/nix/machines --max-jobs 1";
   systems = builtins.attrNames (builtins.readDir ../../machines);
   homes = lib.attrNames (import ../../../home-manager/machines.nix);
   mkHomeJob = (
diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index ef1748a7..6c01c0ec 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -5,15 +5,8 @@ in
 {
   inherit unstable;
   inherit (unstable) cachix nix-output-monitor cabal2nix;
-  nix = super.nix.overrideAttrs (o: {
-    patches = (o.patches or [ ]) ++ [
-      (super.fetchpatch {
-        # Overridable cache priorities
-        url = "https://github.com/NixOS/nix/commit/f8abbdd4565542464f31f4dc203a9c3e091b3536.patch";
-        sha256 = "0vbxiab0wd55ccnxkbi86lzmyrvjw946r9scxgq59xiyyss420rl";
-      })
-    ];
-  });
+  nix = unstable.nix;
+  nix-du = unstable.nix-du;
   unstableHaskellPackages = unstable.haskellPackages;
   unstableGhc = unstable.ghc;
   mautrix-signal = unstable.mautrix-signal;
diff --git a/overlays/writeHaskellScript.nix b/overlays/writeHaskellScript.nix
index c468adcf..438153c3 100644
--- a/overlays/writeHaskellScript.nix
+++ b/overlays/writeHaskellScript.nix
@@ -106,7 +106,7 @@ in
       buildSystemParams = ["<nixpkgs/nixos>", "-A", "system"]
 
       remoteBuildParams :: [String]
-      remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "0"]
+      remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "1"]
 
       main :: IO ()
       ${code}
diff --git a/private b/private
index 0e159915..ae84b4fa 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 0e15991576467a2f59cbf4ad783ea901fd5c4207
+Subproject commit ae84b4fab2bbf274eab1479821d472701c952a41