Merge pull request #134695 from siraben/archivy-fix

archivy: fix runtime

pkgs/applications/misc/archivy/default.nix

@@ -1,23 +1,55 @@
-{ lib
+{ lib, stdenv, python3, fetchPypi }:
-, buildPythonApplication
+
-, fetchPypi
+let
-, appdirs
+  defaultOverrides = [
-, attrs
+    (self: super: {
-, beautifulsoup4
+      flask = super.flask.overridePythonAttrs (oldAttrs: rec {
-, click-plugins
+        version = "1.1.2";
-, elasticsearch
+        pname = "Flask";
-, flask-compress
+
-, flask_login
+        src = super.fetchPypi {
-, flask_wtf
+          inherit pname version;
-, html2text
+          sha256 = "sha256-Tvoa4tfJhlr0iYbeiuuFBL8yx/PW/ck1PTSyH0sScGA=";
-, python-dotenv
+        };
-, python-frontmatter
+
-, requests
+        checkInputs = [ self.pytest ];
-, tinydb
+        propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ];
-, validators
+
-, werkzeug
+        doCheck = false;
-, wtforms
+      });
-}:
+    })
+
+    (self: super: {
+      flask_login = super.flask_login.overridePythonAttrs (oldAttrs: rec {
+        pname = "Flask";
+        version = "0.5.0";
+
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b";
+        };
+        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;
 
 buildPythonApplication rec {
   pname = "archivy";
@@ -40,8 +72,7 @@ buildPythonApplication rec {
       --replace 'validators ==' 'validators >=' \
       --replace 'tinydb ==' 'tinydb >=' \
       --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \
-      --replace 'Werkzeug ==' 'Werkzeug >=' \
+      --replace 'Werkzeug ==' 'Werkzeug >='
-      --replace 'Flask ==' 'Flask >='
   '';
 
   propagatedBuildInputs = [
@@ -57,6 +88,7 @@ buildPythonApplication rec {
     python-dotenv
     python-frontmatter
     requests
+    setuptools
     tinydb
     validators
     werkzeug