Merge pull request #231239 from Ma27/fix-privacyidea

privacyidea: fix build

authored by

Maximilian Bosch and committed by
GitHub
5b0b0970 537d611a

+25 -5
+25 -5
pkgs/applications/misc/privacyidea/default.nix
··· 3 3 }: 4 4 5 5 let 6 - dropDevOutput = { outputs, ... }: { 6 + dropDocOutput = { outputs, ... }: { 7 7 outputs = lib.filter (x: x != "doc") outputs; 8 8 }; 9 9 ··· 119 119 flask-babel = (super.flask-babel.override { 120 120 sphinxHook = null; 121 121 furo = null; 122 - }).overridePythonAttrs (old: (dropDevOutput old) // rec { 122 + }).overridePythonAttrs (old: (dropDocOutput old) // rec { 123 123 pname = "Flask-Babel"; 124 124 version = "2.0.0"; 125 125 format = "setuptools"; ··· 128 128 inherit version; 129 129 hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; 130 130 }; 131 + disabledTests = [ 132 + # AssertionError: assert 'Apr 12, 2010...46:00\u202fPM' == 'Apr 12, 2010, 1:46:00 PM' 133 + # Note the `\u202f` (narrow, no-break space) vs space. 134 + "test_basics" 135 + "test_init_app" 136 + "test_custom_locale_selector" 137 + "test_refreshing" 138 + ]; 131 139 }); 132 140 psycopg2 = (super.psycopg2.override { 133 141 sphinxHook = null; 134 142 sphinx-better-theme = null; 135 - }).overridePythonAttrs dropDevOutput; 143 + }).overridePythonAttrs dropDocOutput; 136 144 hypothesis = super.hypothesis.override { 137 145 enableDocumentation = false; 138 146 }; 139 147 pyjwt = (super.pyjwt.override { 140 148 sphinxHook = null; 141 149 sphinx-rtd-theme = null; 142 - }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; }); 150 + }).overridePythonAttrs (old: (dropDocOutput old) // { format = "setuptools"; }); 143 151 beautifulsoup4 = (super.beautifulsoup4.override { 144 152 sphinxHook = null; 145 - }).overridePythonAttrs dropDevOutput; 153 + }).overridePythonAttrs dropDocOutput; 146 154 pydash = (super.pydash.override { 147 155 sphinx-rtd-theme = null; 148 156 }).overridePythonAttrs (old: rec { ··· 155 163 format = "setuptools"; 156 164 doCheck = false; 157 165 }); 166 + pyopenssl = (super.pyopenssl.override { 167 + sphinxHook = null; 168 + sphinx-rtd-theme = null; 169 + }).overridePythonAttrs dropDocOutput; 158 170 }; 159 171 }; 160 172 in ··· 169 181 hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; 170 182 fetchSubmodules = true; 171 183 }; 184 + 185 + patches = [ 186 + # https://github.com/privacyidea/privacyidea/pull/3611 187 + (fetchpatch { 188 + url = "https://github.com/privacyidea/privacyidea/commit/7db6509721726a34e8528437ddbd4210019b11ef.patch"; 189 + sha256 = "sha256-ZvtauCs1vWyxzGbA0B2+gG8q5JyUO8DF8nm/3/vcYmE="; 190 + }) 191 + ]; 172 192 173 193 propagatedBuildInputs = with python3'.pkgs; [ 174 194 cryptography pyrad pymysql python-dateutil flask-versioned flask_script