Merge master into staging-next
This commit is contained in:
@@ -184,6 +184,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
runGarbageCollection = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to automatically run `nix-gc.service` after a successful
|
||||
system upgrade.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
@@ -197,6 +206,12 @@ in
|
||||
The options 'system.autoUpgrade.channel' and 'system.autoUpgrade.flake' cannot both be set.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = (cfg.runGarbageCollection -> config.nix.enable);
|
||||
message = ''
|
||||
The option 'system.autoUpgrade.runGarbageCollection = true' requires 'nix.enable = true'.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
system.autoUpgrade.flags = (
|
||||
@@ -218,6 +233,9 @@ in
|
||||
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
unitConfig.OnSuccess = lib.optional (
|
||||
cfg.runGarbageCollection && config.nix.enable
|
||||
) "nix-gc.service";
|
||||
|
||||
serviceConfig.Type = "oneshot";
|
||||
|
||||
|
||||
@@ -21,18 +21,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "crosvm";
|
||||
version = "0-unstable-2025-11-05";
|
||||
version = "0-unstable-2025-11-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb";
|
||||
hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs=";
|
||||
rev = "3d7db6c9fded7a184e279ca9170abfa94fd59e34";
|
||||
hash = "sha256-sRl0ABggh1u3ctsqA/OSgDKtB1mO6zNHiRKvZ316sOM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-P6vFWs9lVn4EkXUVOi+3s/tptAV/J7tH5GBCQv/dwUA=";
|
||||
cargoHash = "sha256-NeyJLsE/Uvcg/kNzS1SXEBjExKwbjcHkkhT2jSQjxx4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "disposable-email-domains";
|
||||
version = "0.0.147";
|
||||
version = "0.0.149";
|
||||
pyproject = true;
|
||||
|
||||
# No tags on GitHub
|
||||
src = fetchPypi {
|
||||
pname = "disposable_email_domains";
|
||||
inherit version;
|
||||
hash = "sha256-sbMQ9izDOzrQOoYKpSLWO/+W2/3bGMhlyFP34oOff5g=";
|
||||
hash = "sha256-bgGs6F41rKVAI6qIyNiqOr5hfCs6ardq6WFJtpZxFCc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
Reference in New Issue
Block a user