mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

nix: fix rollback command

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2023-03-31 15:17:40 +03:00
parent 8c7fb4159d
commit 6ed972043e
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -37,13 +37,21 @@ $(1): ;
systemctl --user reset-failed systemctl --user reset-failed
$$(NIX_RUN)switch/$(1) $$(NIX_RUN)switch/$(1)
.PHONY: $(1)-test .PHONY: rollback-$(1)
$(1)-test: ; $$(NIX_RUN)test/$(1) rollback-$(1):
$$(NIX_RUN)rollback/$(1)
.PHONY: test-$(1)
test-$(1): ; $$(NIX_RUN)test/$(1)
endef endef
define vps_rule define vps_rule
.PHONY: $(1) .PHONY: $(1)
$(1): ; $$(NIX_RUN)deploy/$(1) $(1): ; $$(NIX_RUN)deploy/$(1)
.PHONY: rollback-$(1)
rollback-$(1):
$$(NIX_RUN)rollback/$(1)
endef endef
$(foreach machine,$(MACHINES),$(eval $(call machine_rule,$(machine)))) $(foreach machine,$(MACHINES),$(eval $(call machine_rule,$(machine))))

4
flake.nix
View file

@ -74,9 +74,7 @@
rollback = lib.recurseIntoAttrs (lib.mapAttrs rollback = lib.recurseIntoAttrs (lib.mapAttrs
(hostname: machine: pkgs.writeShellScript "rollback-${hostname}" '' (hostname: machine: pkgs.writeShellScript "rollback-${hostname}" ''
${nixos-rebuild}/bin/nixos-rebuild test \ ${nixos-rebuild}/bin/nixos-rebuild switch --rollback
--rollback \
--flake .#${hostname}
'') '')
self.nixosConfigurations); self.nixosConfigurations);