From 0467a17858d9567967c37ec3fa97211e14a1069e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 25 Feb 2016 15:02:38 +0100 Subject: pythonPackages.sqlalchemy: follows upstream, sqlalchemy7 for lecagy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes pythonPackages.sqlalchemy the most up to date revision (it was called sqlalchemy_1_0 before), and maintains the various “legacy” versions available as pythonPackages.sqlalchemyX for X in {7,8,9}. All derivations that required `sqlalchemy_1_0` now require `sqlalchemy` while those that required `sqlalchemy` now require `sqlalchemy7`. The derivations are not changed, only the attribute names they are bound to. --- pkgs/applications/virtualization/openstack/glance.nix | 2 +- pkgs/applications/virtualization/openstack/keystone.nix | 2 +- pkgs/applications/virtualization/openstack/neutron.nix | 2 +- pkgs/applications/virtualization/openstack/nova.nix | 2 +- pkgs/applications/virtualization/virtinst/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/virtualization') 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 -- cgit 1.4.1