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.

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

mercurial_4: init at 4.9.1 #76903

Merged
merged 2 commits into from Jan 6, 2020
Merged

mercurial_4: init at 4.9.1 #76903

merged 2 commits into from Jan 6, 2020

Conversation

@eraserhd
Copy link
Contributor

@eraserhd eraserhd commented Jan 3, 2020

Motivation for this change

Commit 88a473f upgraded mercurial, made it use python3, and removed
support for hg-git, breaking graalvm8. Since hg-git does not
officially support python3 or the new version of mercurial, this
patch adds back the old version of mercurial, used only by the
graalvm build.

Closes #76527.

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 nixpkgs-review --run "nixpkgs-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 @eelco @volth @hlolli

@hlolli I assume the 19.2.1 Graal PR will need to be updated as well?

@eraserhd eraserhd force-pushed the eraserhd:graalvm-build-fix branch from 98cd068 to 7b77664 Jan 3, 2020
@ofborg ofborg bot requested review from edwtjo, NeQuissimus, hlolli and volth Jan 3, 2020
@volth
volth approved these changes Jan 4, 2020
Copy link
Contributor

@volth volth left a comment

I'd better keep mercurial_4 next to mercurial_5 than in graalvm's dir.

Anyway, python2 won't be gone totally soon. It is needed to build graalvm, chromium, etc (which are too big to migrate to python3 quickly), so mercurial_4 could stay in nixpkgs as long as python2. At least as a build dependency which does not leak to produced system closures (which could be python3-only)

cc @Mic92 @danbst

@eraserhd
Copy link
Contributor Author

@eraserhd eraserhd commented Jan 4, 2020

@eraserhd eraserhd force-pushed the eraserhd:graalvm-build-fix branch from 7b77664 to c81b03f Jan 4, 2020
@eraserhd eraserhd changed the title graalvm8: use custom mercurial mercurial4_9: init at 4.9.1 Jan 4, 2020
@eraserhd eraserhd force-pushed the eraserhd:graalvm-build-fix branch from c81b03f to 3f706f2 Jan 4, 2020
@eraserhd
Copy link
Contributor Author

@eraserhd eraserhd commented Jan 4, 2020

Alright, made it mercurial4_9, changed the PR title and fixed up the commits.

@ofborg ofborg bot requested review from volth and edolstra Jan 4, 2020
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
eraserhd added 2 commits Jan 3, 2020
Commit 88a473f upgraded mercurial, made it use python3, and removed
support for hg-git, breaking graalvm8.  Since hg-git does not
officially support python3 or the new version of mercurial, this
patch uses mercurial_4.

Closes #76527.
@eraserhd eraserhd force-pushed the eraserhd:graalvm-build-fix branch from 3f706f2 to c15f42a Jan 4, 2020
@eraserhd eraserhd changed the title mercurial4_9: init at 4.9.1 mercurial_4: init at 4.9.1 Jan 4, 2020
Copy link
Contributor Author

@eraserhd eraserhd left a comment

Fixed up.

@FRidh FRidh merged commit a54461f into NixOS:master Jan 6, 2020
15 checks passed
15 checks passed
graalvm8, mercurial_4 on aarch64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
graalvm8, mercurial_4 on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.