Author: eelco
Date: Thu Jul 21 11:56:11 2011
New Revision: 27869
URL: https://svn.nixos.org/websvn/nix/?rev=27869&sc=1
Log:
* Hack to fix evaluation.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
11:53:49 2011 (r27868)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
11:56:11 2011 (r27869)
@@ -48,7 +48,7 @@
kdelibs = callPackage ./libs { };
- kdepimlibs = callPackage ./pimlibs { };
+ #kdepimlibs = callPackage ./pimlibs { };
### BASE
@@ -79,6 +79,7 @@
kde_wallpapers = callPackage ./wallpapers.nix { };
+ /*
kdeaccessibility = combinePkgs "kdeaccessibility" {
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
iconThemes = callPackage ./accessibility/icon-themes.nix { };
@@ -165,9 +166,11 @@
kdepim_runtime = callPackage ./pim-runtime { };
kdepim = callPackage ./pim { };
+ */
### DEVELOPMENT
+ /*
kdebindings = callPackage ./bindings { };
l10n = callPackage ./l10n { inherit release; };
@@ -175,5 +178,6 @@
# Make the split packages visible to `nix-env -q'.
misc = recurseIntoAttrs
(kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs
// kdeutils.pkgs // kdewebdev.pkgs);
+ */
}
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
11:53:49 2011 (r27868)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
11:56:11 2011 (r27869)
@@ -3001,6 +3001,8 @@
clucene_core = callPackage ../development/libraries/clucene-core { };
+ cluceneCore = clucene_core; # !!! remove this
+
clutter = callPackage ../development/libraries/clutter {
inherit (gnome) glib pango gtk;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
