Author: ludo
Date: Sun Nov 20 20:53:15 2011
New Revision: 30496
URL: https://nixos.org/websvn/nix/?rev=30496&sc=1
Log:
validateLicenses: Warn about derivations lacking licensing information.
Modified:
nixpkgs/trunk/pkgs/stdenv/adapters.nix
Modified: nixpkgs/trunk/pkgs/stdenv/adapters.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:42:24 2011
(r30495)
+++ nixpkgs/trunk/pkgs/stdenv/adapters.nix Sun Nov 20 20:53:15 2011
(r30496)
@@ -330,16 +330,22 @@
{ mkDerivation = args:
let
pkg = stdenv.mkDerivation args;
+ drv = builtins.unsafeDiscardStringContext pkg.drvPath;
license =
if pkg ? meta && pkg.meta ? license then
pkg.meta.license
+ else if pkg ? outputHash then
+ # Fixed-output derivations such as source tarballs usually
+ # don't have licensing information, but that's OK.
+ null
else
- null;
+ builtins.trace
+ "warning: ${drv} lacks licensing information" null;
validate = arg:
if licensePred license then arg
else abort ''
- while building ${builtins.unsafeDiscardStringContext
pkg.drvPath}:
+ while building ${drv}:
license `${builtins.toString license}' does not pass the
predicate.
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
