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

hg-git: 0.8.10 -> 0.8.11 #36144

Merged
merged 1 commit into from Mar 1, 2018
Merged

hg-git: 0.8.10 -> 0.8.11 #36144

merged 1 commit into from Mar 1, 2018

Conversation

adamruzicka
Copy link
Contributor

Motivation for this change

0.8.10 is not compatible with mercurial-4.5. I also added meta.license as part of this.

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/) - there are none
  • Fits CONTRIBUTING.md.

adamruzicka
adamruzicka commented Feb 28, 2018
View reviewed changes
pkgs/top-level/python-packages.nix
@@ -7217,6 +7217,7 @@ in {
description = "Push and pull from a Git server using Mercurial";
homepage = http://hg-git.github.com/;
maintainers = with maintainers; [ koral ];
license = stdenv.lib.licenses.gpl2;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Source: COPYING in source repo

@globin
Copy link
Member

globin commented Mar 1, 2018 •
edited

Could you rebase this on staging please?

Ah looks fine without rebase 👍

@globin globin changed the base branch from master to staging March 1, 2018 13:40
@adamruzicka
hg-git: 0.8.10 -> 0.8.11
98c8e99 
0.8.10 is not compatible with mercurial-4.5
@adamruzicka
Copy link
Contributor Author

I just rebased on staging, should I roll it back?

@globin
Copy link
Member

globin commented Mar 1, 2018

No, it's fine!

@globin
Copy link
Member

globin commented Mar 1, 2018

@GrahamcOfBorg build mercurial

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

cannot build derivation '/nix/store/18gb45ps4y6s9wxv3z7fd7f2qdckvs7n-apple-framework-CoreText.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/2zrxrvqykb1n4iaxcjf9fhgsz64k282q-apple-framework-ImageIO.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/y4hy3hqynxy3zgd4cyll5b3k6zcg2h7a-python2.7-mock-2.0.0.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/j29vhhhncyixzaknjsa5k0lv5psrp0bl-python2.7-pytest-3.4.1.drv': 13 dependencies couldn't be built
cannot build derivation '/nix/store/0vxdw66d14xph1ack9fwzq603z7yz0g2-apple-framework-ApplicationServices.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/j3r86hax3icynii16ns1ii99qf5bigfn-python2.7-geventhttpclient-1.3.1.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/r77qvswpjhbskqriqvd1c93qvn1hixvw-python2.7-dulwich-0.18.6.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/v86nqcpr2lfmlc7wncy8iipf1dpsbgj2-python2.7-hg-git-0.8.11.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/fq3f2fqrssij0hmbfgkw1pc7x77w8ds3-mercurial-4.5.drv': 11 dependencies couldn't be built
error: build of '/nix/store/fq3f2fqrssij0hmbfgkw1pc7x77w8ds3-mercurial-4.5.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/lib/python2.7/site-packages/mercurial/cext/bdiff.so
shrinking /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/lib/python2.7/site-packages/mercurial/cext/osutil.so
gzipping man pages under /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/share/man/
strip is /nix/store/ki5nz16mh8h8qngsxi6wfr38ifzi064i-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/lib  /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/bin 
patching script interpreter paths in /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5
/nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/share/cgi-bin/hgweb.cgi: interpreter directive changed from "/usr/bin/env python" to "/nix/store/5972adnj2q91bc4wd6azryinj2y4bpxa-python-2.7.14/bin/python"
checking for references to /tmp/nix-build-mercurial-4.5.drv-0 in /nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5...
wrapping `/nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5/bin/.hg-wrapped'...
/nix/store/igxayr4bpajlciw09h5asw8m25061l7x-mercurial-4.5

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/lib/python2.7/site-packages/mercurial/zstd.so
shrinking /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/lib/python2.7/site-packages/hgext/fsmonitor/pywatchman/bser.so
gzipping man pages under /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/share/man/
strip is /nix/store/3l67pallq6xda4rgygnpaj8rhcqvzh6d-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/lib  /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/bin
patching script interpreter paths in /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5
/nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/share/cgi-bin/hgweb.cgi: interpreter directive changed from "/usr/bin/env python" to "/nix/store/q82gn26ifzvr5nnz19cymmgh8b4317s6-python-2.7.14/bin/python"
checking for references to /build in /nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5...
wrapping `/nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5/bin/.hg-wrapped'...
/nix/store/kza5ijj4hszrn23jf4d0xmr07zl1jpg4-mercurial-4.5

@globin globin merged commit 020e801 into NixOS:staging Mar 1, 2018
@adamruzicka adamruzicka deleted the hg-git-0.8.11 branch March 1, 2018 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adamruzicka @globin @GrahamcOfBorg