diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-03-05 11:07:50 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-03-05 11:07:50 -0500 |
| commit | 36506df7fe1e087fd0af99f8eb6ee71759fffa81 (patch) | |
| tree | 3bd378728940aa828594cab7bfbafc767891861b /pkgs/applications/virtualization | |
| parent | 0865d19ccd6baa36b575ef3dc50b0bed76f6dca6 (diff) | |
| parent | 0467a17858d9567967c37ec3fa97211e14a1069e (diff) | |
| download | nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar.gz nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar.bz2 nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar.lz nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar.xz nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.tar.zst nixlib-36506df7fe1e087fd0af99f8eb6ee71759fffa81.zip | |
Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
Diffstat (limited to 'pkgs/applications/virtualization')
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index 0aacbeed0550..3cfe8dc527c9 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt propagatedBuildInputs = with pythonPackages; [ - pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate + pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 956f3b28152d..61a366f7ab08 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt propagatedBuildInputs = with pythonPackages; [ pbr webob eventlet greenlet PasteDeploy paste routes cryptography six - sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached + sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack xmlsec MySQL_python diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index 0520fcfc027e..3371eb428e62 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt propagatedBuildInputs = with pythonPackages; [ pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 - jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six + jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six stevedore pecan ryu networking-hyperv MySQL_python # clients diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 20e250bf05cc..618eb7666923 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt propagatedBuildInputs = with pythonPackages; [ - pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography + pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 62b5bea47fa3..c9a62ce5f92b 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes + [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that |