Unverified Commit c020aa45 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #334777 from jamesward/bump/jetbrains-2024.2.0.1 

Bump jetbrains 2024.2
parents 4570157f 1e94c136

pkgs/applications/editors/jetbrains/bin/linux.nix

+9 −2
Original line number Diff line number Diff line
@@ -104,7 +104,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { 
    jdk=${jdk.home}

    item=${desktopItem}



    wrapProgram  "$out/$pname/bin/${loName}.sh" \

    launcher="$out/$pname/bin/${loName}"

    if [ -e "$launcher" ]; then

      rm "$launcher".sh # We do not wrap the old script-style launcher anymore.

    else

      launcher+=.sh

    fi



    wrapProgram  "$launcher" \

      --prefix PATH : "${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \

      --suffix PATH : "${lib.makeBinPath [ python3 ]}" \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
@@ -117,7 +124,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { 
      --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \

      --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}



    ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname

    ln -s "$launcher" $out/bin/$pname

    rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/

    echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh

    chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh

pkgs/applications/editors/jetbrains/bin/versions.json

+272 −272

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/jetbrains/plugins/plugins.json

+252 −250

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix

+4 −1
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ 
    # Github Copilot

    # Modified version of https://github.com/ktor/nixos/commit/35f4071faab696b2a4d86643726c9dd3e4293964

    buildPhase = ''

      agent="copilot-agent/bin/copilot-agent-linux"

      agent='copilot-agent/native/${lib.toLower stdenv.hostPlatform.uname.system}${{

        x86_64 = "-x64";

        aarch64 = "-arm64";

      }.${stdenv.hostPlatform.uname.processor} or ""}/copilot-language-server'

      orig_size=$(stat --printf=%s $agent)

      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $agent

      patchelf --set-rpath ${lib.makeLibraryPath [glibc gcc-unwrapped]} $agent