X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2FMakefile;h=fb55029804b19636f4f723430a1c7fb2b4acd4bd;hb=ddaa9caff97e801c9299ec9d952c547313e942f0;hp=69603a018ea95341f9e904d993dff4671bdffc1a;hpb=4506dbe51901f66406a02042b2097b3b3856e8a6;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/Makefile b/nixops/Makefile index 69603a0..fb55029 100644 --- a/nixops/Makefile +++ b/nixops/Makefile @@ -5,7 +5,7 @@ endif NIXOPS_STATE ?= ./state/eldiron.nixops NIXOPS_DEPLOYMENT = cef694f3-081d-11e9-b31f-0242ec186adf -nixpkgs ?= https://releases.nixos.org/nixos/19.03/nixos-19.03.172731.3efdf45dbd1/nixexprs.tar.xz +nixpkgs ?= https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz NIX_PATH = nixpkgs=${nixpkgs}:nixpkgsNext=${nixpkgs}:nixpkgsPrevious=${nixpkgs} NIXOPS := $(shell NIX_PATH=$(NIX_PATH) nix-build --no-out-link -E "with import { overlays = builtins.attrValues (import ../overlays); }; nixops")/bin/nixops @@ -16,7 +16,7 @@ nix-info: @version=$$(nix eval --raw nixpkgs.lib.version) && \ mainversion=$$(echo $$version | cut -d"." -f -2) && \ echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ - nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4 + nix-instantiate --find-file nixpkgs .PHONY: nix-info ###### Initial setup @@ -33,6 +33,9 @@ SSH_ARGS ?= ssh-eldiron: $(NIXOPS_PRIV) ssh eldiron -- $(SSH_ARGS) +ssh-backup-2: + $(NIXOPS_PRIV) ssh backup-2 -- $(SSH_ARGS) + info: $(NIXOPS_PRIV) list $(NIXOPS_PRIV) info