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

.github/CODEOWNERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
		/pkgs/applications/editors/vim/plugins @figsoda @jonringer

		# VsCode Extensions
		/pkgs/applications/editors/vscode @superherointj
		/pkgs/applications/editors/vscode/extensions @jonringer

		# Prometheus exporter modules and tests

+6 −0

Original line number	Diff line number	Diff line
		@@ -5249,6 +5249,12 @@
		githubId = 3036816;
		name = "Edgar Aroutiounian";
		};
		fxttr = {
		name = "Florian Büstgens";
		email = "fb@fx-ttr.de";
		github = "fxttr";
		githubId = 16306293;
		};
		fzakaria = {
		name = "Farid Zakaria";
		email = "farid.m.zakaria@gmail.com";

+8 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@ let
		inherit (self) callPackage;
		in
		{
		acm = callPackage ./manual-packages/acm { };

		acm-terminal = callPackage ./manual-packages/acm-terminal { };

		agda-input = callPackage ./manual-packages/agda-input { };

		agda2-mode = callPackage ./manual-packages/agda2-mode { };
		@@ -49,6 +53,10 @@ in

		llvm-mode = callPackage ./manual-packages/llvm-mode { };

		lsp-bridge = callPackage ./manual-packages/lsp-bridge {
		inherit (pkgs) python3 git go gopls pyright;
		};

		matrix-client = callPackage ./manual-packages/matrix-client {
		_map = self.map;
		};

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		{ lib
		, melpaBuild
		, fetchFromGitHub
		, acm
		, popon
		, writeText
		, unstableGitUpdater
		}:

		let
		rev = "321e05fc0398a6159925b858f46608ea07ef269e";
		in
		melpaBuild {
		pname = "acm-terminal";
		version = "20230215.414"; # 4:14 UTC

		src = fetchFromGitHub {
		owner = "twlz0ne";
		repo = "acm-terminal";
		inherit rev;
		sha256 = "sha256-Flw07EwH9z0E3tqXs4mStICJmoHfp60ALrP1GmUmeuU=";
		};

		commit = rev;

		packageRequires = [
		acm
		popon
		];

		recipe = writeText "recipe" ''
		(acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github)
		'';

		passthru.updateScript = unstableGitUpdater { };

		meta = with lib; {
		description = "Patch for LSP bridge acm on Terminal";
		homepage = "https://github.com/twlz0ne/acm-terminal";
		license = licenses.gpl3Plus;
		maintainers = with maintainers; [ kira-bruneau ];
		};
		}

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		{ lib
		, melpaBuild
		, lsp-bridge
		, yasnippet
		, writeText
		}:

		melpaBuild {
		pname = "acm";
		version = lsp-bridge.version;

		src = lsp-bridge.src;
		commit = lsp-bridge.src.rev;

		packageRequires = [
		yasnippet
		];

		recipe = writeText "recipe" ''
		(acm
		:repo "manateelazycat/lsp-bridge"
		:fetcher github
		:files ("acm/*.el" "acm/icons"))
		'';

		meta = with lib; {
		description = "Asynchronous Completion Menu";
		homepage = "https://github.com/manateelazycat/lsp-bridge";
		license = licenses.gpl3Only;
		maintainers = with maintainers; [ fxttr kira-bruneau ];
		};
		}