From dd1882d9917462a6b02724887ddd721a67c58601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 30 Oct 2015 19:48:41 +0100 Subject: [PATCH] nova, keystone, glance, neutron: use correct mysql lib --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index 9ef07a7cec0..51d58b896d1 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = with pythonPackages; [ Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 - testresources testscenarios testtools psutil_1 oslotest psycopg2 pymysql + testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python sqlite which strace ]; diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index ff7f4a1a67e..42a40f03598 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonPackage rec { pbr webob eventlet greenlet PasteDeploy paste routes cryptography six sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack - xmlsec pymysql + xmlsec MySQL_python # oslo oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index 79b921c6baa..bd0892299b3 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six - stevedore pecan ryu networking-hyperv pymysql + stevedore pecan ryu networking-hyperv MySQL_python # clients keystoneclient neutronclient novaclient diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 36a454358ac..da62f27541c 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec { 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 - keystonemiddleware pymysql + keystonemiddleware MySQL_python # oslo components oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context