Unverified Commit 06446181 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

copilot-language-server: move from binaries to js execution (#419881)

parents 50a00d86 fb74a67f

pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  nodejs,

  s,

  melpaBuild,

  copilot-language-server-fhs,

  copilot-language-server,

}:

melpaBuild (finalAttrs: {

  pname = "copilot";
@@ -26,7 +26,7 @@ melpaBuild (finalAttrs: { 
  postPatch = ''

    substituteInPlace copilot.el \

      --replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \

                     "defcustom copilot-server-executable \"${lib.getExe copilot-language-server-fhs}\""

                     "defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\""

  '';



  packageRequires = [

pkgs/by-name/co/copilot-language-server/package.nix

+22 −47
Original line number Diff line number Diff line 
{

  lib,

  stdenvNoCC,

  buildFHSEnv,

  makeWrapper,

  fetchzip,

  nix-update-script,

}:



let

  arch =

    {

      aarch64-darwin = "arm64";

      aarch64-linux = "arm64";

      x86_64-darwin = "x64";

      x86_64-linux = "x64";

    }

    ."${stdenvNoCC.hostPlatform.system}"

      or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

  os =

    {

      aarch64-darwin = "darwin";

      aarch64-linux = "linux";

      x86_64-darwin = "darwin";

      x86_64-linux = "linux";

    }

    ."${stdenvNoCC.hostPlatform.system}"

      or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

  nodejs,



  executableName = "copilot-language-server";

  fhs =

    { package }:

    buildFHSEnv {

      name = package.meta.mainProgram;

      version = package.version;

      targetPkgs = pkgs: [ pkgs.stdenv.cc.cc.lib ];

      runScript = lib.getExe package;



      meta = package.meta // {

        description =

          package.meta.description

          + " (FHS-wrapped, expand package details for further information when to use it)";

        longDescription = "Use this version if you encounter an error like `Could not start dynamically linked executable` or `SyntaxError: Invalid or unexpected token` (see nixpkgs issue [391730](https://github.com/NixOS/nixpkgs/issues/391730)).";

      };

    };

in

  testers,

}:

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "copilot-language-server";

  version = "1.357.0";

  version = "1.367.0";



  src = fetchzip {

    url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip";

    hash = "sha256-uVfQk26a/huFxsAtYKPfaJyYSWH17+8PqDh/HFecsdA=";

    url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";

    hash = "sha256-JQf6pQChQQOjJmdoL6DvLxajLfbEZi50p5FeJny0/Ss=";

    stripRoot = false;

  };



  nativeBuildInputs = [

    makeWrapper

  ];



  buildInputs = [

    nodejs

  ];



  installPhase = ''

    runHook preInstall



    install "${os}-${arch}/${executableName}" -Dm755 -t "$out"/bin

    mkdir -p $out/share/copilot-language-server

    cp -r ./* $out/share/copilot-language-server/



    makeWrapper ${lib.getExe nodejs} $out/bin/copilot-language-server \

      --add-flags $out/share/copilot-language-server/main.js



    runHook postInstall

  '';



  dontStrip = true;



  passthru = {

    updateScript = nix-update-script { };

    fhs = fhs { package = finalAttrs.finalPackage; };

    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

  };



  meta = {
@@ -79,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
      shortName = "GitHub Copilot License";

      url = "https://github.com/customer-terms/github-copilot-product-specific-terms";

    };

    mainProgram = executableName;

    mainProgram = "copilot-language-server";

    platforms = [

      "x86_64-linux"

      "aarch64-linux"

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ mapAliases { 
  colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19

  colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15

  connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27

  copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07

  copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22

  cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07

  coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ with pkgs; 


  coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });



  copilot-language-server-fhs = copilot-language-server.fhs;



  cup-docker-noserver = cup-docker.override { withServer = false; };



  deck = callPackage ../by-name/de/deck/package.nix {