Author: ludo
Date: Sun Nov 20 20:42:05 2011
New Revision: 30494
URL: https://nixos.org/websvn/nix/?rev=30494&sc=1
Log:
stdenv adapters: Use `toString' instead of `exprToString'.
Modified:
nixpkgs/trunk/pkgs/stdenv/adapters.nix
Modified: nixpkgs/trunk/pkgs/stdenv/adapters.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 19:25:13 2011
(r30493)
+++ nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:42:05 2011
(r30494)
@@ -302,7 +302,7 @@
else
null;
in
- builtins.trace "@:drv:${toString drvPath}:${builtins.exprToString
license}:@"
+ builtins.trace "@:drv:${toString drvPath}:${builtins.toString
license}:@"
val;
in pkg // {
outPath = printDrvPath pkg.outPath;
@@ -338,12 +338,10 @@
validate = arg:
if licensePred license then arg
- else abort "
- Error while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
- The license predicate is not verified.
-
- bad license: ${builtins.exprToString license}
- ";
+ else abort ''
+ while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
+ license `${builtins.toString license}' does not pass the
predicate.
+ '';
in pkg // {
outPath = validate pkg.outPath;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
