Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

pytrainer: 2.1.0 -> 2.2.1

The new version supports SQLAlchemy version >2 allowing us to remove
the custom version.

+12 -17
+12 -17
pkgs/applications/misc/pytrainer/default.nix
··· 23 23 matplotlib = super.matplotlib.override { 24 24 enableGtk3 = true; 25 25 }; 26 - sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { 27 - version = "1.4.46"; 28 - src = fetchPypi { 29 - pname = "SQLAlchemy"; 30 - inherit version; 31 - hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; 32 - }; 33 - disabledTestPaths = [ 34 - "test/aaa_profiling" 35 - "test/ext/mypy" 36 - ]; 37 - }); 38 26 }); 39 27 }; 40 28 in python.pkgs.buildPythonApplication rec { 41 29 pname = "pytrainer"; 42 - version = "2.1.0"; 30 + version = "2.2.1"; 43 31 44 32 src = fetchFromGitHub { 45 33 owner = "pytrainer"; 46 34 repo = "pytrainer"; 47 35 rev = "v${version}"; 48 - sha256 = "sha256-U2SVQKkr5HF7LB0WuCZ1xc7TljISjCNO26QUDGR+W/4="; 36 + hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0="; 49 37 }; 50 38 51 39 propagatedBuildInputs = with python.pkgs; [ 52 - sqlalchemy-migrate 40 + sqlalchemy 53 41 python-dateutil 54 42 matplotlib 55 43 lxml ··· 85 73 psycopg2 86 74 ]); 87 75 76 + postPatch = '' 77 + substituteInPlace pytrainer/platform.py \ 78 + --replace 'sys.prefix' "\"$out\"" 79 + ''; 80 + 88 81 checkPhase = '' 89 - env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \ 82 + env \ 83 + HOME=$TEMPDIR \ 84 + TZDIR=${tzdata}/share/zoneinfo \ 90 85 TZ=Europe/Kaliningrad \ 91 - LC_ALL=en_US.UTF-8 \ 86 + LC_TIME=C \ 92 87 xvfb-run -s '-screen 0 800x600x24' \ 93 88 ${python.interpreter} setup.py test 94 89 '';