Use pools instead of deprecated poolConfigs for php

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

diff --git a/Makefile b/Makefile
index 3ab58cf65e74aa89208aee22702331fca09293c6..fafbe00f7eb21d456733cfdfeadf9b59d79a416e 100644 (file)
--- 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