Author: eelco
Date: Sat Sep 10 13:25:18 2011
New Revision: 29154
URL: https://ssl.nixos.org/websvn/nix/?rev=29154&sc=1
Log:
* Disable all packages using builderDefs or composableDerivation.
They give evaluation errors when the tracing stdenv adapter is
applied.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
---
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
Sat Sep 10 13:02:24 2011 (r29153)
+++
nixpkgs/branches/syscall-tracing/pkgs/build-support/builder-defs/builder-defs.nix
Sat Sep 10 13:25:18 2011 (r29154)
@@ -1,4 +1,5 @@
args: with args; with stringsWithDeps; with lib;
+assert false;
let inherit (builtins) head tail trace; in
(rec
{
Modified: nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix
==============================================================================
--- nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix Sat Sep
10 13:02:24 2011 (r29153)
+++ nixpkgs/branches/syscall-tracing/pkgs/lib/composable-derivation.nix Sat Sep
10 13:25:18 2011 (r29154)
@@ -20,7 +20,7 @@
# consider adding addtional elements by derivation.merge { removeAttrs
= ["elem"]; };
removeAttrs ? ["cfg" "flags"]
- }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a)
+ }: assert false; (lib.defaultOverridableDelayableArgs ( a: mkDerivation
a)
{
inherit applyPreTidy removeAttrs;
}).merge;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
