Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c9c04f918a2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e31aa326e08
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 13, 2018

  1. mitmproxy: 3.0.4 -> 4.0.4, fix tests 

    - add missing checkInputs
- apply upstream patch to fix some tests that failed due to
  expired test ssl certs
- re-enable a previously disabled test case

(cherry picked from commit d225a91)
    @xeji
    xeji committed Sep 13, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b55e305 View commit details

  2. pythonPackages.BTrees: fix build (#46588) 

    a test case failed since the update to 4.5.1, disable it

(cherry picked from commit 68b7de9)
    @xeji
    xeji committed Sep 13, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3e31aa3 View commit details
Showing with 22 additions and 5 deletions.
  1. +6 −0 pkgs/development/python-modules/btrees/default.nix
  2. +16 −5 pkgs/tools/networking/mitmproxy/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/btrees/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ persistent zope_interface ];
checkInputs = [ zope_testrunner ];

# disable a failing test that looks broken
postPatch = ''
substituteInPlace BTrees/tests/common.py \
--replace "testShortRepr" "no_testShortRepr"
'';

src = fetchPypi {
inherit pname version;
sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";
21 changes: 16 additions & 5 deletions pkgs/tools/networking/mitmproxy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }:
{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, fetchpatch }:

with python3Packages;

buildPythonPackage rec {
pname = "mitmproxy";
version = "3.0.4";
version = "4.0.4";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "10l761ds46r1p2kjxlgby9vdxbjjlgq72s6adjypghi41s3qf034";
sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r";
};

patches = [
(fetchpatch {
# Tests failed due to expired test certificates,
# https://github.com/mitmproxy/mitmproxy/issues/3316
# TODO: remove on next update
name = "test-certificates.patch";
url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch";
sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv";
})
];

postPatch = ''
# remove dependency constraints
sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
@@ -23,8 +34,7 @@ buildPythonPackage rec {
checkPhase = ''
export HOME=$(mktemp -d)
export LC_CTYPE=en_US.UTF-8
# test_echo resolves hostnames
pytest -k 'not test_echo and not test_find_unclaimed_URLs '
pytest -k 'not test_find_unclaimed_URLs'
'';

propagatedBuildInputs = [
@@ -38,6 +48,7 @@ buildPythonPackage rec {
checkInputs = [
beautifulsoup4 flask pytest
requests glibcLocales
asynctest parver pytest-asyncio
];

meta = with stdenv.lib; {