movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2019-06-23 15:38:41 +02:00
commit dafee3d91a
99 changed files with 629 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/misc/documentation.nix
View file

@ -49,11 +49,7 @@ let
if [ -z "$browser" ]; then
browser="$(type -P xdg-open || true)"
if [ -z "$browser" ]; then
browser="$(type -P w3m || true)"
if [ -z "$browser" ]; then
echo "$0: unable to start a web browser; please set \$BROWSER"
exit 1
fi
browser="${pkgs.w3m-nographics}/bin/w3m"
fi
fi
exec "$browser" ${manual.manualHTMLIndex}
@ -187,8 +183,6 @@ in
})
(mkIf cfg.doc.enable {
# TODO(@oxij): put it here and remove from profiles?
# environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
environment.pathsToLink = [ "/share/doc" ];
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
})

2
nixos/modules/services/backup/duplicati.nix
View file

@ -19,7 +19,7 @@ in
};
interface = mkOption {
default = "lo";
default = "127.0.0.1";
type = types.str;
description = ''
Listening interface for the web UI

4
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file

@ -133,7 +133,9 @@ def get_generations(profile=None):
universal_newlines=True)
gen_lines = gen_list.split('\n')
gen_lines.pop()
return [ (profile, int(line.split()[0])) for line in gen_lines ]
configurationLimit = @configurationLimit@
return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:]
def remove_old_entries(gens):
rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")

12
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View file

@ -22,7 +22,7 @@ let
editor = if cfg.editor then "True" else "False";
inherit (cfg) consoleMode;
inherit (cfg) consoleMode configurationLimit;
inherit (efi) efiSysMountPoint canTouchEfiVariables;
@ -57,6 +57,16 @@ in {
'';
};
configurationLimit = mkOption {
default = 100;
example = 120;
type = types.int;
description = ''
Maximum of configurations in boot menu. Otherwise boot partition could
run out of disk space.
'';
};
consoleMode = mkOption {
default = "keep";