Unverified Commit 247a988e authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

jetbrains: 2025.1.1 -> 2025.1.5 (#419026)

parents 40addd63 a72819b1

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ stdenvNoCC.mkDerivation { 
    cp -Tr *.app "$APP_DIR"

    mkdir -p "$out/bin"

    cat << EOF > "$out/bin/${loname}"

    #!${stdenvNoCC.shell}

    open -na '$APP_DIR' --args "\$@"

    EOF

    chmod +x "$out/bin/${loname}"

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

+192 −192

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/jetbrains/default.nix

+46 −84
Original line number Diff line number Diff line
@@ -83,15 +83,22 @@ let 
    mkJetBrainsProductCore {

      inherit

        pname

        extraLdPath

        jdk

        extraBuildInputs

        ;

      extraBuildInputs =

        extraBuildInputs

        ++ [ stdenv.cc.cc ]

        ++ lib.optionals stdenv.hostPlatform.isLinux [

          fontconfig

          libGL

          libX11

        ];

      extraWrapperArgs =

        extraWrapperArgs

        ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [

          ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''

        ];

      extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ];

      src =

        if fromSource then

          communitySources."${pname}"
@@ -160,6 +167,18 @@ let 
      }

    );



  patchSharedLibs = lib.optionalString stdenv.hostPlatform.isLinux ''

    ls -d \

      $out/*/bin/*/linux/*/lib/liblldb.so \

      $out/*/bin/*/linux/*/lib/python3.8/lib-dynload/* \

      $out/*/plugins/*/bin/*/linux/*/lib/liblldb.so \

      $out/*/plugins/*/bin/*/linux/*/lib/python3.8/lib-dynload/* |

    xargs patchelf \

      --replace-needed libssl.so.10 libssl.so \

      --replace-needed libcrypto.so.10 libcrypto.so \

      --replace-needed libcrypt.so.1 libcrypt.so \

      ${lib.optionalString stdenv.hostPlatform.isAarch "--replace-needed libxml2.so.2 libxml2.so"}

  '';

in

rec {

  # Sorted alphabetically
@@ -167,7 +186,6 @@ rec { 
  aqua = mkJetBrainsProduct {

    pname = "aqua";

    extraBuildInputs = [

      stdenv.cc.cc

      lldb

    ];

  };
@@ -176,16 +194,14 @@ rec { 
    (mkJetBrainsProduct {

      pname = "clion";

      extraBuildInputs =

        lib.optionals (stdenv.hostPlatform.isLinux) [

          fontconfig

        lib.optionals stdenv.hostPlatform.isLinux [

          python3

          stdenv.cc.cc

          openssl

          libxcrypt-legacy

          lttng-ust_2_12

          musl

        ]

        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [

          expat

          libxml2

          xz
@@ -194,40 +210,21 @@ rec { 
      (attrs: {

        postInstall =

          (attrs.postInstall or "")

          + lib.optionalString (stdenv.hostPlatform.isLinux) ''

            (

              cd $out/clion



              for dir in plugins/clion-radler/DotFiles/linux-*; do

          + lib.optionalString stdenv.hostPlatform.isLinux ''

            for dir in $out/clion/plugins/clion-radler/DotFiles/linux-*; do

              rm -rf $dir/dotnet

              ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet

            done

            )

          '';



        postFixup =

          (attrs.postFixup or "")

          + lib.optionalString (stdenv.hostPlatform.isLinux) ''

            (

              cd $out/clion



              # I think the included gdb has a couple of patches, so we patch it instead of replacing

              ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* |

              xargs patchelf \

                --replace-needed libssl.so.10 libssl.so \

                --replace-needed libcrypto.so.10 libcrypto.so



              ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* |

              xargs patchelf \

                --replace-needed libssl.so.10 libssl.so \

                --replace-needed libcrypto.so.10 libcrypto.so

            )

        postFixup = ''

          ${attrs.postFixup or ""}

          ${patchSharedLibs}

        '';

      });



  datagrip = mkJetBrainsProduct {

    pname = "datagrip";

    extraBuildInputs = [ stdenv.cc.cc ];

  };



  dataspell =
@@ -242,7 +239,6 @@ rec { 
      extraBuildInputs = [

        libgcc

        libr

        stdenv.cc.cc

      ];

    };
@@ -260,7 +256,6 @@ rec { 
      ];

      extraBuildInputs = [

        libgcc

        stdenv.cc.cc

      ];

    }).overrideAttrs

      (attrs: {
@@ -275,12 +270,10 @@ rec { 


  idea-community-bin = buildIdea {

    pname = "idea-community";

    extraBuildInputs = [ stdenv.cc.cc ];

  };



  idea-community-src = buildIdea {

    pname = "idea-community";

    extraBuildInputs = [ stdenv.cc.cc ];

    fromSource = true;

  };
@@ -293,7 +286,6 @@ rec { 
  idea-ultimate = buildIdea {

    pname = "idea-ultimate";

    extraBuildInputs = [

      stdenv.cc.cc

      lldb

      musl

    ];
@@ -304,7 +296,6 @@ rec { 
  phpstorm = mkJetBrainsProduct {

    pname = "phpstorm";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -328,14 +319,12 @@ rec { 
    (mkJetBrainsProduct {

      pname = "rider";

      extraBuildInputs = [

        fontconfig

        stdenv.cc.cc

        openssl

        libxcrypt

        lttng-ust_2_12

        musl

      ]

      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [

        expat

        libxml2

        xz
@@ -350,28 +339,19 @@ rec { 
      (attrs: {

        postInstall =

          (attrs.postInstall or "")

          + lib.optionalString (stdenv.hostPlatform.isLinux) ''

            (

              cd $out/rider



              ls -d $PWD/plugins/cidr-debugger-plugin/bin/lldb/linux/*/lib/python3.8/lib-dynload/* |

              xargs patchelf \

                --replace-needed libssl.so.10 libssl.so \

                --replace-needed libcrypto.so.10 libcrypto.so \

                --replace-needed libcrypt.so.1 libcrypt.so

          + lib.optionalString stdenv.hostPlatform.isLinux ''

            ${patchSharedLibs}



              for dir in lib/ReSharperHost/linux-*; do

            for dir in $out/rider/lib/ReSharperHost/linux-*; do

              rm -rf $dir/dotnet

              ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet

            done

            )

          '';

      });



  ruby-mine = mkJetBrainsProduct {

    pname = "ruby-mine";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -380,44 +360,27 @@ rec { 
    (mkJetBrainsProduct {

      pname = "rust-rover";

      extraBuildInputs =

        lib.optionals (stdenv.hostPlatform.isLinux) [

        lib.optionals stdenv.hostPlatform.isLinux [

          python3

          openssl

          libxcrypt-legacy

          fontconfig

          xorg.libX11

        ]

        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

        ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [

          expat

          libxml2

          xz

        ];

    }).overrideAttrs

      (attrs: {

        postFixup =

          (attrs.postFixup or "")

          + lib.optionalString (stdenv.hostPlatform.isLinux) ''

            (

              cd $out/rust-rover



              # Copied over from clion (gdb seems to have a couple of patches)

              ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* |

              xargs patchelf \

                --replace-needed libssl.so.10 libssl.so \

                --replace-needed libcrypto.so.10 libcrypto.so



              ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* |

              xargs patchelf \

                --replace-needed libssl.so.10 libssl.so \

                --replace-needed libcrypto.so.10 libcrypto.so

            )

        postFixup = ''

          ${attrs.postFixup or ""}

          ${patchSharedLibs}

        '';

      });



  webstorm = mkJetBrainsProduct {

    pname = "webstorm";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };
@@ -425,7 +388,6 @@ rec { 
  writerside = mkJetBrainsProduct {

    pname = "writerside";

    extraBuildInputs = [

      stdenv.cc.cc

      musl

    ];

  };

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

+738 −753

File changed.

Preview size limit exceeded, changes collapsed.