about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2010-04-16 15:56:25 +0000
committerMarc Weber <marco-oweber@gmx.de>2010-04-16 15:56:25 +0000
commit3874ba79bdd4a2d39786835725e76488642c82e0 (patch)
tree4f403f57b985add3b7544e28de5a97d7eaf5fdba
parentecaa92decb88b3a8f6aa5ac3ccb9233f94112962 (diff)
downloadnixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar.gz
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar.bz2
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar.lz
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar.xz
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.tar.zst
nixlib-3874ba79bdd4a2d39786835725e76488642c82e0.zip
make pythonPackages default to pyhton26Packages because python26 is default now
This makes python packages passed to inkscape have same version again

svn path=/nixpkgs/trunk/; revision=21130
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 708009a51f19..d5135e8082c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5291,7 +5291,9 @@ let
       setuptools = setuptools_python26;
     };
 
-  pythonPackages = recurseIntoAttrs (import ./python-packages.nix {
+  pythonPackages = python26Packages;
+
+  python25Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs python buildPythonPackage;
   });