commit ed720586580914a64c6175c98d0ea7d0f674d9fb · pyrox.dev/nixpkgs

+10 -3

nixos/tests/ihatemoney.nix

···

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       1
       6
        
       let

     

       2
       2
       -
         f = backend: import ./make-test-python.nix ({ pkgs, ... }: {

     

       7
       7
       +
         inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       8
       8
       +
         f = backend: makeTest {

     

       3
       9
        
           name = "ihatemoney-${backend}";

     

       4
       10
        
           machine = { lib, ... }: {

     

       5
       11
        
             services.ihatemoney = {

     
···

       24
       30
        
           testScript = ''

     

       25
       31
        
             machine.wait_for_open_port(8000)

     

       26
       32
        
             machine.wait_for_unit("uwsgi.service")

     

       33
       33
       +
             machine.wait_until_succeeds("curl http://localhost:8000")

     

       27
       34
        
       

     

       28
       35
        
             assert '"yay"' in machine.succeed(

     

       29
       29
       -
                 "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'"

     

       36
       36
       +
                 "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com'"

     

       30
       37
        
             )

     

       31
       38
        
             owner, timestamp = machine.succeed(

     

       32
       39
        
                 "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key"

     
···

       48
       55
        
       

     

       49
       56
        
             assert "ihatemoney" in machine.succeed("curl http://localhost:8000")

     

       50
       57
        
           '';

     

       51
       51
       -
         });

     

       58
       58
       +
         };

     

       52
       59
        
       in {

     

       53
       60
        
         ihatemoney-sqlite = f "sqlite";

     

       54
       61
        
         ihatemoney-postgresql = f "postgresql";

+42

pkgs/development/python-modules/debts/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitLab

     

       5
       5
       +
       , isPy27

     

       6
       6
       +
       , jinja2

     

       7
       7
       +
       , pytest

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "debts";

     

       12
       12
       +
         version = "0.5";

     

       13
       13
       +
       

     

       14
       14
       +
         # pypi does not ship tests

     

       15
       15
       +
         src = fetchFromGitLab {

     

       16
       16
       +
           domain = "framagit.org";

     

       17
       17
       +
           owner = "almet";

     

       18
       18
       +
           repo = "debts";

     

       19
       19
       +
           rev = "d887bd8b340172d1c9bbcca6426529b8d1c2a241"; # no tags

     

       20
       20
       +
           sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         disabled = isPy27;

     

       24
       24
       +
       

     

       25
       25
       +
         propagatedBuildInputs = [ jinja2 ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [ pytest ];

     

       28
       28
       +
       

     

       29
       29
       +
         # for some reason tests only work if the module is properly installed

     

       30
       30
       +
         checkPhase = ''

     

       31
       31
       +
           rm -r debts

     

       32
       32
       +
           export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH

     

       33
       33
       +
           py.test tests

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         meta = with lib; {

     

       37
       37
       +
           inherit (src.meta) homepage;

     

       38
       38
       +
           description = "A simple library and cli-tool to help you solve some debts settlement scenarios";

     

       39
       39
       +
           license = licenses.beerware;

     

       40
       40
       +
           maintainers = [ maintainers.symphorien ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+41 -7

pkgs/development/python-modules/ihatemoney/default.nix

···

       1
       1
       -
       { buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests

     

       1
       1
       +
       { buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi

     

       2
       2
        
       , alembic

     

       3
       3
        
       , aniso8601

     

       4
       4
        
       , Babel

     
···

       15
       15
        
       , flask_script

     

       16
       16
        
       , flask_sqlalchemy

     

       17
       17
        
       , flask_wtf

     

       18
       18
       +
       , debts

     

       18
       19
        
       , idna

     

       19
       20
        
       , itsdangerous

     

       20
       21
        
       , jinja2

     

       21
       22
        
       , Mako

     

       22
       23
        
       , markupsafe

     

       23
       23
       -
       , mock

     

       24
       24
        
       , python-dateutil

     

       25
       25
        
       , pytz

     

       26
       26
        
       , six

     

       27
       27
        
       , sqlalchemy

     

       28
       28
       +
       , sqlalchemy-continuum

     

       28
       29
        
       , werkzeug

     

       29
       30
        
       , wtforms

     

       30
       31
        
       , psycopg2 # optional, for postgresql support

     

       31
       32
        
       , flask_testing

     

       32
       33
        
       }:

     

       33
       34
        
       

     

       35
       35
       +
       # ihatemoney is not really a library. It will only ever be imported

     

       36
       36
       +
       # by the interpreter of uwsgi. So overrides for its depencies are fine.

     

       37
       37
       +
       let

     

       38
       38
       +
         # https://github.com/spiral-project/ihatemoney/issues/567

     

       39
       39
       +
         pinned_wtforms = wtforms.overridePythonAttrs (old: rec {

     

       40
       40
       +
           pname = "WTForms";

     

       41
       41
       +
           version = "2.2.1";

     

       42
       42
       +
           src = fetchPypi {

     

       43
       43
       +
             inherit pname version;

     

       44
       44
       +
             sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc";

     

       45
       45
       +
           };

     

       46
       46
       +
         });

     

       47
       47
       +
         pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; };

     

       48
       48
       +
       in

     

       49
       49
       +
       

     

       34
       50
        
       buildPythonPackage rec {

     

       35
       51
        
         pname = "ihatemoney";

     

       36
       36
       -
         version = "4.1";

     

       52
       52
       +
         version = "4.2";

     

       37
       53
        
       

     

       38
       54
        
         src = fetchFromGitHub {

     

       39
       55
        
           owner = "spiral-project";

     

       40
       56
        
           repo = pname;

     

       41
       57
        
           rev = version;

     

       42
       42
       -
           sha256 = "1ai7v2i2rvswzv21nwyq51fvp8lr2x2cl3n34p11br06kc1pcmin";

     

       58
       58
       +
           sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1";

     

       43
       59
        
         };

     

       44
       60
        
       

     

       61
       61
       +
         disabled = isPy27;

     

       62
       62
       +
       

     

       63
       63
       +
         patches = [

     

       64
       64
       +
           # fix migration on postgresql

     

       65
       65
       +
           # remove on next release

     

       66
       66
       +
           (fetchpatch {

     

       67
       67
       +
             url = "https://github.com/spiral-project/ihatemoney/commit/6129191b26784b895e203fa3eafb89cee7d88b71.patch";

     

       68
       68
       +
             sha256 = "0yc24gsih9x3pnh2mhj4v5i71x02dq93a9jd2r8b1limhcl4p1sw";

     

       69
       69
       +
           })

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         postPatch = ''

     

       73
       73
       +
           # remove draconian pinning

     

       74
       74
       +
           sed -i 's/==.*$//' setup.cfg

     

       75
       75
       +
         '';

     

       76
       76
       +
       

     

       45
       77
        
         propagatedBuildInputs = [

     

       46
       78
        
           alembic

     

       47
       79
        
           aniso8601

     
···

       58
       90
        
           flask-restful

     

       59
       91
        
           flask_script

     

       60
       92
        
           flask_sqlalchemy

     

       61
       61
       -
           flask_wtf

     

       93
       93
       +
           pinned_flask_wtf

     

       62
       94
        
           idna

     

       63
       95
        
           itsdangerous

     

       64
       96
        
           jinja2

     
···

       68
       100
        
           pytz

     

       69
       101
        
           six

     

       70
       102
        
           sqlalchemy

     

       103
       103
       +
           sqlalchemy-continuum

     

       71
       104
        
           werkzeug

     

       72
       72
       -
           wtforms

     

       105
       105
       +
           pinned_wtforms

     

       73
       106
        
           psycopg2

     

       107
       107
       +
           debts

     

       74
       108
        
         ];

     

       75
       109
        
       

     

       76
       110
        
         checkInputs = [

     

       77
       111
        
           flask_testing

     

       78
       78
       -
         ] ++ lib.optionals isPy27 [ mock ];

     

       112
       112
       +
         ];

     

       79
       113
        
       

     

       80
       114
        
         passthru.tests = {

     

       81
       115
        
           inherit (nixosTests) ihatemoney;

+46

pkgs/development/python-modules/sqlalchemy-continuum/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , flask

     

       6
       6
       +
       , flask_login

     

       7
       7
       +
       , flask_sqlalchemy

     

       8
       8
       +
       , flexmock

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , sqlalchemy

     

       11
       11
       +
       , sqlalchemy-utils

     

       12
       12
       +
       , sqlalchemy-i18n

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "SQLAlchemy-Continuum";

     

       17
       17
       +
         version = "1.3.9";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchPypi {

     

       20
       20
       +
           inherit pname version;

     

       21
       21
       +
           sha256 = "0b7q0rqy5q7m9yw7yl7jzrk8p1jh1hqmqvzf45rwmwxs724kfkjg";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         propagatedBuildInputs = [

     

       25
       25
       +
           sqlalchemy

     

       26
       26
       +
           sqlalchemy-utils

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         # indicate tests that we don't have a database server at hand

     

       30
       30
       +
         DB = "sqlite";

     

       31
       31
       +
       

     

       32
       32
       +
         checkInputs = [

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
           sqlalchemy-i18n

     

       35
       35
       +
           flask

     

       36
       36
       +
           flask_login

     

       37
       37
       +
           flask_sqlalchemy

     

       38
       38
       +
           flexmock

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";

     

       43
       43
       +
           description = "Versioning and auditing extension for SQLAlchemy";

     

       44
       44
       +
           license = licenses.bsd3;

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+32

pkgs/development/python-modules/sqlalchemy-i18n/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , sqlalchemy

     

       6
       6
       +
       , sqlalchemy-utils

     

       7
       7
       +
       , psycopg2

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "SQLAlchemy-i18n";

     

       12
       12
       +
         version = "1.0.3";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchPypi {

     

       15
       15
       +
           inherit pname version;

     

       16
       16
       +
           sha256 = "15xah8643p29kciz365ixs9pbsflj92pzr2d9anbdh2biyf4cka8";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         propagatedBuildInputs = [

     

       20
       20
       +
           sqlalchemy

     

       21
       21
       +
           sqlalchemy-utils

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         # tests require running a postgresql server

     

       25
       25
       +
         doCheck = false;

     

       26
       26
       +
       

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           homepage = "https://github.com/kvesteri/sqlalchemy-i18n";

     

       29
       29
       +
           description = "Internationalization extension for SQLAlchemy models";

     

       30
       30
       +
           license = licenses.bsd3;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+2 -2

pkgs/servers/uwsgi/default.nix

···

       54
       54
        
       

     

       55
       55
        
       stdenv.mkDerivation rec {

     

       56
       56
        
         pname = "uwsgi";

     

       57
       57
       -
         version = "2.0.18";

     

       57
       57
       +
         version = "2.0.19.1";

     

       58
       58
        
       

     

       59
       59
        
         src = fetchurl {

     

       60
       60
        
           url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";

     

       61
       61
       -
           sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9";

     

       61
       61
       +
           sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn";

     

       62
       62
        
         };

     

       63
       63
        
       

     

       64
       64
        
         nativeBuildInputs = [ python3 pkgconfig ];

pkgs/top-level/python-packages.nix

···

       683
       683
        
           inherit (pkgs) dbus pkgconfig;

     

       684
       684
        
         };

     

       685
       685
        
       

     

       686
       686
       +
         debts = callPackage ../development/python-modules/debts { };

     

       687
       687
       +
       

     

       686
       688
        
         dftfit = callPackage ../development/python-modules/dftfit { };

     

       687
       689
        
       

     

       688
       690
        
         dicom2nifti = callPackage ../development/python-modules/dicom2nifti { };

     
···

       6024
       6026
        
         sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };

     

       6025
       6027
        
       

     

       6026
       6028
        
         sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };

     

       6029
       6029
       +
       

     

       6030
       6030
       +
         sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { };

     

       6031
       6031
       +
       

     

       6032
       6032
       +
         sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { };

     

       6027
       6033
        
       

     

       6028
       6034
        
         sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { };

     

       6029
       6035