Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 15 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/tools/misc/brotab/default.nix b/nixpkgs/pkgs/tools/misc/brotab/default.nix
index 85b630c9d67b..ce2effb25ce7 100644
--- a/nixpkgs/pkgs/tools/misc/brotab/default.nix
+++ b/nixpkgs/pkgs/tools/misc/brotab/default.nix
@@ -1,8 +1,9 @@
-{ lib, fetchFromGitHub, python }:
+{ lib, fetchFromGitHub, fetchpatch, python }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "1.4.2";
   pname = "brotab";
+  version = "1.4.2";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "balta2ar";
@@ -11,11 +12,19 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
   };
 
+  patches = [
+    # https://github.com/balta2ar/brotab/pull/102
+    (fetchpatch {
+      name = "remove-unnecessary-pip-import.patch";
+      url = "https://github.com/balta2ar/brotab/commit/825cd48f255c911aabbfb495f6b8fc73f27d3fe5.patch";
+      hash = "sha256-IN28AOLPKPUc3KkxIGFMpZNNXA1+O12NxS+Hl4KMXbg=";
+    })
+  ];
+
   propagatedBuildInputs = with python.pkgs; [
-    requests
     flask
     psutil
-    setuptools
+    requests
   ];
 
   postPatch = ''
@@ -25,6 +34,8 @@ python.pkgs.buildPythonApplication rec {
       --replace "requests==2.24.0" "requests>=2.24.0"
   '';
 
+  __darwinAllowLocalNetworking = true;
+
   nativeCheckInputs = with python.pkgs; [
     pytestCheckHook
   ];