Merge branch 'master' into rolling

pkgs/selfprivacy-api/default.nix

@@ -4,16 +4,44 @@ let
   inherit (nixpkgs) pkgs;
   inherit pythonPkgs;
 
-  selfprivacy-api = { buildPythonPackage, flask, flask-restful, setuptools, portalocker, flask-swagger, flask-swagger-ui, pytz, pytest, pytest-mock, pytest-datadir, huey, gevent }:
+  selfprivacy-api =
+    { buildPythonPackage
+    , flask
+    , flask-restful
+    , setuptools
+    , portalocker
+    , flask-swagger
+    , flask-swagger-ui
+    , pytz
+    , pytest
+    , pytest-mock
+    , pytest-datadir
+    , huey
+    , gevent
+    , mnemonic
+    }:
     buildPythonPackage rec {
       pname = "selfprivacy-api";
-      version = "1.1";
+      version = "1.1.1";
       src = builtins.fetchGit {
         url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
-        rev = "f235819a1c7db01d3296f753c1dc5674f98b9ec7";
-        ref = "system-configuration";
+        rev = "4f30017132af5b404dbf770d221bda1b4597ad41";
       };
-      propagatedBuildInputs = [ flask flask-restful setuptools portalocker flask-swagger flask-swagger-ui pytz pytest pytest-mock pytest huey gevent ];
+      propagatedBuildInputs = [
+        flask
+        flask-restful
+        setuptools
+        portalocker
+        flask-swagger
+        flask-swagger-ui
+        pytz
+        pytest
+        pytest-mock
+        pytest-datadir
+        huey
+        gevent
+        mnemonic
+      ];
       meta = {
         description = ''
           SelfPrivacy Server Management API