From 4a4b14536d4b4819ab124ccf985bbfbc39719eb6 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 22 Jan 2026 08:25:11 +0100 Subject: [PATCH] code-server: move to pkgs/by-name this shouldn't create any rebuilds --- .../co}/code-server/build-vscode-nogit.patch | 0 .../default.nix => by-name/co/code-server/package.nix} | 6 +++--- .../co}/code-server/remove-node-download.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{servers => by-name/co}/code-server/build-vscode-nogit.patch (100%) rename pkgs/{servers/code-server/default.nix => by-name/co/code-server/package.nix} (99%) rename pkgs/{servers => by-name/co}/code-server/remove-node-download.patch (100%) diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/by-name/co/code-server/build-vscode-nogit.patch similarity index 100% rename from pkgs/servers/code-server/build-vscode-nogit.patch rename to pkgs/by-name/co/code-server/build-vscode-nogit.patch diff --git a/pkgs/servers/code-server/default.nix b/pkgs/by-name/co/code-server/package.nix similarity index 99% rename from pkgs/servers/code-server/default.nix rename to pkgs/by-name/co/code-server/package.nix index 2494fa1e5e11..a6fbb49d73d2 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -13,7 +13,7 @@ yarn, python3, esbuild, - nodejs, + nodejs_20, node-gyp, libsecret, xorg, @@ -27,7 +27,7 @@ let system = stdenv.hostPlatform.system; - python = python3; + nodejs = nodejs_20; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs yarn' - python + python3 pkg-config makeWrapper git diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/by-name/co/code-server/remove-node-download.patch similarity index 100% rename from pkgs/servers/code-server/remove-node-download.patch rename to pkgs/by-name/co/code-server/remove-node-download.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff117dd491b..acf58b40a899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11850,10 +11850,6 @@ with pkgs; vscode-generic = ../applications/editors/vscode/generic.nix; }; - code-server = callPackage ../servers/code-server { - nodejs = nodejs_20; - }; - kiro = callPackage ../by-name/ki/kiro/package.nix { vscode-generic = ../applications/editors/vscode/generic.nix; };