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

tortoisehg: 4.1.1 -> 4.3.1 #31240

Merged
merged 1 commit into from Nov 4, 2017
Merged

tortoisehg: 4.1.1 -> 4.3.1 #31240

merged 1 commit into from Nov 4, 2017

Conversation

gjeusel
Copy link
Contributor

@gjeusel gjeusel commented Nov 4, 2017

Signed-off-by: gjeusel jeusel.guillaume@gmail.com

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@gjeusel
tortoisehg: 4.1.1 -> 4.3.1
ba885e1 
Signed-off-by: gjeusel <jeusel.guillaume@gmail.com>
@danbst
Copy link
Contributor

danbst commented Nov 4, 2017

I've just checked that license dialog doesn't show license. You may add

      mkdir -p $out/share/doc/tortoisehg
      cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz

to installPhase if you wish to fix it. Probably should report to upstream, because this fix looks very ad-hoc

@NeQuissimus
Copy link
Member

Please send another PR if we need to fix the license

Nox:

Writing /nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1/lib/python2.7/site-packages/tortoisehg-4.3.1-py2.7.egg-info
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1
patching script interpreter paths in /nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1
checking for references to /tmp/nix-build-tortoisehg-4.3.1.drv-0 in /nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1...
wrapping `/nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1/bin/thg'...
/nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1
Result in /tmp/nox-review-mwwdncd8
total 4
lrwxrwxrwx 1 nequi users 60 Nov  4 10:47 result -> /nix/store/bz804w4z9s1gk6w50ga56dapjf0c8rma-tortoisehg-4.3.1

@NeQuissimus NeQuissimus merged commit 2452bd2 into NixOS:master Nov 4, 2017
@gjeusel gjeusel deleted the tortoisehg-update branch November 4, 2017 15:59
@danbst
Copy link
Contributor

danbst commented Nov 4, 2017

@NeQuissimus ok. Upstreamed issue at https://bitbucket.org/tortoisehg/thg/issues/4934/license-text-in-license-dialog-is-empty

@danbst danbst mentioned this pull request Nov 11, 2017
Merged
8 tasks
c0bw3b pushed a commit that referenced this pull request Nov 14, 2017
@danbst
tortoisehg: fix license dialog
450123c 
Upstream issue:
https://bitbucket.org/tortoisehg/thg/issues/4934/copyingtxt-not-installed-by-setuppy-on

While upstream is preparing a proper fix, we can install the missing file manually.

Originally discovered while testing #31240
@orivej orivej added the 8.has: port to stable A PR already has a backport to the stable release. label Dec 2, 2017
@orivej
Copy link
Contributor

orivej commented Dec 2, 2017

Released in dccdfca to solve #32245.

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

@danbst danbst danbst approved these changes

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@gjeusel @danbst @NeQuissimus @orivej @GrahamcOfBorg @Janik-Haag