summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorTobias Mayer <tobim@fastmail.fm>2020-08-18 18:06:46 +0200
committerJon <jonringer@users.noreply.github.com>2020-08-18 16:55:02 -0700
commite5a097a8cdeb731d2a2ecf300a0e0609d8d5677b (patch)
treeacddce933f1acf0dd567ff40cbd9d1ea421bece5 /pkgs/development
parentc057e8df8322e4e892464b79717ee765b6779a90 (diff)
downloadnixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar.gz
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar.bz2
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar.lz
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar.xz
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.tar.zst
nixpkgs-e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b.zip
pythonPackages.coloredlogs: remove obsolete patch
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/coloredlogs/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 6ef440da0ac..c2a329e08f3 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -1,4 +1,13 @@
-{ lib, buildPythonPackage, fetchFromGitHub, stdenv, isPy3k, fetchpatch, humanfriendly, verboselogs, capturer, pytest, mock, utillinux }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, humanfriendly
+, verboselogs
+, capturer
+, pytest
+, mock
+, utillinux
+}:
 
 buildPythonPackage rec {
   pname = "coloredlogs";
@@ -11,13 +20,6 @@ buildPythonPackage rec {
     sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
   };
 
-  # patch by risicle
-  patches = lib.optional (stdenv.isDarwin && isPy3k) (fetchpatch {
-    name = "darwin-py3-capture-fix.patch";
-    url = "https://github.com/xolox/python-coloredlogs/pull/74.patch";
-    sha256 = "0pk7k94iz0gdripw623vzdl4hd83vwhsfzshl8pbvh1n6swi0xx9";
-  });
-
   checkPhase = ''
     PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
                                      and not test_auto_install"