Upgrade nixos to latest

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

diff --git a/nixops/Makefile b/nixops/Makefile
index 6adc6e76766aa2b941738cd53b0b663588f4c474..5e654ee23d8542358fa14142ec041fd82d9216a7 100644 (file)
--- 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.172754.0728c3e026e/nixexprs.tar.xz
+nixpkgs ?= https://releases.nixos.org/nixos/19.03/nixos-19.03.173677.daf861a810d/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 <nixpkgs> { 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