JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openstack: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-19 11:14:40 +02:00
parent 16dd61d6c9
commit bd12c10993
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/virtualization/openstack/glance.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, python2Packages, sqlite, which, strace }:
{ stdenv, fetchurl, pythonPackages, sqlite, which, strace }: python2Packages.buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
name = "glance-${version}"; name = "glance-${version}";
version = "11.0.0"; version = "11.0.0";
namePrefix = ""; namePrefix = "";
@ -14,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
}; };
# https://github.com/openstack/glance/blob/stable/liberty/requirements.txt # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python2Packages; [
pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
@ -26,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
MySQL_python MySQL_python
]; ];
buildInputs = with pythonPackages; [ buildInputs = with python2Packages; [
Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
testresources testscenarios testtools psutil_1 oslotest psycopg2 testresources testscenarios testtools psutil_1 oslotest psycopg2
sqlite which strace sqlite which strace

8
pkgs/applications/virtualization/openstack/keystone.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }: { stdenv, fetchurl, python2Packages, xmlsec, which, openssl }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "keystone-${version}"; name = "keystone-${version}";
version = "8.0.0"; version = "8.0.0";
namePrefix = ""; namePrefix = "";
@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
patches = [ ./remove-oslo-policy-tests.patch ]; patches = [ ./remove-oslo-policy-tests.patch ];
# https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python2Packages; [
pbr webob eventlet greenlet PasteDeploy paste routes cryptography six pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
oslo-utils oslo-utils
]; ];
buildInputs = with pythonPackages; [ buildInputs = with python2Packages; [
coverage fixtures mock subunit tempest-lib testtools testrepository coverage fixtures mock subunit tempest-lib testtools testrepository
ldap ldappool webtest requests2 oslotest pep8 pymongo which ldap ldappool webtest requests2 oslotest pep8 pymongo which
]; ];

8
pkgs/applications/virtualization/openstack/neutron.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }: { stdenv, fetchurl, python2Packages, xmlsec, which, dnsmasq }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "neutron-${version}"; name = "neutron-${version}";
version = "7.0.0"; version = "7.0.0";
namePrefix = ""; namePrefix = "";
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
}; };
# https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python2Packages; [
pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
stevedore pecan ryu networking-hyperv MySQL_python stevedore pecan ryu networking-hyperv MySQL_python
@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
''; '';
patches = [ ./neutron-iproute-4.patch ]; patches = [ ./neutron-iproute-4.patch ];
buildInputs = with pythonPackages; [ buildInputs = with python2Packages; [
cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
testtools testresources testscenarios webtest oslotest os-testr tempest-lib testtools testresources testscenarios webtest oslotest os-testr tempest-lib
ddt pep8 ddt pep8

8
pkgs/applications/virtualization/openstack/nova.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pythonPackages, openssl, openssh }: { stdenv, fetchurl, python2Packages, openssl, openssh }:
pythonPackages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "nova-${version}"; name = "nova-${version}";
version = "12.0.0"; version = "12.0.0";
namePrefix = ""; namePrefix = "";
@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
''; '';
# https://github.com/openstack/nova/blob/stable/liberty/requirements.txt # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python2Packages; [
pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication rec {
cinderclient neutronclient glanceclient cinderclient neutronclient glanceclient
]; ];
buildInputs = with pythonPackages; [ buildInputs = with python2Packages; [
coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx
oslotest testrepository testresources testtools tempest-lib bandit oslotest testrepository testresources testtools tempest-lib bandit
oslo-vmware pep8 barbicanclient ironicclient openssl openssh oslo-vmware pep8 barbicanclient ironicclient openssl openssh