From 8421f7103167a0e2d40a181a14e8a67fa94fea63 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Thu, 10 Oct 2019 00:35:43 +0200 Subject: [PATCH] Update to NixOS 19.09 --- auto-upgrade.nix | 114 ---------------------------------------------- configuration.nix | 2 - 2 files changed, 116 deletions(-) delete mode 100644 auto-upgrade.nix diff --git a/auto-upgrade.nix b/auto-upgrade.nix deleted file mode 100644 index 18753ae..0000000 --- a/auto-upgrade.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.system.autoUpgrade; in - -{ - - options = { - - system.autoUpgrade = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to periodically upgrade NixOS to the latest - version. If enabled, a systemd timer will run - nixos-rebuild switch --upgrade once a - day. - ''; - }; - - channel = mkOption { - type = types.nullOr types.str; - default = null; - example = https://nixos.org/channels/nixos-14.12-small; - description = '' - The URI of the NixOS channel to use for automatic - upgrades. By default, this is the channel set using - nix-channel (run nix-channel - --list to see the current value). - ''; - }; - - flags = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-I" "stuff=/home/alice/nixos-stuff" "--option" "extra-binary-caches" "http://my-cache.example.org/" ]; - description = '' - Any additional flags passed to nixos-rebuild. - ''; - }; - - dates = mkOption { - default = "04:40"; - type = types.str; - description = '' - Specification (in the format described by - systemd.time - 7) of the time at - which the update will occur. - ''; - }; - - allowReboot = mkOption { - default = false; - type = types.bool; - description = '' - Reboot the system into the new generation instead of a switch - if the new generation uses a different kernel, kernel modules - or initrd than the booted system. - ''; - }; - - }; - - }; - - config = lib.mkIf cfg.enable { - - system.autoUpgrade.flags = - [ "--no-build-output" ] - ++ (if cfg.channel == null - then [ "--upgrade" ] - else [ "-I" "nixpkgs=${cfg.channel}/nixexprs.tar.xz" ]); - - systemd.services.nixos-upgrade = { - description = "NixOS Upgrade"; - - restartIfChanged = false; - unitConfig.X-StopOnRemoval = false; - - serviceConfig.Type = "oneshot"; - - environment = config.nix.envVars // - { inherit (config.environment.sessionVariables) NIX_PATH; - HOME = "/root"; - } // config.networking.proxy.envVars; - - path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gitMinimal config.nix.package.out ]; - - script = let - nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; - in - if cfg.allowReboot then '' - ${nixos-rebuild} boot ${toString cfg.flags} - booted="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})" - built="$(readlink /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})" - if [ "$booted" = "$built" ]; then - ${nixos-rebuild} switch ${toString cfg.flags} - else - /run/current-system/sw/bin/shutdown -r +1 - fi - '' else '' - ${nixos-rebuild} switch ${toString cfg.flags} - ''; - - startAt = cfg.dates; - }; - - }; - -} diff --git a/configuration.nix b/configuration.nix index d4cdf95..777cbac 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,10 +5,8 @@ { config, pkgs, ... }: { - disabledModules = [ "tasks/auto-upgrade.nix" ]; imports = [ - ./auto-upgrade.nix ./hardware-configuration.nix ./sshusers.nix ./variables.nix