[Backport release-25.05] jetbrains: 2025.1.2 -> 2025.2#441221
[Backport release-25.05] jetbrains: 2025.1.2 -> 2025.2#441221oskardotglobal wants to merge 4 commits intoNixOS:release-25.05from
Conversation
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between 360ef15 and original 7cccfbd may warrant inspection.
Show diff
@@ Commit message
jetbrains.ruby-mine: 2025.1.4.1 -> 2025.2
jetbrains.webstorm: 2025.1.4.1 -> 2025.2
+ (cherry picked from commit 7cccfbddd6a7ae6dda985cccf825b042d5758619)
+
## pkgs/applications/editors/jetbrains/bin/versions.json ##
@@
"datagrip": {
@@ pkgs/applications/editors/jetbrains/bin/versions.json
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "34e0d7d20b6ff303cfbb97c75147b11a437221b96783687d9909adf1d56817ff",
-- "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.4.1.tar.gz",
-- "build_number": "251.27812.49"
+- "version": "2025.1.2",
+- "sha256": "70dc870bd31fda67de30d3a132cfed543d5e67c15c7db52f6f4c4691a044930a",
+- "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2.tar.gz",
+- "build_number": "251.26094.121"
+ "version": "2025.2",
+ "sha256": "30e917c55507443c61674d0bdd5cbb40a5b02c628d5073f8a0028ef49e0c50b5",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.tar.gz",
+ "build_number": "252.23892.409"
++
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "d1335bcdcac3746a10d6b3346f06ab6d34c9ad14c4af759322d9a93f7b428894",
-- "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.4.1.tar.gz",
-- "build_number": "251.27812.49"
+- "version": "2025.1.2",
+- "sha256": "1e675bda1314ae914b64b31a22309ba2eba6f35e6659e53d4b291e73c2fb856b",
+- "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2.tar.gz",
+- "build_number": "251.26094.121"
+ "version": "2025.2",
+ "sha256": "d28d0d647cf5f0d2eedd49602493be4a3182aec83c73df01b887164f56db0ff4",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.tar.gz",
+ "build_number": "252.23892.409"
++
},
"mps": {
"update-channel": "MPS RELEASE",
@@ pkgs/applications/editors/jetbrains/bin/versions.json
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-- "version": "2025.1.3.1",
-- "sha256": "17899a66ee4261fdb1308ee44d455675aff1e387b24165d11afdea3a88ecb244",
-- "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.3.1.tar.gz",
-- "build_number": "251.26927.90"
+- "version": "2025.1.2",
+- "sha256": "193fbbb638235c4c671bb6c6b432f43a2d46f7f7ebd6b5f2cc8a1db7db93c5d6",
+- "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2.tar.gz",
+- "build_number": "251.26094.141"
+ "version": "2025.2",
+ "sha256": "356dc81511bbd361c7f106fda8597503c6b9797d36a3a04434bbf0ec35a02434",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.tar.gz",
+ "build_number": "252.23892.439"
++
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-- "version": "2025.1.3.1",
-- "sha256": "c8f5b42843ef21673dd94f0d565cda2d09dae595736e39cf510de9a0a8a07239",
-- "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.3.1.tar.gz",
-- "build_number": "251.26927.90"
+- "version": "2025.1.2",
+- "sha256": "4a407779c5df9728e29698eeabdb4533911e755ead224d0c1deff959876c3108",
+- "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.2.tar.gz",
+- "build_number": "251.26094.141"
+ "version": "2025.2",
+ "sha256": "bc3fbb31ea10e171686b9be8734051382233748502f124393c52848aefe97b32",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.tar.gz",
+ "build_number": "252.23892.439"
++
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-- "version": "2025.1.4",
-- "sha256": "88dc7c4b6581aab5f6a2713061ea10e7ad0f0735e92258f4a3aaba59964440ee",
-- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.4.tar.gz",
-- "build_number": "251.26927.67"
+- "version": "2025.1.2",
+- "sha256": "cdf8a824c7daa3247b09d76a29acb31cfa623b90643d3d2a814982cb0a32879d",
+- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2.tar.gz",
+- "build_number": "251.25410.119"
+ "version": "2025.1.5",
+ "sha256": "b10e21b764e504e33468ee93885fee1102c0b96bd628d1d7c0a19ce6e83910d6",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.5.tar.gz",
+ "build_number": "251.27812.87"
++
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "c89dcc2a6e50b3bb9e588a5109a7f1de80c2fd09576199904b386547e585d0e4",
-- "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.4.1.tar.gz",
-- "build_number": "251.27812.51"
+- "version": "2025.1.2",
+- "sha256": "2d4127e0284a262acb015c9d4247b654592e045b61664043a4de56029b45174f",
+- "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.2.tar.gz",
+- "build_number": "251.26094.122"
+ "version": "2025.2",
+ "sha256": "2a9c2a4b4ed222bdf0038553f46424f8bea1a2ebe6542c764d9586d82351381d",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.tar.gz",
+ "build_number": "252.23892.415"
++
},
"rust-rover": {
"update-channel": "RustRover RELEASE",
@@ pkgs/applications/editors/jetbrains/bin/versions.json
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "f10bfc1028350a73928b49dc51db336e9c77c680b9844d29c305218e7d5db192",
-- "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.4.1.tar.gz",
-- "build_number": "251.27812.50"
+- "version": "2025.1.2",
+- "sha256": "055510371e3c6a8d9fbfcd352645d847d2c092309c4746222babe4af240c2eac",
+- "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.2.tar.gz",
+- "build_number": "251.26094.131"
+ "version": "2025.2",
+ "sha256": "85c83e8ed716e9cda03be922fd10d95c482f9f3c27e095dd768ddefd1e69462f",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.tar.gz",
+ "build_number": "252.23892.411"
++
},
"writerside": {
"update-channel": "Writerside EAP",
@@ pkgs/applications/editors/jetbrains/bin/versions.json
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "e47ce26c036a7aabd4467c561bf0c9d85997f82f65b810bac314ef704a59ebac",
-- "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.4.1-aarch64.tar.gz",
-- "build_number": "251.27812.49"
+- "version": "2025.1.2",
+- "sha256": "d98c8d7bdc3e274d278b81ba2b6c1baa38f67be9407b4bfd3bad3413c6f128f1",
+- "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.2-aarch64.tar.gz",
+- "build_number": "251.26094.121"
+ "version": "2025.2",
+ "sha256": "dead5589e78a10e5b6df76c484139679c80c94d1ce9c9c5778721ced1ee02b5d",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2-aarch64.tar.gz",
+ "build_number": "252.23892.409"
++
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-- "version": "2025.1.4.1",
-- "sha256": "5c0ba5189e4dcf114fb1b03e176780613422a71226412ea78204d1ae46bc2f52",
-- "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.4.1-aarch64.tar.gz",
-- "build_number": "251.27812.49"
+- "version": "2025.1.2",
+- "sha256": "0f982a4f4424bde5a33206c20df053a7afe174fe9d590943665504814a273c9d",
+- "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.2-aarch64.tar.gz",
+- "build_number": "251.26094.121"
+ "version": "2025.2",
+ "sha256": "eb6b322db2679b45d9d362fc4579b5ddbd1b7510b9f407ea8c34d18b90f62e7b",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2025.2-aarch64.tar.gz",
+ "build_number": "252.23892.409"
++
},
"mps": {
"update-channel": "MPS RELEASE",
@@ pkgs/applications/editors/jetbrains/bin/versions.json
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-- "version": "2025.1.3.1",
-- "sha256": "3a648570ed0627333e7e2ef4ad0514d4b97faa4c8ed9d551ddd51c6d2b9d4482",
-- "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.3.1-aarch64.tar.gz",
-- "build_number": "251.26927.90"
+- "version": "2025.1.2",
+- "sha256": "10e7426804d649d3c5bdbfc365cf85fe73dd7e74e67fd1e4c82645e8532d17e7",
+- "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.2-aarch64.tar.gz",
+- "build_number": "251.26094.141"
+ "version": "2025.2",
+ "sha256": "2aab469f976c4aa7d6686c8cc81d647960a9496ea2f3aed01f1c09448b443efb",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2-aarch64.tar.gz",
+ "build_number": "252.23892.439"
++
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-- "version": "2025.1.3.1",
-- "sha256": "00aeea43e6a056244d278502b538babd6444c9db0e93c9a7336d20a09129ed3f",
[...truncated...]Warning
Difference between 9da192a and original 474faab may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
jetbrains.plugins: update
+ (cherry picked from commit 474faab6d769a8e38b7a2e01b36c440d309fa2fe)
+
## pkgs/applications/editors/jetbrains/plugins/plugins.json ##
@@
+ "webstorm"
+ ],
"builds": {
- "251.23774.423": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
- "251.25410.129": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.26094.87": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.26927.67": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
- "251.26927.79": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.26927.90": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
- "251.27812.15": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.27812.49": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.27812.50": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.27812.51": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
- "251.27812.52": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
-- "251.27812.54": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip"
+- "243.22562.218": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip",
+- "251.23774.423": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.25410.119": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.25410.170": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.121": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.122": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.123": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.127": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.131": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.133": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.141": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip",
+- "251.26094.87": "https://plugins.jetbrains.com/files/164/756054/IdeaVIM-2.25.1.zip"
++ "251.23774.423": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
++ "251.25410.129": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
++ "251.26927.79": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
++ "251.27812.15": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
++ "251.27812.52": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
+ "251.27812.54": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
+ "251.27812.87": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
+ "252.23892.363": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
@@ pkgs/applications/editors/jetbrains/plugins/plugins.json
+ "252.23892.411": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
+ "252.23892.415": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip",
+ "252.23892.439": "https://plugins.jetbrains.com/files/164/789514/IdeaVIM-2.26.0.zip"
++
},
"name": "ideavim"
},
@@ pkgs/applications/editors/jetbrains/plugins/plugins.json
"idea-ultimate"
],
"builds": {
-- "251.27812.49": "https://plugins.jetbrains.com/files/631/805177/python-251.27812.49.zip"
+- "251.26094.121": "https://plugins.jetbrains.com/files/631/766544/python-251.26094.121.zip"
+ "252.23892.409": "https://plugins.jetbrains.com/files/631/817162/python-252.23892.409.zip"
++
},
"name": "python"
},
@@
+ "idea-ultimate"
],
"builds": {
- "251.25410.129": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip",
-- "251.27812.49": "https://plugins.jetbrains.com/files/1347/806838/scala-intellij-bin-2025.1.32.zip"
+- "243.22562.218": null,
+- "251.26094.121": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip"
++ "251.25410.129": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip",
+ "252.23892.409": "https://plugins.jetbrains.com/files/1347/815326/scala-intellij-bin-2025.2.26.zip"
++
},
"name": "scala"
},
@@
"builds": {
+ "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
"251.23774.423": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
- "251.25410.129": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.26094.87": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.26927.67": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
- "251.26927.79": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.26927.90": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
- "251.27812.15": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.27812.49": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.27812.50": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.27812.51": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
- "251.27812.52": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-- "251.27812.54": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
+- "251.25410.119": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.25410.170": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.121": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.122": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.123": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.127": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.131": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.133": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.141": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+- "251.26094.87": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
++ "251.25410.129": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
++ "251.26927.79": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
++ "251.27812.15": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
++ "251.27812.52": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+ "251.27812.54": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+ "251.27812.87": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+ "252.23892.363": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
@@ pkgs/applications/editors/jetbrains/plugins/plugins.json
+ "252.23892.411": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+ "252.23892.415": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+ "252.23892.439": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
++
},
"name": "string-manipulation"
},
@@
"builds": {
+ "243.22562.218": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip",
"251.23774.423": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
- "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.26094.87": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.26927.67": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
- "251.26927.79": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.26927.90": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
- "251.27812.15": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.27812.49": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.27812.50": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.27812.51": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
- "251.27812.52": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-- "251.27812.54": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip"
+- "251.25410.119": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
[...truncated...]Warning
Difference between 473109f and original 2f1f373 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
jetbrains: patch libxml2 dependency
+ (cherry picked from commit 2f1f373630a56e7e708cd69d4ec4ac4277cb75b1)
+
## pkgs/applications/editors/jetbrains/default.nix ##
+@@ pkgs/applications/editors/jetbrains/default.nix: in
+ libX11,
+
+ vmopts ? null,
++ forceWayland ? false,
+ }:
+
+ let
@@ pkgs/applications/editors/jetbrains/default.nix: let
- ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [
- ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
- ];
+ inherit
+ pname
+ jdk
+- extraWrapperArgs
+ extraBuildInputs
+ ;
- extraLdPath = extraLdPath ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libGL ];
++ 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
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
jetbrains.datagrip: 2025.1.3 -> 2025.2 jetbrains.gateway: 2025.1.2 -> 2025.2 jetbrains.idea-community: 2025.1.4.1 -> 2025.2 jetbrains.idea-ultimate: 2025.1.4.1 -> 2025.2 jetbrains.pycharm-community: 2025.1.3.1 -> 2025.2 jetbrains.pycharm-professional: 2025.1.3.1 -> 2025.2 jetbrains.rider: 2025.1.4 -> 2025.1.5 jetbrains.ruby-mine: 2025.1.4.1 -> 2025.2 jetbrains.webstorm: 2025.1.4.1 -> 2025.2 (cherry picked from commit 7cccfbd)
(cherry picked from commit 474faab)
6e9b9d7 to
9da192a
Compare
Manual backport of #431088 (and #419026). The primary reason for this is that 2025.1.5 included a fix for the Rust plugin allowing use of a Rust compiler newer than June 2025 again.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.