diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4ae6dee9416b..a05de14c35c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -496,15 +496,18 @@ in ''; doCheck = true; - checkInputs = [ jq ]; + checkInputs = [ + jq + codeium' + ]; checkPhase = '' runHook preCheck expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json) - actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version) + actual_codeium_version=$(codeium_language_server --version) expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json) - actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) + actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2) if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then echo " diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 0338be017d7f..349f68debabd 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -1,23 +1,34 @@ -{ stdenv, lib, fetchurl, gzip, autoPatchelfHook }: +{ + stdenv, + lib, + fetchurl, + gzip, + autoPatchelfHook, + versionCheckHook, +}: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - plat = { - x86_64-linux = "linux_x64"; - aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; - aarch64-darwin = "macos_arm"; + plat = + { + x86_64-linux = "linux_x64"; + aarch64-linux = "linux_arm"; + x86_64-darwin = "macos_x64"; + aarch64-darwin = "macos_arm"; - }.${system} or throwSystem; + } + .${system} or throwSystem; - hash = { - x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw="; - aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas="; - x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE="; - aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4="; - }.${system} or throwSystem; + hash = + { + x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw="; + aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas="; + x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE="; + aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4="; + } + .${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -45,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru.updateScript = ./update.sh; meta = rec { @@ -62,8 +80,13 @@ stdenv.mkDerivation (finalAttrs: { changelog = homepage; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ anpin ]; - mainProgram = "codeium"; - platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "codeium_language_server"; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-linux" + "x86_64-darwin" + ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; })