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

all-packages.nix changes for previous commits

Browse Source 
svn path=/nixpkgs/trunk/; revision=11758
This commit is contained in:
Michael Raskin 2008-05-06 07:03:41 +00:00
parent 9b2cc890eb
commit 8e898fff8f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/all-packages.nix
View File

@ -514,7 +514,7 @@ let pkgs = rec {
inherit fetchurl stdenv; 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 { curlftpfs = import ../tools/networking/curlftpfs {
inherit fetchurl stdenv fuse curl pkgconfig zlib; inherit fetchurl stdenv fuse curl pkgconfig zlib;
@ -1517,6 +1517,11 @@ let pkgs = rec {
inherit fetchurl stdenv ghc; inherit fetchurl stdenv ghc;
}; };
ikarusFun = builderDefsPackage (selectVersion ../development/compilers/ikarus "0.0.3") {
inherit gmp;
};
ikarus = ikarusFun null;
javafront = import ../development/compilers/java-front { javafront = import ../development/compilers/java-front {
inherit stdenv fetchurl pkgconfig; inherit stdenv fetchurl pkgconfig;
sdf = sdf24; sdf = sdf24;
@ -1799,9 +1804,10 @@ let pkgs = rec {
inherit fetchurl stdenv zlib bzip2; 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; inherit fetchurl stdenv zlib bzip2 gdbm;
}; };
python25 = python25Fun null;
pyrex = pyrex095; pyrex = pyrex095;
@ -6351,10 +6357,10 @@ let pkgs = rec {
db4 = db45; db4 = db45;
}; };
nixCustomFun = src: preConfigure: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags; autoconf libtool configureFlags enableScripts lib;
bison = bison23; bison = bison23;
flex = flex2533; flex = flex2533;
aterm = aterm242fixes; aterm = aterm242fixes;