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

* Mark some packages as lower priority so that they are not preferred

Browse Source 
over other variants (e.g., zlib should be preferred over zlibStatic).

svn path=/nixpkgs/trunk/; revision=8635
This commit is contained in:
Eelco Dolstra 2007-05-01 20:35:58 +00:00
parent cba3104ae8
commit e4aa6000e9
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,6 +159,12 @@ rec {
# !!! the suffix should really be appended *before* the version, at # !!! the suffix should really be appended *before* the version, at
# least most of the time. # least most of the time.
appendToName = suffix: updateName (name: "${name}-${suffix}"); appendToName = suffix: updateName (name: "${name}-${suffix}");
# Decrease the priority of the package, i.e., other
# versions/variants will be preferred.
lowPrio = drv: drv // {
meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
};
### STANDARD ENVIRONMENT ### STANDARD ENVIRONMENT
@ -321,9 +327,9 @@ rec {
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils;
}; };
findutilsWrapper = appendToName "wrapper" (import ../tools/misc/findutils-wrapper { findutilsWrapper = lowPrio (appendToName "wrapper" (import ../tools/misc/findutils-wrapper {
inherit stdenv findutils; inherit stdenv findutils;
}); }));
gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
(import ../tools/text/gawk { (import ../tools/text/gawk {
@ -587,11 +593,11 @@ rec {
### SHELLS ### SHELLS
bash = useFromStdenv (stdenv ? bash) stdenv.bash bash = lowPrio (useFromStdenv (stdenv ? bash) stdenv.bash
(import ../shells/bash { (import ../shells/bash {
inherit fetchurl stdenv; inherit fetchurl stdenv;
bison = bison23; bison = bison23;
}); }));
bashInteractive = appendToName "interactive" (import ../shells/bash-interactive { bashInteractive = appendToName "interactive" (import ../shells/bash-interactive {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
@ -692,10 +698,10 @@ rec {
ghc = ghcboot; ghc = ghcboot;
}; };
ghcboot = appendToName "boot" (import ../development/compilers/ghc/boot.nix { ghcboot = lowPrio (appendToName "boot" (import ../development/compilers/ghc/boot.nix {
inherit fetchurl stdenv perl ncurses; inherit fetchurl stdenv perl ncurses;
readline = readline4; readline = readline4;
}); }));
/* /*
ghcWrapper = assert uulib.ghc == ghc; ghcWrapper = assert uulib.ghc == ghc;
@ -1104,12 +1110,12 @@ rec {
javaSupport = false; javaSupport = false;
}; };
swigWithJava = appendToName "with-java" (import ../development/tools/misc/swig { swigWithJava = lowPrio (appendToName "with-java" (import ../development/tools/misc/swig {
inherit fetchurl stdenv jdk; inherit fetchurl stdenv jdk;
perlSupport = false; perlSupport = false;
pythonSupport = false; pythonSupport = false;
javaSupport = true; javaSupport = true;
}); }));
texinfo = import ../development/tools/misc/texinfo { texinfo = import ../development/tools/misc/texinfo {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
@ -1160,9 +1166,9 @@ rec {
inherit (gnome) glib; inherit (gnome) glib;
}; };
aterm = import ../development/libraries/aterm { aterm = lowPrio (import ../development/libraries/aterm {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; });
aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix { aterm242fixes = import ../development/libraries/aterm/2.4.2-fixes.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -1444,10 +1450,10 @@ rec {
inherit fetchurl stdenv libtool; inherit fetchurl stdenv libtool;
}; };
libjpegStatic = appendToName "static" (import ../development/libraries/libjpeg-static { libjpegStatic = lowPrio (appendToName "static" (import ../development/libraries/libjpeg-static {
inherit fetchurl stdenv libtool; inherit fetchurl stdenv libtool;
static = true; static = true;
}); }));
libmad = import ../development/libraries/libmad { libmad = import ../development/libraries/libmad {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -1519,10 +1525,10 @@ rec {
pythonSupport = false; pythonSupport = false;
}; };
libxml2Python = appendToName "with-python" (import ../development/libraries/libxml2 { libxml2Python = lowPrio (appendToName "with-python" (import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python; inherit fetchurl stdenv zlib python;
pythonSupport = true; pythonSupport = true;
}); }));
libxslt = import ../development/libraries/libxslt { libxslt = import ../development/libraries/libxslt {
inherit fetchurl stdenv libxml2; inherit fetchurl stdenv libxml2;
@ -1692,10 +1698,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
zlibStatic = appendToName "static" (import ../development/libraries/zlib { zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
inherit fetchurl stdenv; inherit fetchurl stdenv;
static = true; static = true;
}); }));
zvbi = import ../development/libraries/zvbi { zvbi = import ../development/libraries/zvbi {
inherit fetchurl stdenv libpng x11; inherit fetchurl stdenv libpng x11;
@ -2142,10 +2148,10 @@ rec {
inherit fetchurl stdenv gettext; inherit fetchurl stdenv gettext;
}; };
e2fsprogsDiet = appendToName "diet" (import ../os-specific/linux/e2fsprogs { e2fsprogsDiet = lowPrio (appendToName "diet" (import ../os-specific/linux/e2fsprogs {
inherit fetchurl gettext; inherit fetchurl gettext;
stdenv = useDietLibC stdenv; stdenv = useDietLibC stdenv;
}); }));
eject = import ../os-specific/linux/eject { eject = import ../os-specific/linux/eject {
inherit fetchurl stdenv gettext; inherit fetchurl stdenv gettext;
@ -2377,10 +2383,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
utillinuxStatic = appendToName "static" (import ../os-specific/linux/util-linux { utillinuxStatic = lowPrio (appendToName "static" (import ../os-specific/linux/util-linux {
inherit fetchurl; inherit fetchurl;
stdenv = makeStaticBinaries stdenv; stdenv = makeStaticBinaries stdenv;
}); }));
wirelesstools = import ../os-specific/linux/wireless-tools { wirelesstools = import ../os-specific/linux/wireless-tools {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -2554,7 +2560,7 @@ rec {
eclipsesdk = eclipse []; eclipsesdk = eclipse [];
eclipseSpoofax = appendToName "with-spoofax" (eclipse [spoofax]); eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax]));
emacs = import ../applications/editors/emacs { emacs = import ../applications/editors/emacs {
inherit fetchurl stdenv ncurses x11 Xaw3d; inherit fetchurl stdenv ncurses x11 Xaw3d;
@ -2589,13 +2595,13 @@ rec {
inherit fetchurl stdenv x11 imlib2 libjpeg libpng; inherit fetchurl stdenv x11 imlib2 libjpeg libpng;
}; };
firefox = import ../applications/networking/browsers/firefox { firefox = lowPrio (import ../applications/networking/browsers/firefox {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (xlibs) libXi; inherit (xlibs) libXi;
#enableOfficialBranding = true; #enableOfficialBranding = true;
}; });
firefoxWrapper = wrapFirefox firefox; firefoxWrapper = wrapFirefox firefox;
@ -2740,11 +2746,11 @@ rec {
inherit fetchurl stdenv ncurses gettext; inherit fetchurl stdenv ncurses gettext;
}; };
nanoDiet = appendToName "diet" (import ../applications/editors/nano { nanoDiet = lowPrio (appendToName "diet" (import ../applications/editors/nano {
inherit fetchurl gettext; inherit fetchurl gettext;
ncurses = ncursesDiet; ncurses = ncursesDiet;
stdenv = useDietLibC stdenv; stdenv = useDietLibC stdenv;
}); }));
nedit = import ../applications/editors/nedit { nedit = import ../applications/editors/nedit {
inherit fetchurl stdenv x11; inherit fetchurl stdenv x11;
@ -2864,11 +2870,11 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
vimDiet = appendToName "diet" (import ../applications/editors/vim-diet { vimDiet = lowPrio (appendToName "diet" (import ../applications/editors/vim-diet {
inherit fetchurl; inherit fetchurl;
ncurses = ncursesDiet; ncurses = ncursesDiet;
stdenv = useDietLibC stdenv; stdenv = useDietLibC stdenv;
}); }));
vlc = import ../applications/video/vlc { vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl x11 wxGTK inherit fetchurl stdenv perl x11 wxGTK