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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -10802,6 +10802,12 @@
		githubId = 79042825;
		name = "Jan Kremer";
		};
		JulianFP = {
		name = "Julian Partanen";
		github = "JulianFP";
		githubId = 70963316;
		keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A 3AC1 6FE2 79EB 5C9F 3466"; } ];
		};
		juliendehos = {
		email = "dehos@lisic.univ-littoral.fr";
		github = "juliendehos";

+0 −8

Original line number	Diff line number	Diff line
		@@ -1150,14 +1150,6 @@ in
		'';
		}

		{
		assertion = any (host: host.rejectSSL) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.19.4";
		message = ''
		services.nginx.virtualHosts.<name>.rejectSSL requires nginx version
		1.19.4 or above; see the documentation for services.nginx.package.
		'';
		}

		{
		assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts);
		message = ''

+1 −0

Original line number	Diff line number	Diff line
		@@ -929,6 +929,7 @@ in {
		sourcehut = handleTest ./sourcehut {};
		spacecookie = handleTest ./spacecookie.nix {};
		spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
		spiped = runTest ./spiped.nix;
		sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {};
		sslh = handleTest ./sslh.nix {};
		ssh-agent-auth = handleTest ./ssh-agent-auth.nix {};

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		{ pkgs, ... }:
		let
		key = pkgs.runCommand "key" { } "${pkgs.openssl}/bin/openssl rand 32 > $out";
		in
		{
		name = "spiped";
		meta = with pkgs.lib.maintainers; {
		maintainers = [ tomfitzhenry ];
		};

		nodes = {
		server =
		{ pkgs, lib, ... }:
		{
		services.caddy = {
		enable = true;
		settings = {
		apps.http.servers.default = {
		listen = [ ":80" ];
		routes = [
		{
		handle = [
		{
		body = "hello world";
		handler = "static_response";
		status_code = 200;
		}
		];
		}
		];
		};
		};
		};

		systemd.services."spiped@server" = {
		wantedBy = [ "multi-user.target" ];
		overrideStrategy = "asDropin";
		};
		systemd.services."spiped@client" = {
		wantedBy = [ "multi-user.target" ];
		overrideStrategy = "asDropin";
		};
		services.spiped = {
		enable = true;
		config = {
		server = {
		source = "localhost:8080";
		target = "localhost:80";
		keyfile = key;
		decrypt = true;
		};
		client = {
		source = "localhost:8081";
		target = "localhost:8080";
		keyfile = key;
		encrypt = true;
		};
		};
		};
		};
		};

		testScript =
		{ nodes, ... }:
		''
		server.wait_for_unit("caddy")
		server.wait_for_open_port(80)
		server.wait_for_open_port(8080)
		server.wait_for_open_port(8081)

		server.succeed("curl http://localhost:8081 \| grep hello")
		'';
		}

+40 −31

Original line number	Diff line number	Diff line
		{ lib, stdenv
		, fetchFromGitHub
		{
		lib,
		stdenv,
		fetchFromGitHub,

		, cmake
		, gettext
		, wrapGAppsHook3
		, pkg-config
		cmake,
		gettext,
		wrapGAppsHook3,
		pkg-config,

		, adwaita-icon-theme
		, alsa-lib
		, binutils
		, glib
		, gsettings-desktop-schemas
		, gtk3
		, gtksourceview4
		, librsvg
		, libsndfile
		, libxml2
		, libzip
		, pcre
		, poppler
		, portaudio
		, zlib
		adwaita-icon-theme,
		alsa-lib,
		binutils,
		glib,
		gsettings-desktop-schemas,
		gtk3,
		gtksourceview4,
		librsvg,
		libsndfile,
		libxml2,
		libzip,
		pcre,
		poppler,
		portaudio,
		zlib,
		# plugins
		, withLua ? true, lua
		withLua ? true,
		lua,
		}:

		stdenv.mkDerivation rec {
		pname = "xournalpp";
		version = "1.2.3";
		version = "1.2.4";

		src = fetchFromGitHub {
		owner = "xournalpp";
		repo = "xournalpp";
		rev = "v${version}";
		sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY=";
		hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk=";
		};

		postPatch = ''
		@@ -41,12 +44,18 @@ stdenv.mkDerivation rec {
		--replace-fail "addr2line" "${binutils}/bin/addr2line"
		'';

		nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ];
		nativeBuildInputs = [
		cmake
		gettext
		pkg-config
		wrapGAppsHook3
		];

		buildInputs =
		lib.optionals stdenv.hostPlatform.isLinux [
		alsa-lib
		] ++ [
		]
		++ [
		glib
		gsettings-desktop-schemas
		gtk3