From 883453bf4c35820cd31f32294e64ac7ca7ab6ef4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 19 Nov 2021 19:07:36 +0100 Subject: [PATCH] Remove max-jobs limit --- 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/writeHaskellScript.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc index fcee736b..eba3c0bb 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 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 nom-build-remote="nom-build --builders '@/etc/nix/machines'" +alias nix-build-remote="nix-build --builders '@/etc/nix/machines'" +alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines"' +alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines"' 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 40984a78..3c7c9211 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 1' + export FLAGS='--builders @/etc/nix/machines' 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 b2ac11d2..d2bacd07 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 1' + export FLAGS='--builders @/etc/nix/machines' 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 f15b04ca..cd3c3287 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 1"; + remoteFlags = "--builders @/etc/nix/machines"; systems = builtins.attrNames (builtins.readDir ../../machines); homes = lib.attrNames (import ../../../home-manager/machines.nix); mkHomeJob = ( diff --git a/overlays/writeHaskellScript.nix b/overlays/writeHaskellScript.nix index 438153c3..c2c74e93 100644 --- a/overlays/writeHaskellScript.nix +++ b/overlays/writeHaskellScript.nix @@ -106,7 +106,7 @@ in buildSystemParams = ["", "-A", "system"] remoteBuildParams :: [String] - remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "1"] + remoteBuildParams = ["--builders", "@/etc/nix/machines"] main :: IO () ${code}