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

maintainers/maintainer-list.nix

+22 −7

Original line number	Diff line number	Diff line
		@@ -662,6 +662,13 @@
		githubId = 4296804;
		name = "Alex Franchuk";
		};
		aftix = {
		name = "Wyatt Campbell";
		email = "aftix@aftix.xyz";
		matrix = "@aftix:matrix.org";
		github = "aftix";
		githubId = 4008299;
		};
		agbrooks = {
		email = "andrewgrantbrooks@gmail.com";
		github = "agbrooks";
		@@ -8230,7 +8237,8 @@
		email = "guanran928@outlook.com";
		github = "Guanran928";
		githubId = 68757440;
		name = "Guanran928";
		name = "Guanran Wang";
		keys = [ { fingerprint = "7835 BC13 4560 0660 0448 5A2C 91F9 7D9E D126 39CF"; } ];
		};
		guekka = {
		github = "Guekka";
		@@ -15910,6 +15918,12 @@
		githubId = 72201;
		name = "Ole Jørgen Brønner";
		};
		olifloof = {
		email = "benmoreosm@gmail.com";
		github = "olifloof";
		githubId = 35699052;
		name = "oli";
		};
		oliver-koss = {
		email = "oliver.koss06@gmail.com";
		github = "oliver-koss";
		@@ -16612,6 +16626,13 @@
		githubId = 28323;
		name = "Peter Simons";
		};
		petrkozorezov = {
		email = "petr.kozorezov@gmail.com";
		github = "petrkozorezov";
		githubId = 645017;
		name = "Petr Kozorezov";
		keys = [ { fingerprint = "7F1A 353D 3D6D 9CEF 63A9 B5C6 699F 32D5 9999 7C90"; } ];
		};
		petrosagg = {
		email = "petrosagg@gmail.com";
		github = "petrosagg";
		@@ -16840,12 +16861,6 @@
		name = "Jelle Besseling";
		keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; } ];
		};
		pinkcreeper100 = {
		email = "benmoreosm@gmail.com";
		github = "pinkcreeper100";
		githubId = 35699052;
		name = "Oliver Samuel Morris";
		};
		pinpox = {
		email = "mail@pablo.tools";
		github = "pinpox";

+15 −3

Original line number	Diff line number	Diff line
		@@ -1915,12 +1915,12 @@ final: prev:

		cmp-nixpkgs-maintainers = buildVimPlugin {
		pname = "cmp-nixpkgs-maintainers";
		version = "2024-10-15";
		version = "2024-10-19";
		src = fetchFromGitHub {
		owner = "GaetanLepage";
		repo = "cmp-nixpkgs-maintainers";
		rev = "828040c309972f044346e0bf43d0f92623b60d65";
		sha256 = "0wnqhsfinzz3xf746sd731gy6sj05c5z7c09w4lrdchbrxx3zgrb";
		rev = "86711e7d3e92097b26e53f0b146b93863176377d";
		sha256 = "sha256-NZuDbrKL/ukLIMxbqVzVgzKkKTnw2Zu1/qD/MTIVO2Q=";
		};
		meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
		};
		@@ -18648,6 +18648,18 @@ final: prev:
		meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
		};

		unimpaired-nvim = buildVimPlugin {
		pname = "unimpaired.nvim";
		version = "2024-10-17";
		src = fetchFromGitHub {
		owner = "tummetott";
		repo = "unimpaired.nvim";
		rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534";
		sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg=";
		};
		meta.homepage = "https://github.com/tummetott/unimpaired.nvim/";
		};

		vim-advanced-sorters = buildVimPlugin {
		pname = "vim-advanced-sorters";
		version = "2024-08-16";

+1 −0

Original line number	Diff line number	Diff line
		@@ -1055,6 +1055,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
		https://github.com/SirVer/ultisnips/,,
		https://github.com/mbbill/undotree/,,
		https://github.com/chrisbra/unicode.vim/,,
		https://github.com/tummetott/unimpaired.nvim/,HEAD,
		https://github.com/unisonweb/unison/,,
		https://github.com/Shougo/unite.vim/,,
		https://github.com/sontungexpt/url-open/,HEAD,

+19 −2

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, copyDesktopItems
		, fetchFromGitHub
		, makeDesktopItem
		, wrapQtAppsHook
		, pkg-config
		, qmake
		@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
		sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ=";
		};

		nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
		nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ];
		qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
		"PGSQL_INC=${lib.getDev postgresql}/include"
		"PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib"
		@@ -36,7 +38,22 @@ stdenv.mkDerivation rec {
		++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
		++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ];

		postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
		desktopItems = [
		(makeDesktopItem {
		name = "pgModeler";
		exec = "pgmodeler";
		icon = "pgmodeler";
		desktopName = "PgModeler";
		genericName = "PgModeler";
		comment = meta.description;
		categories = [ "Development" ];
		startupWMClass = "pgmodeler";
		})
		];

		postInstall = ''
		install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico
		'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
		mkdir -p $out/bin
		for item in pgmodeler pgmodeler-{cli,se,ch}
		do

+2 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
		fetchSubmodules = true;
		};

		separateDebugInfo = true;

		patches = [
		# Lets obs-browser build against CEF 90.1.0+
		./Enable-file-access-and-universal-access-for-file-URL.patch