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: d7627dd2df9e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d18403953f5c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 13, 2020

  1. python3.pkgs.publicsuffix: fix build 

    This patch has not been necessary since
5425867, and has in fact broken the
build since then.
    @alyssais
    alyssais authored and Jon committed Jan 13, 2020
    Copy the full SHA
    2ddd038 View commit details

  2. python3.pkgs.publicsuffix: patchPhase -> postPatch

    @alyssais
    alyssais authored and Jon committed Jan 13, 2020
    Copy the full SHA
    d184039 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 pkgs/development/python-modules/publicsuffix/default.nix
5 changes: 1 addition & 4 deletions pkgs/development/python-modules/publicsuffix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,8 @@ buildPythonPackage rec {
};


# fix the ASCII-mode LICENSE file read
# disable test_fetch and the doctests (which also invoke fetch)
patchPhase = stdenv.lib.optionalString isPy3k ''
sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py
'' + ''
postPatch = ''
sed -i -e "/def test_fetch/i\\
\\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
'';