Update remote-building use nix 2.4
This commit is contained in:
parent
6ef40fa72d
commit
c617ff672b
|
@ -41,10 +41,10 @@ function title {
|
||||||
setopt prompt_subst
|
setopt prompt_subst
|
||||||
autoload -U colors && colors # Enable colors in prompt
|
autoload -U colors && colors # Enable colors in prompt
|
||||||
|
|
||||||
alias nom-build-remote="nom-build --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 0"
|
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 0"'
|
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 0"'
|
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 accounting='hledger -f ~/git/buchhaltung/buchhaltung.ledger ui -- --watch --theme=terminal -T -E'
|
||||||
alias o=xdg-open
|
alias o=xdg-open
|
||||||
alias sudo='sudo -A'
|
alias sudo='sudo -A'
|
||||||
|
|
|
@ -25,7 +25,7 @@ let
|
||||||
git clone git@localhost:kassandra2 .
|
git clone git@localhost:kassandra2 .
|
||||||
git show -q
|
git show -q
|
||||||
echo "Evaluating nix-expression."
|
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))
|
drv=$(readlink -f $(nix-instantiate release.nix -A ${name} --add-root ./drv --indirect $FLAGS))
|
||||||
echo "Evaluation done."
|
echo "Evaluation done."
|
||||||
nix-jobs realise $drv
|
nix-jobs realise $drv
|
||||||
|
|
|
@ -7,7 +7,7 @@ let
|
||||||
git clone git@localhost:${name} .
|
git clone git@localhost:${name} .
|
||||||
git show -q --oneline
|
git show -q --oneline
|
||||||
echo "Evaluating nix-expression."
|
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
|
if [[ -e "flake.nix" ]]; then
|
||||||
echo "Flake detected. Using flake.nix"
|
echo "Flake detected. Using flake.nix"
|
||||||
drv=$(${pkgs.nixFlakes}/bin/flix eval --raw .#defaultPackage.x86_64-linux.drvPath)
|
drv=$(${pkgs.nixFlakes}/bin/flix eval --raw .#defaultPackage.x86_64-linux.drvPath)
|
||||||
|
|
|
@ -49,7 +49,7 @@ let
|
||||||
git show -q
|
git show -q
|
||||||
REPODIR=.
|
REPODIR=.
|
||||||
'';
|
'';
|
||||||
remoteFlags = "--builders @/etc/nix/machines --max-jobs 0";
|
remoteFlags = "--builders @/etc/nix/machines --max-jobs 1";
|
||||||
systems = builtins.attrNames (builtins.readDir ../../machines);
|
systems = builtins.attrNames (builtins.readDir ../../machines);
|
||||||
homes = lib.attrNames (import ../../../home-manager/machines.nix);
|
homes = lib.attrNames (import ../../../home-manager/machines.nix);
|
||||||
mkHomeJob = (
|
mkHomeJob = (
|
||||||
|
|
|
@ -5,15 +5,8 @@ in
|
||||||
{
|
{
|
||||||
inherit unstable;
|
inherit unstable;
|
||||||
inherit (unstable) cachix nix-output-monitor cabal2nix;
|
inherit (unstable) cachix nix-output-monitor cabal2nix;
|
||||||
nix = super.nix.overrideAttrs (o: {
|
nix = unstable.nix;
|
||||||
patches = (o.patches or [ ]) ++ [
|
nix-du = unstable.nix-du;
|
||||||
(super.fetchpatch {
|
|
||||||
# Overridable cache priorities
|
|
||||||
url = "https://github.com/NixOS/nix/commit/f8abbdd4565542464f31f4dc203a9c3e091b3536.patch";
|
|
||||||
sha256 = "0vbxiab0wd55ccnxkbi86lzmyrvjw946r9scxgq59xiyyss420rl";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
unstableHaskellPackages = unstable.haskellPackages;
|
unstableHaskellPackages = unstable.haskellPackages;
|
||||||
unstableGhc = unstable.ghc;
|
unstableGhc = unstable.ghc;
|
||||||
mautrix-signal = unstable.mautrix-signal;
|
mautrix-signal = unstable.mautrix-signal;
|
||||||
|
|
|
@ -106,7 +106,7 @@ in
|
||||||
buildSystemParams = ["<nixpkgs/nixos>", "-A", "system"]
|
buildSystemParams = ["<nixpkgs/nixos>", "-A", "system"]
|
||||||
|
|
||||||
remoteBuildParams :: [String]
|
remoteBuildParams :: [String]
|
||||||
remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "0"]
|
remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "1"]
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
${code}
|
${code}
|
||||||
|
|
2
private
2
private
|
@ -1 +1 @@
|
||||||
Subproject commit 0e15991576467a2f59cbf4ad783ea901fd5c4207
|
Subproject commit ae84b4fab2bbf274eab1479821d472701c952a41
|
Loading…
Reference in a new issue