Merge master into staging-next (42e0f1d8) · Commits · nix / nixpkgs

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

+2 −0

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

		- [Tenstorrent](https://tenstorrent.com) hardware module has been added.

		- [nixbit](https://github.com/pbek/nixbit), a GUI application for updating your NixOS system from a Nix Flakes Git repository. Available as [programs.nixbit](#opt-programs.nixbit.enable).

		## Backward Incompatibilities {#sec-release-25.11-incompatibilities}

		<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+1 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,7 @@
		./programs/nix-index.nix
		./programs/nix-ld.nix
		./programs/nix-required-mounts.nix
		./programs/nixbit.nix
		./programs/nm-applet.nix
		./programs/nncp.nix
		./programs/noisetorch.nix

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		{
		config,
		lib,
		pkgs,
		...
		}:

		let
		inherit (lib)
		mkEnableOption
		mkIf
		mkOption
		mkPackageOption
		types
		;
		cfg = config.programs.nixbit;
		in
		{
		options.programs.nixbit = {
		enable = mkEnableOption "Nixbit configuration";

		package = mkPackageOption pkgs "nixbit" { };

		repository = mkOption {
		type = types.str;
		description = "Git repository URL for Nixbit";
		};

		forceAutostart = mkEnableOption "" // {
		description = "Force creation of autostart desktop entry when application starts";
		};
		};

		config = mkIf cfg.enable {
		environment = {
		systemPackages = [ cfg.package ];

		etc."nixbit.conf".text =
		lib.optionalString (cfg.repository != "") ''
		[Repository]
		Url = ${cfg.repository}
		''
		+ ''
		[Autostart]
		Force = ${if cfg.forceAutostart then "true" else "false"}
		'';
		};
		};
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,16 @@ in
		description = "Whether to open the firewall for the specified port.";
		};

		environmentFile = mkOption {
		type = types.nullOr types.path;
		default = null;
		description = ''
		Environment file for specifying additional settings such as secrets.

		See <https://actualbudget.org/docs/config/oauth-auth#environment-variables>.
		'';
		};

		settings = mkOption {
		default = { };
		description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.";
		@@ -76,6 +86,7 @@ in
		Group = "actual";
		StateDirectory = "actual";
		WorkingDirectory = dataDir;
		EnvironmentFile = cfg.environmentFile;
		LimitNOFILE = "1048576";
		PrivateTmp = true;
		PrivateDevices = true;

+9 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,15 @@ stdenv.mkDerivation rec {

		cargoRoot = "libs/librepcb/rust-core";

		postPatch = ''
		substituteInPlace libs/muparser/CMakeLists.txt \
		--replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
		substituteInPlace libs/type_safe{/,/external/debug_assert/}CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
		substituteInPlace libs/googletest{/,/googlemock/,/googletest/}CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
		'';

		meta = with lib; {
		description = "Free EDA software to develop printed circuit boards";
		homepage = "https://librepcb.org/";