Author: ludo
Date: Wed Nov 17 10:43:04 2010
New Revision: 24726
URL: https://svn.nixos.org/websvn/nix/?rev=24726&sc=1
Log:
Fiddle with priorities to provide a smoother upgrade path.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
17 10:43:00 2010 (r24725)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Nov
17 10:43:04 2010 (r24726)
@@ -822,7 +822,9 @@
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 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
