From 8e898fff8fe1a7a1083ec705a4b5c544c066143e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 6 May 2008 07:03:41 +0000
Subject: [PATCH] all-packages.nix changes for previous commits

svn path=/nixpkgs/trunk/; revision=11758
---
 pkgs/top-level/all-packages.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e63177cde9..6f07d8b0a48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -514,7 +514,7 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  curl = if stdenv ? curl then stdenv.curl else (assert false; null);
+  curl = if stdenv ? curl then (lowPrio (stdenv.curl)) else (assert false; null);
 
   curlftpfs = import ../tools/networking/curlftpfs {
     inherit fetchurl stdenv fuse curl pkgconfig zlib;
@@ -1517,6 +1517,11 @@ let pkgs = rec {
     inherit fetchurl stdenv ghc;
   };
 
+  ikarusFun = builderDefsPackage (selectVersion ../development/compilers/ikarus "0.0.3") {
+    inherit gmp;
+  };
+  ikarus = ikarusFun null;
+
   javafront = import ../development/compilers/java-front {
     inherit stdenv fetchurl pkgconfig;
     sdf = sdf24;
@@ -1799,9 +1804,10 @@ let pkgs = rec {
   inherit fetchurl stdenv zlib bzip2;
   };
 
-  python25 = import ../development/interpreters/python/2.5 {
+  python25Fun = lib.sumArgs (import ../development/interpreters/python/2.5) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
   };
+  python25 = python25Fun null;
 
   pyrex = pyrex095;
 
@@ -6351,10 +6357,10 @@ let pkgs = rec {
     db4 = db45;
   };
 
-  nixCustomFun = src: preConfigure: configureFlags:
+  nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake 
-        autoconf libtool configureFlags;
+        autoconf libtool configureFlags enableScripts lib;
       bison = bison23;
       flex = flex2533;
       aterm = aterm242fixes;