From a8a0313b98e4fd10503513a00afdf749773630fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 24 May 2022 03:51:09 +0000
Subject: [PATCH 1/2] archivy: simplify expression

---
 pkgs/applications/misc/archivy/default.nix | 26 ++++------------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index c2cf561524fe..0cb90ce16725 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -1,41 +1,23 @@
 { lib
 , stdenv
 , python3
-, fetchPypi
 }:
 
 let
-  defaultOverrides = [
-    (self: super: {
+  py = python3.override {
+    packageOverrides = self: super: {
       wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec {
         version = "2.3.1";
-        pname = "WTForms";
 
-        src = super.fetchPypi {
-          inherit pname version;
+        src = oldAttrs.src.override {
+          inherit version;
           sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI=";
         };
 
         doCheck = false;
       });
-    })
-  ];
-
-  mkOverride = attrname: version: sha256:
-    self: super: {
-      ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
-        inherit version;
-        src = oldAttrs.src.override {
-          inherit version sha256;
-        };
-      });
     };
-
-  py = python3.override {
-    # Put packageOverrides at the start so they are applied after defaultOverrides
-    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
   };
-
 in
 with py.pkgs;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc5b53ab2925..4113d4cd97e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1736,7 +1736,7 @@ with pkgs;
 
   archivemount = callPackage ../tools/filesystems/archivemount { };
 
-  archivy = python3Packages.callPackage ../applications/misc/archivy { };
+  archivy = callPackage ../applications/misc/archivy { };
 
   arandr = callPackage ../tools/X11/arandr { };
 

From 9ce5e3220a0eac911821de3c353dbc6b8253780d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 24 May 2022 03:52:06 +0000
Subject: [PATCH 2/2] python3Packages.wtforms: normalize pname

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

diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index 95f9d2df65cc..c6a3ecf2088a 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -9,10 +9,11 @@
 
 buildPythonPackage rec {
   version = "3.0.1";
-  pname = "WTForms";
+  pname = "wtforms";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "WTForms";
+    inherit version;
     sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";
   };