From 7554a7371314836bec4c0e66fc850bd52dbb6a16 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 27 Oct 2025 14:45:23 +0100 Subject: [PATCH 1/4] ra-multiplex: 0.2.5 -> lspmux 0.3.0 --- pkgs/by-name/ls/lspmux/package.nix | 28 ++++++++++++++++++ pkgs/by-name/ra/ra-multiplex/package.nix | 36 ------------------------ pkgs/top-level/aliases.nix | 1 + 3 files changed, 29 insertions(+), 36 deletions(-) create mode 100644 pkgs/by-name/ls/lspmux/package.nix delete mode 100644 pkgs/by-name/ra/ra-multiplex/package.nix diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix new file mode 100644 index 000000000000..2c0f6d4a604d --- /dev/null +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitea, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lspmux"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "p2502"; + repo = "lspmux"; + rev = "v${finalAttrs.version}"; + hash = "sha256-WNmejKA1wXbu7+cwxBu1tv0kUunt1LAcGP48fWon/b4="; + }; + + cargoHash = "sha256-Um4BZ1QTHCilOslo/GR7cGvPCX1xNitf6WU8QaehAaE="; + + meta = with lib; { + description = "Share one language server instance between multiple LSP clients to save resources"; + mainProgram = "lspmux"; + homepage = "https://codeberg.org/p2502/lspmux"; + license = with licenses; [ eupl12 ]; + maintainers = with maintainers; [ norfair ]; + }; +}) diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix deleted file mode 100644 index 5024c50e43c3..000000000000 --- a/pkgs/by-name/ra/ra-multiplex/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - fetchFromGitHub, - makeWrapper, - rustPlatform, - rust-analyzer, -}: - -rustPlatform.buildRustPackage rec { - pname = "ra-multiplex"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "pr2502"; - repo = "ra-multiplex"; - rev = "v${version}"; - hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8="; - }; - - cargoHash = "sha256-NVE/ROk6x1R0D5eyOzz1gYPvgG0lX5L2tCuZGIS9kzs="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/ra-multiplex \ - --suffix PATH : ${lib.makeBinPath [ rust-analyzer ]} - ''; - - meta = with lib; { - description = "Multiplexer for rust-analyzer"; - mainProgram = "ra-multiplex"; - homepage = "https://github.com/pr2502/ra-multiplex"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ norfair ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba2b7755c455..dc9cd23a5205 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1295,6 +1295,7 @@ mapAliases { qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18 qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03 + ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27 radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27 railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 From 9fb1a05b8360f3e3b7147568273fb99a37097d27 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 27 Oct 2025 15:13:24 +0100 Subject: [PATCH 2/4] ra-multiplex: add release-notes entry --- doc/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index ddb0f3a36b34..3bc5f92a2ce4 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -260,6 +260,8 @@ Use `python3Packages.ddgs` instead. See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0) +- `ra-multiplex` has been renamed to/replaced by `lspmux`. Its wrapper no longer includes `rust-analyzer`. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} From 5f53f8971e1228b2e86ead1f261bce651d790a49 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 27 Oct 2025 18:14:54 +0100 Subject: [PATCH 3/4] lspmux: remove norfair from maintainers --- pkgs/by-name/ls/lspmux/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 2c0f6d4a604d..84f7d1b7f85c 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "lspmux"; homepage = "https://codeberg.org/p2502/lspmux"; license = with licenses; [ eupl12 ]; - maintainers = with maintainers; [ norfair ]; + maintainers = [ ]; }; }) From 28a58119302fd0818700b3f4947ee60e01f30424 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 27 Oct 2025 14:59:15 +0100 Subject: [PATCH 4/4] lspmux: add mrcjkb to maintainers --- pkgs/by-name/ls/lspmux/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 84f7d1b7f85c..deeb333f59f3 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "lspmux"; homepage = "https://codeberg.org/p2502/lspmux"; license = with licenses; [ eupl12 ]; - maintainers = [ ]; + maintainers = with maintainers; [ mrcjkb ]; }; })