summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-19 12:37:10 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-19 12:37:10 +0000
commit1ac9dcd24d3c41954068f2bd2e415552cb0de7c1 (patch)
tree38b40f69c45128c27af8c5e21f0b1d132f9307b3 /pkgs/top-level
parent12bfda97b8a7387c28e30b4d458a849c4bcff58a (diff)
downloadnixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar.gz
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar.bz2
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar.lz
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar.xz
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.tar.zst
nixpkgs-1ac9dcd24d3c41954068f2bd2e415552cb0de7c1.zip
* Fix eval-release.nix by testing whether all attributes of a
  derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8026345e5d6..5556a128bf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1303,7 +1303,8 @@ let
     inherit stdenv fetchgit autoconf automake libusb confuse;
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
-    gccCross = let
+    gccCross =
+      let
         pkgsCross = (import ./all-packages.nix) {
           inherit system;
           inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
@@ -4879,7 +4880,8 @@ let
   windows = rec {
     w32api = callPackage ../os-specific/windows/w32api {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;    };
+      binutilsCross = binutilsCross;
+    };
 
     w32api_headers = w32api.override {
       onlyHeaders = true;
@@ -5919,7 +5921,6 @@ let
 
   partitionManager = callPackage ../tools/misc/partition-manager {
     kde = kde44;
-    qt = qt4;
   };
 
   pdftk = callPackage ../tools/typesetting/pdftk { };