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

* Disable uulib for now.

Browse Source 
svn path=/nixpkgs/trunk/; revision=7795
This commit is contained in:
Eelco Dolstra 2007-01-24 21:08:54 +00:00
parent f752af2637
commit 891c62b0a8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -723,11 +723,13 @@ rec {
readline = readline4; readline = readline4;
}; };
/*
ghcWrapper = assert uulib.ghc == ghc; ghcWrapper = assert uulib.ghc == ghc;
import ../development/compilers/ghc-wrapper { import ../development/compilers/ghc-wrapper {
inherit stdenv ghc; inherit stdenv ghc;
libraries = []; libraries = [];
}; };
*/
helium = import ../development/compilers/helium { helium = import ../development/compilers/helium {
inherit fetchurl stdenv ghc; inherit fetchurl stdenv ghc;
@ -1820,11 +1822,11 @@ rec {
### DEVELOPMENT / LIBRARIES / HASKELL ### DEVELOPMENT / LIBRARIES / HASKELL
uulib = import ../development/libraries/haskell/uulib { uulib64 = import ../development/libraries/haskell/uulib { # !!! remove?
inherit stdenv fetchurl ghc; inherit stdenv fetchurl ghc;
}; };
uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { # !!! ugh
inherit stdenv fetchurl autoconf; inherit stdenv fetchurl autoconf;
ghc = ghc66; ghc = ghc66;
}; };

4
pkgs/top-level/build-for-release.nix
View File

@ -49,7 +49,7 @@ let {
gawk gawk
gcc gcc
gcc34 gcc34
ghcWrapper ghc
ghostscript ghostscript
gnugrep gnugrep
gnum4 gnum4
@ -137,7 +137,7 @@ let {
unzip unzip
upstart upstart
utillinux utillinux
uulib # uulib
valgrind valgrind
vim vim
vlc vlc