public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move "checker" to lib. It seems to be unused though.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22819
This commit is contained in:
Eelco Dolstra 2010-07-30 09:24:55 +00:00
parent b044e64989
commit acd34843f0
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/lib/misc.nix
View File

@ -392,4 +392,16 @@ rec {
(eqListStrict (attrNames a) (attrNames b)) (eqListStrict (attrNames a) (attrNames b))
&& (eqListStrict (lib.attrValues a) (lib.attrValues b)) && (eqListStrict (lib.attrValues a) (lib.attrValues b))
else a == b; # FIXME ! else a == b; # FIXME !
# Check absence of non-used options
# Obsolete?
checker = x: flag: opts: config:
(if flag then let result=(
(import ../build-support/checker)
opts config); in
(if (result=="") then x else
abort ("Unknown option specified: " + result))
else x);
} }

9
pkgs/top-level/all-packages.nix
View File

@ -149,15 +149,6 @@ let
# Return the first available value in the order: pkg.val, val, or default. # Return the first available value in the order: pkg.val, val, or default.
getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default)); getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default));
# Check absence of non-used options
checker = x: flag: opts: config:
(if flag then let result=(
(import ../build-support/checker)
opts config); in
(if (result=="") then x else
abort ("Unknown option specified: " + result))
else x);
builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
inherit stringsWithDeps lib stdenv writeScript inherit stringsWithDeps lib stdenv writeScript
fetchurl fetchmtn fetchgit; fetchurl fetchmtn fetchgit;