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

Commits on Mar 3, 2019

  1. Revert "pythonPackages.wptserve: fix build by adding a local h2 3.0.1… 

    … instance"

This reverts commit 3e603b1.
Python packages' dependencies should not be overridden because
having multiple versions in $PYTHONPATH breaks stuff.
    @FRidh
    Robert Schütz authored and FRidh committed Mar 3, 2019
    Copy the full SHA
    c943e22 View commit details

  2. python.pkgs.wptserve: relax h2 version constraint

    @FRidh
    Robert Schütz authored and FRidh committed Mar 3, 2019
    Copy the full SHA
    3c4c8b6 View commit details
Showing with 4 additions and 13 deletions.
  1. +4 −13 pkgs/development/python-modules/wptserve/default.nix
17 changes: 4 additions & 13 deletions pkgs/development/python-modules/wptserve/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,19 +5,6 @@
, isPy3k
}:

let
_h2 = h2;
in let
h2 = _h2.overrideAttrs (x: {
version = "3.0.1";
src = fetchPypi {
pname = "h2";
version = "3.0.1";
sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj";
};
});
in

buildPythonPackage rec {
pname = "wptserve";
version = "2.0";
@@ -29,6 +16,10 @@ buildPythonPackage rec {
sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a";
};

postPatch = ''
substituteInPlace setup.py --replace "h2==" "h2>="
'';

propagatedBuildInputs = [ six h2 ];

meta = {