Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 96151a48dd66
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa81b2c1e590
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Jun 25, 2019

  1. Add configurationLimit to systemd-boot to prevent running out of disk… 

    … space

Refs #23926

(cherry picked from commit 224a656)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Jun 25, 2019
    Copy the full SHA
    17be62f View commit details

Commits on Jul 26, 2019

  1. Merge pull request #63766 from NixOS/backport-systemd-boot-configurat… 

    …ionLimit

Add configurationLimit to systemd-boot to prevent running out of disk…
    @domenkozar
    domenkozar authored Jul 26, 2019
    Copy the full SHA
    760e770 View commit details

  2. linux: 4.19.60 -> 4.19.61

    @NeQuissimus
    NeQuissimus committed Jul 26, 2019
    Copy the full SHA
    1080955 View commit details

  3. linux: 5.1.19 -> 5.1.20

    @NeQuissimus
    NeQuissimus committed Jul 26, 2019
    Copy the full SHA
    2418b95 View commit details

  4. nixos/systemd-boot: don't remove directories from EFI dir 

    This will only result in an error. These directories might be created by, for example, fwupdmgr.

(cherry picked from commit fa2e4bf)
    @abbradar
    abbradar committed Jul 26, 2019
    Copy the full SHA
    aa81b2c View commit details
6 changes: 4 additions & 2 deletions nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View file
Original file line number Diff line number Diff line change
@@ -124,7 +124,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$")
@@ -145,7 +147,7 @@ def remove_old_entries(gens):
except ValueError:
pass
for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"):
if not path in known_paths:
if not path in known_paths and not os.path.isdir(path):
os.unlink(path)

def get_profiles():
15 changes: 15 additions & 0 deletions nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@ let

editor = if cfg.editor then "True" else "False";

configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;

inherit (cfg) consoleMode;

inherit (efi) efiSysMountPoint canTouchEfiVariables;
@@ -55,6 +57,19 @@ in {
'';
};

configurationLimit = mkOption {
default = null;
example = 120;
type = types.nullOr types.int;
description = ''
Maximum number of latest generations in the boot menu.
Useful to prevent boot partition running out of disk space.
<literal>null</literal> means no limit i.e. all generations
that were not garbage collected yet.
'';
};

consoleMode = mkOption {
default = "keep";

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.60";
version = "4.19.61";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ibayrvrnw2lw7si78vdqnr20mm1d3z0g6a0ykndvgn5vdax5x9a";
sha256 = "1scwb6ynr93k4a1vzpw2x1hzafhfs06ckf9v6fk1zvkh8jw1rc5c";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.1.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.1.19";
version = "5.1.20";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1hk8dhp402vr74wq22j66yqr7iik0mcrahpmmq3dcl657vw1n8qf";
sha256 = "039i5b41dv930kmq8jwskcwjc6r26h9xy7jgbi6aggn0ycyig21d";
};
} // (args.argsOverride or {}))