SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-24 13:01:28 +00:00
Code Issues Projects Releases Wiki Activity

nixos: config.system.build.nixos-rebuild instead of pkgs.nixos-rebuild

Browse source
This commit is contained in:
Alexander Tomokhov 2023-12-27 13:36:32 +04:00
parent 6735784bb7
commit 7883063dca
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
nixos/module.nix
View file

@ -2,6 +2,7 @@ selfprivacy-graphql-api: { config, lib, pkgs, ... }:
let let
cfg = config.services.selfprivacy-api; cfg = config.services.selfprivacy-api;
nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";
in in
{ {
options.services.selfprivacy-api = { options.services.selfprivacy-api = {
@ -37,7 +38,6 @@ in
pkgs.gzip pkgs.gzip
pkgs.gitMinimal pkgs.gitMinimal
config.nix.package.out config.nix.package.out
pkgs.nixos-rebuild
pkgs.restic pkgs.restic
pkgs.mkpasswd pkgs.mkpasswd
pkgs.util-linux pkgs.util-linux
@ -70,7 +70,6 @@ in
pkgs.gzip pkgs.gzip
pkgs.gitMinimal pkgs.gitMinimal
config.nix.package.out config.nix.package.out
pkgs.nixos-rebuild
pkgs.restic pkgs.restic
pkgs.mkpasswd pkgs.mkpasswd
pkgs.util-linux pkgs.util-linux
@ -92,7 +91,8 @@ in
environment = config.nix.envVars // { environment = config.nix.envVars // {
HOME = "/root"; HOME = "/root";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ]; # TODO figure out how to get dependencies list reliably
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out ];
# TODO set proper timeout for reboot instead of service restart # TODO set proper timeout for reboot instead of service restart
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
@ -100,11 +100,11 @@ in
SendSIGKILL = "no"; SendSIGKILL = "no";
}; };
script = '' script = ''
# sync with sp-modules sub-flake # sync top-level flake with sp-modules sub-flake
# (https://github.com/NixOS/nix/issues/9339) # (https://github.com/NixOS/nix/issues/9339)
${config.nix.package}/bin/nix flake lock /etc/nixos --update-input sp-modules nix flake lock /etc/nixos --update-input sp-modules
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos ${nixos-rebuild} switch --flake /etc/nixos#sp-nixos
''; '';
}; };
# One shot systemd service to upgrade NixOS using nixos-rebuild # One shot systemd service to upgrade NixOS using nixos-rebuild
@ -115,17 +115,21 @@ in
environment = config.nix.envVars // { environment = config.nix.envVars // {
HOME = "/root"; HOME = "/root";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ]; # TODO figure out how to get dependencies list reliably
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out ];
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
KillMode = "none"; KillMode = "none";
SendSIGKILL = "no"; SendSIGKILL = "no";
}; };
script = '' script = ''
nix flake update /etc/nixos/sp-modules
# FIXME get URL from systemd parameter # FIXME get URL from systemd parameter
${config.nix.package}/bin/nix flake update /etc/nixos/sp-modules/ nix flake update /etc/nixos \
${config.nix.package}/bin/nix flake update /etc/nixos --override-input selfprivacy-nixos-config git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes --override-input selfprivacy-nixos-config git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos
${nixos-rebuild} switch --flake /etc/nixos#sp-nixos
''; '';
}; };
# One shot systemd service to rollback NixOS using nixos-rebuild # One shot systemd service to rollback NixOS using nixos-rebuild
@ -136,10 +140,12 @@ in
environment = config.nix.envVars // { environment = config.nix.envVars // {
HOME = "/root"; HOME = "/root";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ]; # TODO figure out how to get dependencies list reliably
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out ];
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
ExecStart = "${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --rollback --flake /etc/nixos#sp-nixos"; ExecStart =
"${nixos-rebuild} switch --rollback --flake /etc/nixos#sp-nixos";
KillMode = "none"; KillMode = "none";
SendSIGKILL = "no"; SendSIGKILL = "no";
}; };