plone: some versions got pinned wrong

2 files changed, 145 insertions, 99 deletions

diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/4.3.0.nix
index 6837c653c0a3..6dd85a179942 100644
--- a/pkgs/development/web/plone/default.nix
+++ b/pkgs/development/web/plone/4.3.0.nix
@@ -1,7 +1,7 @@
 # DO NOT EDIT THIS FILE!
 #
 # Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/43.json -p plone/43.txt -o plone/43.nix
+#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.0.json -p plone/4.3.0.txt -o plone/4.3.0.nix
 
 { pkgs, pythonPackages }:
 
@@ -101,29 +101,6 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
-  plone_formwidget_querystring = buildPythonPackage rec {
-    name = "plone.formwidget.querystring-1.0b3";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.querystring/plone.formwidget.querystring-1.0b3.zip";
-      md5 = "1a7edd8fe94f7066d89eae5045ea786c";
-    };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ setuptools plone_app_querystring ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
   zopeundo = buildPythonPackage rec {
     name = "ZopeUndo-2.12.0";
     src = fetchurl {
@@ -539,13 +516,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.3.0-beta";
+    name = "Products.CMFUid-2.2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.3.0-beta.tar.gz";
-      md5 = "283ffbe0b854c4b8d0b5bebf9878c182";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
+      md5 = "e20727959351dffbf0bac80613eee110";
     };
     buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup zope2 setuptools products_cmfcore eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -654,13 +631,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.3.0-beta2";
+    name = "Products.CMFDefault-2.2.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.3.0-beta2.tar.gz";
-      md5 = "c3ad19ba5ed0bed541bbcdccab79e490";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
+      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
     };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_genericsetup products_mailhost zope2 zope_formlib setuptools products_cmfcore products_pythonscripts ];
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -699,14 +676,14 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-3.0.1";
+  zope_error = buildPythonPackage rec {
+    name = "zope.error-3.7.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.1.zip";
-      md5 = "08138cb6e3f15a2a9d43990f55fdae5f";
+      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
+      md5 = "281445a906458ff5f18f56923699a127";
     };
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -815,13 +792,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.3.0-beta2";
+    name = "Products.CMFCore-2.2.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.3.0-beta2.tar.gz";
-      md5 = "f9225edc755416cf16044a9b50208f62";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
+      md5 = "9320a4023b8575097feacfd4a400e930";
     };
     buildInputs = [  ];
-    propagatedBuildInputs = [ five_globalrequest products_genericsetup products_btreefolder2 products_mailhost zope2 products_zsqlmethods products_pythonscripts setuptools five_localsitemanager ];
+    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -884,13 +861,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.3.0-beta";
+    name = "Products.CMFCalendar-2.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.3.0-beta.tar.gz";
-      md5 = "39f29ee1406900d740878bc84d98d5a5";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
+      md5 = "49458e68dc3b6826ea9a3576ac014419";
     };
     buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup products_cmfdefault zope2 setuptools products_cmfcore eggtestinfo ];
+    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -1504,6 +1481,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  zope_authentication = buildPythonPackage rec {
+    name = "zope.authentication-3.7.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
+      md5 = "7d6bb340610518f2fc71213cfeccda68";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   zope_i18n = buildPythonPackage rec {
     name = "zope.i18n-3.7.4";
     src = fetchurl {
@@ -2424,6 +2424,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  five_globalrequest = buildPythonPackage rec {
+    name = "five.globalrequest-1.0";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
+      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   plone_rfc822 = buildPythonPackage rec {
     name = "plone.rfc822-1.0.1";
     src = fetchurl {
@@ -2563,10 +2586,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   zope_schema = buildPythonPackage rec {
-    name = "zope.schema-3.7.1";
+    name = "zope.schema-4.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-3.7.1.tar.gz";
-      md5 = "ca6e6a3555562bbc96d69e7447b47248";
+      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+      md5 = "e7e581af8193551831560a736a53cf58";
     };
     buildInputs = [  ];
     propagatedBuildInputs = [ zope_interface zope_event setuptools ];
@@ -3758,6 +3781,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  plone_app_contentrules = buildPythonPackage rec {
+    name = "plone.app.contentrules-3.0.1";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.1.zip";
+      md5 = "08138cb6e3f15a2a9d43990f55fdae5f";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   record = buildPythonPackage rec {
     name = "Record-2.13.0";
     src = fetchurl {
@@ -3966,12 +4012,12 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_jquery = buildPythonPackage rec {
-    name = "plone.app.jquery-1.9.1";
+    name = "plone.app.jquery-1.7.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.9.1.zip";
-      md5 = "2e4c3be5b6f616e9124271acc669bbd3";
+      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
+      md5 = "e204cf45456d26217263531832b5bdac";
     };
-    buildInputs = [ pkgs.unzip ];
+    buildInputs = [  ];
     propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ];
     doCheck = false;
     installCommand = ''
@@ -4173,7 +4219,7 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.3.3-1.3.3";
+    name = "Products.TinyMCE-1.3.3";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.3.zip";
       md5 = "3a88b1d1cbd34b860fbe6b3de979e2ea";
@@ -4242,13 +4288,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.3.0-beta";
+    name = "Products.DCWorkflow-2.2.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.3.0-beta.tar.gz";
-      md5 = "99f59a9f80b2297ef6614e112029f124";
+      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
+      md5 = "c90a16c4f3611015592ba8173a5f1863";
     };
     buildInputs = [ eggtestinfo ];
-    propagatedBuildInputs = [ products_genericsetup zope2 setuptools products_cmfcore products_pythonscripts products_externalmethod eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4379,14 +4425,14 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
-  lxml = buildPythonPackage rec {
-    name = "lxml-2.3.6";
+  zope_app_publication = buildPythonPackage rec {
+    name = "zope.app.publication-3.12.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
-      md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
+      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
+      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
     };
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4425,14 +4471,14 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
+  six = buildPythonPackage rec {
+    name = "six-1.2.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
+      url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
+      md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
     };
     buildInputs = [  ];
-    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4455,7 +4501,7 @@ let plone43Packages = pythonPackages.python.modules // rec {
       md5 = "3187fc0a9082847d773eeec9bce6d217";
     };
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
+    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4494,29 +4540,6 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
-  six = buildPythonPackage rec {
-    name = "six-1.2.0";
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
-      md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
-    };
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    doCheck = false;
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-    
-    meta = {
-      description = "UNKNOWN";
-      homepage = "UNKNOWN";
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-    };
-  };
-
   plone_app_layout = buildPythonPackage rec {
     name = "plone.app.layout-2.3.4";
     src = fetchurl {
@@ -4909,13 +4932,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-2.0b5";
+    name = "plone.app.collection-1.0.9";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-2.0b5.zip";
-      md5 = "457be082b173168388a0ed0b4966669f";
+      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.9.zip";
+      md5 = "bde68dc585ca0a4715ab55d4b4afcf9a";
     };
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_formwidget_querystring plone_app_contentmenu plone_app_dexterity setuptools ];
+    propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4954,6 +4977,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  lxml = buildPythonPackage rec {
+    name = "lxml-2.3.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
+      md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
+    };
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   plone_contentrules = buildPythonPackage rec {
     name = "plone.contentrules-2.0.2";
     src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e772fdc865cf..14c7b35e62e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5330,7 +5330,7 @@ let
     python = python27;
   });
 
-  plone43Packages = recurseIntoAttrs (import ../development/web/plone {
+  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix {
     inherit pkgs;
     pythonPackages = python27Packages;
   });