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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mercurial: 4.9.1 -> 5.2.1 + python3 馃殌 #76126

Merged
merged 3 commits into from Dec 25, 2019
Merged

mercurial: 4.9.1 -> 5.2.1 + python3 馃殌 #76126

merged 3 commits into from Dec 25, 2019

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 21, 2019 •
edited

Motivation for this change

Get python2 out of my nix profile

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@Mic92
mercurial: 4.9.1 -> 5.2.1
88a473f 
also switch to python3
@Mic92
python3.pkgs.qscintilla-qt5: don't propagate pyqt5
001999e 
Since this package symlinks pyqt5 in its own tree, propagating pyqt5
is detected as a conflict by our python setup hook.
@Mic92 Mic92 changed the title mercurial: 4.9.1 -> 5.2.1 + python3 馃殌 mercurial: 4.9.1 -> 5.2.1 + python3 馃殌 Dec 21, 2019
@ofborg ofborg bot requested review from lsix, edolstra and danbst December 21, 2019 07:52
@FRidh FRidh added this to Needs review in Python 2 deprecation Dec 21, 2019
@Mic92 Mic92 mentioned this pull request Dec 21, 2019
Closed
FRidh
FRidh reviewed Dec 22, 2019
View reviewed changes
pkgs/applications/version-management/tortoisehg/default.nix Outdated
};

in python2Packages.buildPythonApplication {
tortoiseMercurial = mercurial.overrideDerivation (old: {
Copy link
Member

Choose a reason for hiding this comment

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

OverridePythonAttrs

FRidh
FRidh reviewed Dec 22, 2019
View reviewed changes
pkgs/applications/version-management/tortoisehg/default.nix Outdated

doCheck = false; # tests fail with "thg: cannot connect to X server"
dontStrip = true;
buildPhase = "";
installPhase = ''
${python2Packages.python.executable} setup.py install --prefix=$out
${python3Packages.python.executable} setup.py install --prefix=$out
Copy link
Member

Choose a reason for hiding this comment

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

Is it still not possible to build a wheel?

@Mic92
tortoisehg: 5.0.2 -> 5.2.1
7063f6f 
This version is not yet released. However given that python2 will soon
go end-of-life (without security updates), this seems like a good move.
The package was also lacking proper qt wrapping and unusable before.
@Mic92
Copy link
Member Author

Mic92 commented Dec 22, 2019

fixed

@danbst
Copy link
Contributor

danbst commented Dec 22, 2019

I don't object this merge. There are problems with tortoisehg which may be fixed in further PRs:

  • tortoisehg is now slower. Startup, repo opening, any operation. I don't quite understand why. Is it because of Qt5?
  • iniparse package isn't found at runtime. To reproduce, open File->Settings. It is not critical though

@jtojnar jtojnar mentioned this pull request Dec 25, 2019
Merged
17 tasks
@Mic92 Mic92 merged commit d5a8103 into NixOS:master Dec 25, 2019
Python 2 deprecation automation moved this from Needs review to Done Dec 25, 2019
@Mic92 Mic92 deleted the mercurial branch December 25, 2019 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

@jonringer jonringer Awaiting requested review from jonringer

@lsix lsix Awaiting requested review from lsix

@edolstra edolstra Awaiting requested review from edolstra

@danbst danbst Awaiting requested review from danbst

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
Python 2 deprecation
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Mic92 @danbst @FRidh