Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jetbrains.editors: 2018.1.x -> 2018.2 (upgrade using the script) #44118

Merged
merged 18 commits into from Jul 29, 2018
Merged

jetbrains.editors: 2018.1.x -> 2018.2 (upgrade using the script) #44118

merged 18 commits into from Jul 29, 2018

Conversation

jirkadanek
Copy link
Member

@jirkadanek jirkadanek commented Jul 26, 2018 •
edited

Motivation for this change

New release in the 2018 series. New features.

Things done

This goes beyond #44064 in that it fixes the clion build so that clion actually builds.

I've only tested idea-ultimate and clion packages. In case of clion, I looked into patching the bundled gdb, but could not make it work. Does not really matter, it did not work before, and llvm debugger or gdb from users profile can be used instead. The furthest I got with the bundled gdb is

clion-2018.2/bin/gdb/linux/lib/python3.6 clion-2018.2/bin/gdb/linux/bin/gdb
Fatal Python error: Py_Initialize: Unable to get the locale encoding
zipimport.ZipImportError: can't decompress data; zlib not available

Current thread 0x00007fca468ae740 (most recent call first):
Aborted

PYTHONHOME=clion-2018.2/bin/gdb/linux/lib/python3.6 clion-2018.2/bin/gdb/linux/bin/gdb
Fatal Python error: Py_Initialize: Unable to get the locale encoding
ModuleNotFoundError: No module named 'encodings'

Current thread 0x00007ff2fd02e740 (most recent call first):
Aborted
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Averell Dalton and others added 15 commits July 28, 2018 21:38
@jirkadanek
Copy link
Member Author

jirkadanek commented Jul 28, 2018 •
edited

Rebased on top of #44064 and fixed issue with gdb. It was resolved exactly the same way as with lldb, few lines above, by patching zlib... figured that the hard way.

I am using the clion now, trying to see if anything else is broken.

Mic92
Mic92 reviewed Jul 29, 2018
View reviewed changes
pkgs/applications/editors/jetbrains/default.nix
rm -rf bin/cmake
ln -s ${cmake} bin/cmake
rm -rf bin/cmake/linux
ln -s ${cmake} bin/cmake/linux
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to. I wonder if we should switch to autoPatchelfHook to avoid breakages in future updates.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example: ea5787a

@thefloweringash
Copy link
Member

thefloweringash commented Jul 29, 2018 •
edited

RubyMine user here. This update is missing 2018.2. It looks like the default.nix drives the update script with "channels", some of which lock the major version (probably working around upstream's updates.xml).

261:    update-channel = "DataGrip 2018.1";
313:    update-channel = "PhpStorm 2018.1";
352:    update-channel = "Rider 2018.1.2";
365:    update-channel = "RubyMine 2018.1";

All of the above, excluding Rider, have 2018.2 channels. The following patch (on top of your branch) will let the script update the remaining packages.

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b28b4745464..7169c96ae83 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -270,7 +270,7 @@ in
       sha256 = "0jqkqiml7v1m9hkcjwmx866vrn5myxcg4zqzyghviyx5i7jrvx3c"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
-    update-channel = "DataGrip 2018.1";
+    update-channel = "DataGrip 2018.2";
   };
 
   goland = buildGoland rec {
@@ -322,7 +322,7 @@ in
       sha256 = "0v07sfg7ywawk6wb52zhr3753hscpxw3m53ppgw4n50dcdwx0kdn"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
-    update-channel = "PhpStorm 2018.1";
+    update-channel = "PhpStorm 2018.2";
   };
 
   pycharm-community = buildPycharm rec {
@@ -374,7 +374,7 @@ in
       sha256 = "0pjmr6g4wcqgxci4f3a4n6x1dqyabhzw886l7faj33nwdk9i2gv3"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
-    update-channel = "RubyMine 2018.1";
+    update-channel = "RubyMine 2018.2";
   };
 
   webstorm = buildWebStorm rec {

@Mic92 Mic92 merged commit 326f514 into NixOS:master Jul 29, 2018
@Mic92
Copy link
Member

Mic92 commented Jul 29, 2018

also backported all updates.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jirkadanek @thefloweringash @Mic92 @GrahamcOfBorg @jiridanek