Merge master into staging-next (33de99b4) · Commits · nix / nixpkgs

lib/kernel.nix

+4 −3

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ with lib;
		yes = { tristate = "y"; optional = false; };
		no = { tristate = "n"; optional = false; };
		module = { tristate = "m"; optional = false; };
		unset = { tristate = null; optional = false; };
		freeform = x: { freeform = x; optional = false; };

		/*

nixos/doc/manual/release-notes/rl-2305.section.md

+3 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ In addition to numerous new and upgraded packages, this release has the followin

		- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable).

		- [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Availabe as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin).
		- [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Available as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin).

		- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).

		@@ -140,6 +140,8 @@ In addition to numerous new and upgraded packages, this release has the followin

		- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead.

		- `services.asusd` configuration now uses strings instead of structured configuration, as upstream switched to the [RON](https://github.com/ron-rs/ron) configuration format. Support for structured configuration may return when [RON](https://github.com/ron-rs/ron) generation is implemented in nixpkgs.

		- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages).

		- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

nixos/modules/services/hardware/asusd.nix

+27 −37

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@

		let
		cfg = config.services.asusd;
		json = pkgs.formats.json { };
		toml = pkgs.formats.toml { };
		in
		{
		options = {
		@@ -19,55 +17,55 @@ in
		};

		animeConfig = lib.mkOption {
		type = json.type;
		default = { };
		type = lib.types.nullOr lib.types.str;
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/anime.conf.
		The content of /etc/asusd/anime.ron.
		See https://asus-linux.org/asusctl/#anime-control.
		'';
		};

		asusdConfig = lib.mkOption {
		type = json.type;
		default = { };
		type = lib.types.nullOr lib.types.str;
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/asusd.conf.
		The content of /etc/asusd/asusd.ron.
		See https://asus-linux.org/asusctl/.
		'';
		};

		auraConfig = lib.mkOption {
		type = json.type;
		default = { };
		type = lib.types.nullOr lib.types.str;
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/aura.conf.
		The content of /etc/asusd/aura.ron.
		See https://asus-linux.org/asusctl/#led-keyboard-control.
		'';
		};

		profileConfig = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		default = "";
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/profile.conf.
		The content of /etc/asusd/profile.ron.
		See https://asus-linux.org/asusctl/#profiles.
		'';
		};

		ledModesConfig = lib.mkOption {
		type = lib.types.nullOr toml.type;
		fanCurvesConfig = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/asusd-ledmodes.toml. Leave `null` to use default settings.
		See https://asus-linux.org/asusctl/#led-keyboard-control.
		The content of /etc/asusd/fan_curves.ron.
		See https://asus-linux.org/asusctl/#fan-curves.
		'';
		};

		userLedModesConfig = lib.mkOption {
		type = lib.types.nullOr toml.type;
		type = lib.types.nullOr lib.types.str;
		default = null;
		description = lib.mdDoc ''
		The content of /etc/asusd/asusd-user-ledmodes.toml.
		The content of /etc/asusd/asusd-user-ledmodes.ron.
		See https://asus-linux.org/asusctl/#led-keyboard-control.
		'';
		};
		@@ -79,26 +77,18 @@ in

		environment.etc =
		let
		maybeConfig = name: cfg: lib.mkIf (cfg != { }) {
		source = json.generate name cfg;
		maybeConfig = name: cfg: lib.mkIf (cfg != null) {
		source = pkgs.writeText name cfg;
		mode = "0644";
		};
		in
		{
		"asusd/anime.conf" = maybeConfig "anime.conf" cfg.animeConfig;
		"asusd/asusd.conf" = maybeConfig "asusd.conf" cfg.asusdConfig;
		"asusd/aura.conf" = maybeConfig "aura.conf" cfg.auraConfig;
		"asusd/profile.conf" = lib.mkIf (cfg.profileConfig != null) {
		source = pkgs.writeText "profile.conf" cfg.profileConfig;
		mode = "0644";
		};
		"asusd/asusd-ledmodes.toml" = {
		source =
		if cfg.ledModesConfig == null
		then "${pkgs.asusctl}/share/asusd/data/asusd-ledmodes.toml"
		else toml.generate "asusd-ledmodes.toml" cfg.ledModesConfig;
		mode = "0644";
		};
		"asusd/anime.ron" = maybeConfig "anime.ron" cfg.animeConfig;
		"asusd/asusd.ron" = maybeConfig "asusd.ron" cfg.asusdConfig;
		"asusd/aura.ron" = maybeConfig "aura.ron" cfg.auraConfig;
		"asusd/profile.conf" = maybeConfig "profile.ron" cfg.profileConfig;
		"asusd/fan_curves.ron" = maybeConfig "fan_curves.ron" cfg.fanCurvesConfig;
		"asusd/asusd_user_ledmodes.ron" = maybeConfig "asusd_user_ledmodes.ron" cfg.userLedModesConfig;
		};

		services.dbus.enable = true;

nixos/modules/services/misc/fstrim.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ in {

		systemd.timers.fstrim = {
		timerConfig = {
		OnCalendar = cfg.interval;
		OnCalendar = [ "" cfg.interval ];
		};
		wantedBy = [ "timers.target" ];
		};

pkgs/applications/audio/pipecontrol/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@

		stdenv.mkDerivation rec {
		pname = "pipecontrol";
		version = "0.2.8";
		version = "0.2.10";

		src = fetchFromGitHub {
		owner = "portaloffreedom";
		repo = pname;
		rev = "v${version}";
		sha256 = "sha256-x33L/oLgJFiHp19FzinVuGT9k73wOhdSaTTemq52ZVg=";
		sha256 = "sha256-MSm9rW41x8qvPuDermOPIYpxgblk5hlKIQsUEAvCzMo=";
		};

		nativeBuildInputs = [