From 458be187f2e896d911d2a7206fb866b9045bf8fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 May 2023 23:55:06 +0200
Subject: [PATCH 1/5] python311Packages.vivisect: 1.1.0 -> 1.1.1

Changelog: https://github.com/vivisect/vivisect/blob/v1.1.1/CHANGELOG.rst
---
 pkgs/development/python-modules/vivisect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index d8b5a7e9ee86..bf281f374c50 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "vivisect";
-  version = "1.1.0";
+  version = "1.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI=";
+    hash = "sha256-URRBEZelw4s43zqtb/GrLxIksvrqHbqQWntT9jVonhU=";
   };
 
   pythonRelaxDeps = [

From f98548431e788124b382ce9c88bb1ecb8f839ebb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 May 2023 23:56:18 +0200
Subject: [PATCH 2/5] python311Packages.funcy: 1.18 -> 2.0

---
 pkgs/development/python-modules/funcy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix
index 74c8b8ff4d67..81f2cf0a5c55 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "funcy";
-  version = "1.18";
+  version = "2.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI=";
+    hash = "sha256-OWMxXVnUHG8wwEvJEOEKtQo6xKIlhov6lv7tEz3wdcs=";
   };
 
   # No tests

From bdba17db08b2bb32306acc07df4034271ba67479 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 May 2023 23:56:36 +0200
Subject: [PATCH 3/5] python311Packages.viv-utils: 0.7.7 -> 0.7.9

Diff: https://github.com/williballenthin/viv-utils/compare/refs/tags/v0.7.7...v0.7.9

Changelog: https://github.com/williballenthin/viv-utils/releases/tag/v0.7.9
---
 pkgs/development/python-modules/viv-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index 8829279a1859..e0093f2ef892 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -12,13 +12,13 @@
 }:
 buildPythonPackage rec {
   pname = "viv-utils";
-  version = "0.7.7";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "viv-utils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE=";
+    hash = "sha256-xM3jtA6fNk36+enL/EcQH59CNajYnGlEDu06QXIFz6A=";
   };
 
   postPatch = ''

From 497562f7d7c427001268ceced5b1da42a1b3ee2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 May 2023 00:00:46 +0200
Subject: [PATCH 4/5] python311Packages.funcy: add changelog to meta

- add format
- disable on unsupported Python releases
---
 pkgs/development/python-modules/funcy/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix
index 81f2cf0a5c55..bafaf0fdb1f1 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -1,11 +1,15 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "funcy";
   version = "2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -18,7 +22,9 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Collection of fancy functional tools focused on practicality";
     homepage = "https://funcy.readthedocs.org/";
+    changelog = "https://github.com/Suor/funcy/blob/2.0/CHANGELOG";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 
 }

From 2c0229372e69686c9a42bcd94803f5a2318b084d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jun 2023 08:50:39 +0200
Subject: [PATCH 5/5] python311Packages.django-cacheops: mark as broken

Not support for funcy > 2
https://github.com/Suor/django-cacheops/issues/454
---
 pkgs/development/python-modules/django-cacheops/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix
index 8122af7e28b9..971a65eeb1d5 100644
--- a/pkgs/development/python-modules/django-cacheops/default.nix
+++ b/pkgs/development/python-modules/django-cacheops/default.nix
@@ -58,5 +58,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG";
     license = licenses.bsd3;
     maintainers = with maintainers; [ onny ];
+    # No support for funcy > 2
+    # https://github.com/Suor/django-cacheops/issues/454
+    broken = true;
   };
 }