Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34ba0c4abdbb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c453add934e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 5, 2020

  1. pythonPackages.hglib: re-enable test_merge_prompt_cb 

    This was resolved since ea18da4 ('mercurial: 5.3 -> 5.3.1')
    @veprbl
    veprbl committed Jul 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    72f619f View commit details

  2. Merge pull request #92310 from veprbl/pr/hglib_reenable_test 

    pythonPackages.hglib: re-enable test_merge_prompt_cb
    @veprbl
    veprbl authored Jul 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3c453ad View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/development/python-modules/hglib/default.nix
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/hglib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,8 +30,7 @@ buildPythonPackage rec {
checkInputs = [ nose ];

checkPhase = ''
${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v \
--exclude=test_merge_prompt_cb # https://bz.mercurial-scm.org/show_bug.cgi?id=6265
${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v
'';

meta = with stdenv.lib; {