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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -21361,6 +21361,12 @@
		matrix = "@zitrone:utwente.io";
		name = "quantenzitrone";
		};
		quarterstar = {
		email = "quarterstar+nix@proton.me";
		github = "quarterstar";
		githubId = 201157222;
		name = "Quarterstar";
		};
		qubasa = {
		email = "consulting@qube.email";
		github = "Qubasa";

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
		outputs = [
		"out"
		"dev"
		"man"
		];

		src = fetchurl {

+1 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
		"out"
		"dev"
		"devdoc"
		"man"
		];

		src = fetchurl {

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,10 @@ let
		in
		symlinkJoin {
		name = "gimp-with-plugins-${gimp.version}";
		outputs = [
		"out"
		"man"
		];

		paths = [ gimp ] ++ selectedPlugins;

		@@ -41,6 +45,8 @@ symlinkJoin {
		for each in gimp gimp-console; do
		ln -sf "$each-${exeVersion}" $out/bin/$each
		done

		ln -s ${gimp.man} $man
		'';

		inherit (gimp) meta;

+4 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,10 @@ in
		stdenv.mkDerivation (finalAttrs: {
		pname = "inkscape";
		version = "1.4.2";
		outputs = [
		"out"
		"man"
		];

		src = fetchurl {
		url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";