X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=fafbe00f7eb21d456733cfdfeadf9b59d79a416e;hb=3ffa15baf832f5b94cfd8d1b978eaa42f4102e07;hp=3ab58cf65e74aa89208aee22702331fca09293c6;hpb=4506dbe51901f66406a02042b2097b3b3856e8a6;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/Makefile b/Makefile
index 3ab58cf..fafbe00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 subrecipes = setup
-subrecipes += nixops ssh-eldiron info debug dry-run build upload deploy deploy-reboot reboot
+subrecipes += nixops ssh-eldiron ssh-backup-2 ssh-monitoring-1
+subrecipes += info debug dry-run build upload deploy deploy-reboot reboot
 subrecipes += list-generations delete-generations cleanup
 subrecipes += pull pull_environment pull_deployment deployment_is_set push push_deployment push_environment
 ${subrecipes}:
@@ -20,10 +21,10 @@ env-dry-run:
 	./scripts/make-env --dry-run
 
 nix-info:
-	@version=$$(nix eval --raw nixpkgs.lib.version) && \
+	@version=$$(nix eval --option tarball-ttl 1 --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
 
 nix-info-nixops:
 	@$(MAKE) --no-print-directory -C nixops/ nix-info