philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fiddle with priorities to provide a smoother upgrade path.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24726
This commit is contained in:
Ludovic Courtès 2010-11-17 10:43:04 +00:00
parent d3c50a23f4
commit 44c11bdf47
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View file

@ -822,7 +822,9 @@ let
lrzip = callPackage ../tools/compression/lrzip { };
lsh = callPackage ../tools/networking/lsh { };
# lsh installs `bin/nettle-lfib-stream' and so does Nettle. Give the
# former a lower priority than Nettle.
lsh = lowPrio (callPackage ../tools/networking/lsh { });
lxc = callPackage ../tools/system/lxc { };
@ -5602,10 +5604,13 @@ let
espeak = callPackage ../applications/audio/espeak { };
evince = callPackage ../applications/misc/evince {
# FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide
# `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a
# higher priority.
evince = hiPrio (callPackage ../applications/misc/evince {
inherit (gnome) gnomedocutils gnomeicontheme libgnome
libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
};
});
evolution_data_server = (newScope (gnome // gtkLibs))
../servers/evolution-data-server {