@@ -1,43 +1,43 @@
1−{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests
2−
3−, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script
4−, defusedxml, croniter, flask_migrate, pyjwt1, configobj, sqlsoup, pillow
5−, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel
6−, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
7−, pydash, ecdsa
8−
9−, mock, pytestCheckHook, responses, testfixtures
1+{ lib, fetchFromGitHub, cacert, openssl, nixosTests
2+, python3
103}:
114
12−buildPythonPackage rec {
5+let
6+ python3' = python3.override {
7+ packageOverrides = self: super: {
8+ sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
9+ version = "1.3.24";
10+ src = oldAttrs.src.override {
11+ inherit version;
12+ sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
13+ };
14+ });
15+ };
16+ };
17+in
18+python3'.pkgs.buildPythonPackage rec {
1319 pname = "privacyIDEA";
14− version = "3.5.2";
20+ version = "3.6";
1521
1622 src = fetchFromGitHub {
1723 owner = pname;
1824 repo = pname;
1925 rev = "v${version}";
20− sha256 = "sha256-k2om2LjkFRCT53ECPAJEztCiMdz4fF5eoipVUvSoyGo=";
26+ sha256 = "sha256-yywkQ3TdBzRMbJGY0Seaprztgt0JrCAbgqosMQ5fcQM=";
2127 fetchSubmodules = true;
2228 };
2329
24− patches = [
25− # Subset of https://github.com/privacyidea/privacyidea/commit/359db6dd10212b8a210e0a83536e92e9e796a1f8,
26− # fixes app context errors in tests. Can be removed on the next bump.
27− ./fix-tests.patch
28− ];
29−
30− propagatedBuildInputs = [
30+ propagatedBuildInputs = with python3'.pkgs; [
3131 cryptography pyrad pymysql python-dateutil flask-versioned flask_script
3232 defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow
3333 python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
3434 ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
35− pydash ecdsa
35+ pydash ecdsa google-auth importlib-metadata
3636 ];
3737
3838 passthru.tests = { inherit (nixosTests) privacyidea; };
3939
40− checkInputs = [ openssl mock pytestCheckHook responses testfixtures ];
40+ checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ];
4141 disabledTests = [
4242 "AESHardwareSecurityModuleTestCase"
4343 "test_01_cert_request"
@@ -61,7 +61,7 @@ buildPythonPackage rec {
6161 '';
6262
6363 postInstall = ''
64− rm -rf $out/${python.sitePackages}/tests
64+ rm -r $out/${python3'.sitePackages}/tests
6565 '';
6666
6767 meta = with lib; {