Merge master into staging-next (50751b06) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+11 −0

Original line number	Diff line number	Diff line
		@@ -12098,6 +12098,11 @@
		githubId = 59313755;
		name = "Maxim Karasev";
		};
		mxmlnkn = {
		github = "mxmlnkn";
		githubId = 6842824;
		name = "Maximilian Knespel";
		};
		myaats = {
		email = "mats@mats.sh";
		github = "Myaats";
		@@ -15290,6 +15295,12 @@
		githubId = 171470;
		name = "Sam Hug";
		};
		SamirTalwar = {
		email = "lazy.git@functional.computer";
		github = "SamirTalwar";
		githubId = 47852;
		name = "Samir Talwar";
		};
		samlich = {
		email = "nixos@samli.ch";
		github = "samlich";

+4 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,10 @@

		- `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.

		- `nano` was removed from `environment.defaultPackages`. To not leave systems without a editor, now `programs.nano.enable` is enabled by default.

		- `programs.nano.nanorc` and `programs.nano.syntaxHighlight` no longer have an effect unless `programs.nano.enable` is set to true which is the default.

		- `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli.

		- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`.

+1 −2

+15 −19

Original line number	Diff line number	Diff line
		@@ -2,14 +2,16 @@

		let
		cfg = config.programs.nano;
		LF = "\n";
		in

		{
		###### interface

		options = {
		programs.nano = {
		enable = lib.mkEnableOption (lib.mdDoc "nano") // {
		default = true;
		};

		package = lib.mkPackageOptionMD pkgs "nano" { };

		nanorc = lib.mkOption {
		type = lib.types.lines;
		@@ -24,28 +26,22 @@ in
		set tabsize 2
		'';
		};

		syntaxHighlight = lib.mkOption {
		type = lib.types.bool;
		default = true;
		default = false;
		description = lib.mdDoc "Whether to enable syntax highlight for various languages.";
		};
		};
		};

		###### implementation

		config = lib.mkIf (cfg.nanorc != "" \|\| cfg.syntaxHighlight) {
		environment.etc.nanorc.text = lib.concatStringsSep LF (
		( lib.optionals cfg.syntaxHighlight [
		"# The line below is added because value of programs.nano.syntaxHighlight is set to true"
		''include "${pkgs.nano}/share/nano/*.nanorc"''
		""
		])
		++ ( lib.optionals (cfg.nanorc != "") [
		"# The lines below have been set from value of programs.nano.nanorc"
		cfg.nanorc
		])
		);
		config = lib.mkIf cfg.enable {
		environment = {
		etc.nanorc.text = (lib.optionalString cfg.syntaxHighlight ''
		# load syntax highlighting files
		include "${cfg.package}/share/nano/*.nanorc"
		'') + cfg.nanorc;
		systemPackages = [ cfg.package ];
		};
		};

		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		, fmt_9
		, glm
		, gtk3
		, hidapi
		, imgui
		, libpng
		, libzip
		@@ -31,13 +32,13 @@

		stdenv.mkDerivation rec {
		pname = "cemu";
		version = "2.0-45";
		version = "2.0-47";

		src = fetchFromGitHub {
		owner = "cemu-project";
		repo = "Cemu";
		rev = "v${version}";
		hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko=";
		hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak=";
		};

		patches = [
		@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
		fmt_9
		glm
		gtk3
		hidapi
		imgui
		libpng
		libzip