maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Update remote-building use nix 2.4

Browse source
This commit is contained in:
Malte Brandy 2021-11-19 18:10:25 +01:00
parent 6ef40fa72d
commit c617ff672b
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
7 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home-manager/roles/zsh/zshrc
View file

@ -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'

2
nixos/roles/laminar/kassandra.nix
View file

@ -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

2
nixos/roles/laminar/projects.nix
View file

@ -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)

2
nixos/roles/laminar/test-config.nix
View file

@ -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 = (

11
overlays/10-previews.nix
View file

@ -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;

2
overlays/writeHaskellScript.nix
View file

@ -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}

2
private

@ -1 +1 @@
Subproject commit 0e15991576467a2f59cbf4ad783ea901fd5c4207
Subproject commit ae84b4fab2bbf274eab1479821d472701c952a41