Upgrade nixos

[perso/Immae/Config/Nix.git] / nixops / Makefile

diff --git a/nixops/Makefile b/nixops/Makefile
index 1852e7510c1754b9c7bb8092df3c5358d27e3aa3..8caf8b193bfd2101e8d0cd1927c8dd4ff1a701b1 100644 (file)
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -5,8 +5,10 @@ endif
 
 NIXOPS_STATE ?= ./state/eldiron.nixops
 NIXOPS_DEPLOYMENT = cef694f3-081d-11e9-b31f-0242ec186adf
-nixpkgs ?= https://releases.nixos.org/nixos/19.03/nixos-19.03.173677.daf861a810d/nixexprs.tar.xz
-NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs}
+nixpkgs ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops".url')
+nixpkgsNext ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops-next".url')
+nixpkgsPrevious ?= $(shell cat ../nix/sources.json | jq -r '."nixpkgs-nixops-previous".url')
+NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgsNext}:nixpkgsPrevious=${nixpkgsPrevious}
 
 NIXOPS := $(shell NIX_PATH=$(NIX_PATH) nix-build --no-out-link -E "with import <nixpkgs> { overlays = builtins.attrValues (import ../overlays); }; nixops")/bin/nixops
 NIXOPS_PRIV = ./scripts/with_env $(NIXOPS)
@@ -53,10 +55,10 @@ dry-run:
        $(NIXOPS_PRIV) deploy --dry-run
 
 build:
-       $(NIXOPS_PRIV) deploy --build-only
+       $(NIXOPS_PRIV) deploy --build-only --max-jobs 1
 
 upload:
-       $(NIXOPS_PRIV) deploy --copy-only
+       $(NIXOPS_PRIV) deploy --copy-only --max-concurrent-copy 1
 
 deploy:
        $(NIXOPS_PRIV) deploy