Merge master into staging-next (557897f8) · Commits · nix / nixpkgs

nixos/tests/xmpp/ejabberd.nix

+15 −0

Original line number	Diff line number	Diff line
		let
		cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
		openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500
		mkdir -p $out
		cp key.pem cert.pem $out
		'';
		in
		import ../make-test-python.nix ({ pkgs, ... }: {
		name = "ejabberd";
		meta = with pkgs.lib.maintainers; {
		@@ -5,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
		};
		nodes = {
		client = { nodes, pkgs, ... }: {
		security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
		networking.extraHosts = ''
		${nodes.server.config.networking.primaryIPAddress} example.com
		'';
		@@ -14,6 +22,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
		];
		};
		server = { config, pkgs, ... }: {
		security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
		networking.extraHosts = ''
		${config.networking.primaryIPAddress} example.com
		'';
		@@ -23,6 +32,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
		configFile = "/etc/ejabberd.yml";
		};

		systemd.services.ejabberd.serviceConfig.TimeoutStartSec = "15min";
		environment.etc."ejabberd.yml" = {
		user = "ejabberd";
		mode = "0600";
		@@ -40,6 +50,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
		max_stanza_size: 65536
		shaper: c2s_shaper
		access: c2s
		starttls: true
		-
		port: 5269
		ip: "::"
		@@ -56,6 +67,10 @@ import ../make-test-python.nix ({ pkgs, ... }: {
		request_handlers:
		"/upload": mod_http_upload

		certfiles:
		- ${cert pkgs}/key.pem
		- ${cert pkgs}/cert.pem

		## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
		## password storage (see auth_password_format option).
		disable_sasl_mechanisms: "digest-md5"

pkgs/README.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ Now that this is out of the way. To add a package to Nixpkgs:

		https://www.mozilla.org/en-US/firefox/55.0/releasenotes/

		(using "→" instead of "->" is also accepted)

		## Category Hierarchy
		[categories]: #category-hierarchy

pkgs/applications/editors/vim/plugins/generated.nix

+36 −0

Original line number	Diff line number	Diff line
		@@ -653,6 +653,18 @@ final: prev:
		meta.homepage = "https://github.com/vim-scripts/align/";
		};

		align-nvim = buildVimPlugin {
		pname = "align.nvim";
		version = "2024-10-20";
		src = fetchFromGitHub {
		owner = "Vonr";
		repo = "align.nvim";
		rev = "12ed24b34df81d57e777fea5a535611bab10a620";
		sha256 = "sha256-z8+lEs8bQS4Gz3cgQQ5Cb3oW58Et7it/tAxUtE3cLc4=";
		};
		meta.homepage = "https://github.com/Vonr/align.nvim/";
		};

		alpha-nvim = buildVimPlugin {
		pname = "alpha-nvim";
		version = "2024-09-30";
		@@ -4067,6 +4079,18 @@ final: prev:
		meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
		};

		focus-nvim = buildVimPlugin {
		pname = "focus.nvim";
		version = "2024-10-20";
		src = fetchFromGitHub {
		owner = "nvim-focus";
		repo = "focus.nvim";
		rev = "3841a38df972534567e85840d7ead20d3a26faa6";
		sha256 = "sha256-mgHk4u0ab2uSUNE+7DU22IO/xS5uop9iATfFRk6l6hs=";
		};
		meta.homepage = "https://github.com/nvim-focus/focus.nvim/";
		};

		fold-preview-nvim = buildVimPlugin {
		pname = "fold-preview.nvim";
		version = "2023-01-27";
		@@ -8718,6 +8742,18 @@ final: prev:
		meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
		};

		nvim-gomove = buildVimPlugin {
		pname = "nvim-gomove";
		version = "2024-10-20";
		src = fetchFromGitHub {
		owner = "booperlv";
		repo = "nvim-gomove";
		rev = "2b44ae7ac0804f4e3959228122f7c85bef1964e3";
		sha256 = "sha256-9YLJm/L13gTktb6VIkz2W/60cothFtF7feiKd26R5lo=";
		};
		meta.homepage = "https://github.com/booperlv/nvim-gomove/";
		};

		nvim-gps = buildVimPlugin {
		pname = "nvim-gps";
		version = "2022-07-05";

pkgs/applications/editors/vim/plugins/vim-plugin-names

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ https://github.com/joshuavial/aider.nvim/,HEAD,
		https://github.com/slashmili/alchemist.vim/,,
		https://github.com/dense-analysis/ale/,,
		https://github.com/vim-scripts/align/,,
		https://github.com/Vonr/align.nvim/,HEAD,
		https://github.com/goolord/alpha-nvim/,HEAD,
		https://github.com/anuvyklack/animation.nvim/,HEAD,
		https://github.com/Olical/aniseed/,,
		@@ -338,6 +339,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
		https://github.com/fhill2/floating.nvim/,,
		https://github.com/floobits/floobits-neovim/,,
		https://github.com/akinsho/flutter-tools.nvim/,HEAD,
		https://github.com/nvim-focus/focus.nvim/,HEAD,
		https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
		https://github.com/mhartington/formatter.nvim/,,
		https://github.com/megaannum/forms/,,
		@@ -732,6 +734,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,,
		https://github.com/vijaymarupudi/nvim-fzf-commands/,,
		https://github.com/sakhnik/nvim-gdb/,,
		https://github.com/chrisgrieser/nvim-genghis/,HEAD,
		https://github.com/booperlv/nvim-gomove/,HEAD,
		https://github.com/smiteshp/nvim-gps/,,
		https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
		https://github.com/Iron-E/nvim-highlite/,,

pkgs/applications/graphics/viewnior/default.nix

+29 −21

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms
		, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
		{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms
		, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl, wrapGAppsHook3, webp-pixbuf-loader, gnome, librsvg}:

		stdenv.mkDerivation rec {
		pname = "viewnior";
		version = "1.8";
		pname = "viewnior-gtk3";
		version = "1.8-unstable-2023-11-23";

		src = fetchFromGitHub {
		owner = "hellosiyan";
		#owner = "hellosiyan";
		#repo = "Viewnior";
		owner = "Artturin";
		repo = "Viewnior";
		rev = "${pname}-${version}";
		hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M=";
		# https://github.com/hellosiyan/Viewnior/pull/142
		rev = "23ce6e5630b24509d8009f17a833ad9e59b85fab";
		hash = "sha256-+/f0+og1Dd7eJK7P83+q4lf4SjzW2g6qNk8ZTxNAuDA=";
		};

		patches = [
		(fetchpatch {
		name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch";
		url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
		hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE=";
		})
		(fetchpatch {
		name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch";
		url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
		hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY=";
		})
		];

		nativeBuildInputs = [
		meson
		ninja
		@@ -32,10 +22,11 @@ stdenv.mkDerivation rec {
		desktop-file-utils
		intltool
		gettext
		wrapGAppsHook3
		];

		buildInputs = [
		gtk2
		gtk3
		libpng
		exiv2
		lcms
		@@ -45,6 +36,23 @@ stdenv.mkDerivation rec {
		perl
		];

		postInstall = ''
		export GDK_PIXBUF_MODULE_FILE="${
		gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
		extraLoaders = [
		webp-pixbuf-loader
		librsvg
		];
		}
		}"

		# gtk3 viewnior can be launched in wayland mode and does so by default
		# but moving around in a zoomed in image doesn't work
		gappsWrapperArgs+=(
		--set-default GDK_BACKEND x11
		)
		'';

		meta = with lib; {
		description = "Fast and simple image viewer";
		longDescription =