nixos: 19.03 -> 19.09

nixos-19.09 2019-11-24-phenom
Yves Dubromelle 6 years ago
parent fe0ea31e30
commit 7681f7774e

@ -35,7 +35,7 @@ optimise:
$(TIME) nix optimise-store $(TIME) nix optimise-store
rebuild-build: rebuild-build:
nix-channel --add https://nixos.org/channels/nixos-19.03 nixos nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
$(TIME) time nixos-rebuild build --fallback --show-trace $(TIME) time nixos-rebuild build --fallback --show-trace
rebuild-switch: rebuild-switch:
@ -58,7 +58,7 @@ store-repair:
$(TIME) nix-store --verify --check-contents --repair $(TIME) nix-store --verify --check-contents --repair
upgrade: upgrade:
nix-channel --add https://nixos.org/channels/nixos-19.03 nixos nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace $(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
##--------- Commandes spécifiques pour NixOS -- Opérations non courantes ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes

@ -12,7 +12,7 @@ in
nix.buildCores = 0; nix.buildCores = 0;
# The NixOS release to be compatible with for stateful data such as databases. # The NixOS release to be compatible with for stateful data such as databases.
system.stateVersion = "19.03"; system.stateVersion = "19.09";
# copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix) # copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
system.copySystemConfiguration = true; system.copySystemConfiguration = true;

@ -63,7 +63,7 @@ let
ipAddress = mkOption { ipAddress = mkOption {
description = "Adresse IP."; description = "Adresse IP.";
type = lib.types.string; type = lib.types.str;
}; };
nix-serve-server = mkEnableOption "nix-serve server."; nix-serve-server = mkEnableOption "nix-serve server.";
nix-serve-client = { nix-serve-client = {
@ -80,18 +80,18 @@ let
dnsFQDN = mkOption { dnsFQDN = mkOption {
example = "device.example.net."; example = "device.example.net.";
description = "DNS name of host pointing to tunnel IP."; description = "DNS name of host pointing to tunnel IP.";
type = lib.types.string; type = lib.types.str;
}; };
connectToAddress = mkOption { connectToAddress = mkOption {
default = ""; default = "";
example = "192.168.1.1"; example = "192.168.1.1";
description = "External address to connect from another node."; description = "External address to connect from another node.";
type = lib.types.string; type = lib.types.str;
}; };
vpnAddress = mkOption { vpnAddress = mkOption {
example = "192.168.69.69/24"; example = "192.168.69.69/24";
description = "VPN local node IP address."; description = "VPN local node IP address.";
type = lib.types.string; type = lib.types.str;
}; };
vpnCidrLength = mkOption { vpnCidrLength = mkOption {
default = 24; default = 24;
@ -106,7 +106,7 @@ let
ConnecTo = bar ConnecTo = bar
''; '';
description = "Configuration supplémentaire pour tinc."; description = "Configuration supplémentaire pour tinc.";
type = lib.types.string; type = lib.types.str;
}; };
}; };
@ -129,7 +129,7 @@ let
enable = mkEnableOption "Activation du démarrage de Windows par Grub"; enable = mkEnableOption "Activation du démarrage de Windows par Grub";
drive = mkOption { drive = mkOption {
description = "Lecteur sur lequel est présent le système Windows (au format GRUB)"; description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
type = lib.types.string; type = lib.types.str;
default = "hd0,1"; default = "hd0,1";
}; };
}; };
@ -137,7 +137,7 @@ let
enable = mkEnableOption "Montage de la partition data Windows"; enable = mkEnableOption "Montage de la partition data Windows";
device = mkOption { device = mkOption {
description = "Lecteur sur lequel est présent le disque de data Windows"; description = "Lecteur sur lequel est présent le disque de data Windows";
type = lib.types.string; type = lib.types.str;
default = "/dev/sda2"; default = "/dev/sda2";
}; };
}; };

Loading…
Cancel
Save