summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-10-30 19:48:41 +0100
committerDomen Kožar <domen@dev.si>2015-10-30 19:48:57 +0100
commitdd1882d9917462a6b02724887ddd721a67c58601 (patch)
tree7429d72101882a37481ef257f6eeac2f11971c23
parent9b4ba3c5daf2c72597e978f6c1207d22851f4120 (diff)
downloadnixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar.gz
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar.bz2
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar.lz
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar.xz
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.tar.zst
nixpkgs-dd1882d9917462a6b02724887ddd721a67c58601.zip
nova, keystone, glance, neutron: use correct mysql lib
-rw-r--r--pkgs/applications/virtualization/openstack/glance.nix2
-rw-r--r--pkgs/applications/virtualization/openstack/keystone.nix2
-rw-r--r--pkgs/applications/virtualization/openstack/neutron.nix2
-rw-r--r--pkgs/applications/virtualization/openstack/nova.nix2
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