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

Corrected a flaw that made automated package silently accept any extra arguments

Browse Source 
svn path=/nixpkgs/trunk/; revision=9101
This commit is contained in:
Michael Raskin 2007-08-11 11:14:36 +00:00
parent efbabdb598
commit 118e9d6ebf
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/editors/vim/default.nix
View File

@ -2,7 +2,6 @@ args:
let let
defList = []; defList = [];
#stdenv and fetchurl are added automatically #stdenv and fetchurl are added automatically
notForBuildInputs = [];
getVal = (args.lib.getValue args defList); getVal = (args.lib.getValue args defList);
check = args.lib.checkFlag args; check = args.lib.checkFlag args;
reqsList = [ reqsList = [
@ -11,14 +10,13 @@ let
["x11Support" "libX11"] ["x11Support" "libX11"]
["hugeFeatures"] ["hugeFeatures"]
["true" "ncurses"] ["true" "ncurses"]
["false" "libSM"]
]; ];
buildInputsNames = args.lib.filter (x: (null!=getVal x)&& buildInputsNames = args.lib.filter (x: (null!=getVal x))
(! args.lib.isInList (notForBuildInputs ++ (args.lib.uniqList {inputList =
["stdenv" "fetchurl" "lib"] ++ (args.lib.concatLists (map
(map builtins.head reqsList)) x)) (x:(if (x==[]) then [] else builtins.tail x))
/*["libX11" "glib" "gtk" "pkgconfig" "libXpm" "libXext" reqsList));});
"libXau" "libXt" "libXaw" "ncurses"];*/
(builtins.attrNames args);
in in
assert args.lib.checkReqs args defList reqsList; assert args.lib.checkReqs args defList reqsList;
args.stdenv.mkDerivation { args.stdenv.mkDerivation {
@ -36,10 +34,8 @@ args.stdenv.mkDerivation {
inherit (args) ncurses; inherit (args) ncurses;
debug = builtins.attrNames args; buildInputs = args.lib.filter (x: (x!=null)) (map getVal buildInputsNames);
buildInputs = args.lib.filter (x: x!=null) (map getVal buildInputsNames);
preConfigure = "echo \$debug";
postInstall = "ln -s $out/bin/vim $out/bin/vi"; postInstall = "ln -s $out/bin/vim $out/bin/vi";
preBuild="touch src/auto/link.sed"; preBuild="touch src/auto/link.sed";
configureFlags=" --enable-gui=auto --disable-xim "+ configureFlags=" --enable-gui=auto --disable-xim "+

10
pkgs/lib/default.nix
View File

@ -127,6 +127,7 @@ rec {
# Return true only if there is an attribute and it is true. # Return true only if there is an attribute and it is true.
checkFlag = attrSet: name: checkFlag = attrSet: name:
if (name == "true") then true else if (name == "true") then true else
if (name == "false") then false else
getAttr [name] false attrSet ; getAttr [name] false attrSet ;
logicalOR = x: y: x || y; logicalOR = x: y: x || y;
@ -160,4 +161,13 @@ rec {
if (list == []) then false else if (list == []) then false else
if (x == (head list)) then true else if (x == (head list)) then true else
isInList (tail list) x; isInList (tail list) x;
uniqList = {inputList, outputList ? []}:
if (inputList == []) then outputList else
let x=head inputList;
newOutputList = outputList ++
(if (isInList outputList x) then [] else [x]);
in uniqList {outputList=newOutputList;
inputList = (tail inputList);};
} }

17
pkgs/top-level/template.nix
View File

@ -4,21 +4,18 @@ let
(assert false) - correct it; List element is of form ["name" default] (assert false) - correct it; List element is of form ["name" default]
]; ];
#stdenv and fetchurl are added automatically #stdenv and fetchurl are added automatically
notForBuildInputs = [
(assert false) - correct it; List of names of non-buildInput arguments
];
getVal = (args.lib.getValue args defList); getVal = (args.lib.getValue args defList);
check = args.lib.checkFlag args; check = args.lib.checkFlag args;
reqsList = [ reqsList = [
(assert false) - correct it; List element is of form ["name" "requirement-name" ... ] (assert false) - correct it; List element is of form ["name" "requirement-name" ... ]
["true"]
["false"]
]; ];
buildInputsNames = args.lib.filter (x: (null!=getVal x)&& buildInputsNames = args.lib.filter (x: (null!=getVal x))
(! args.lib.isInList (notForBuildInputs ++ (args.lib.uniqList {inputList =
["stdenv" "fetchurl" "lib"] ++ (args.lib.concatLists (map
(map builtins.head reqsList)) x)) (x:(if (x==[]) then [] else builtins.tail x))
/*["libX11" "glib" "gtk" "pkgconfig" "libXpm" "libXext" reqsList));});
"libXau" "libXt" "libXaw" "ncurses"];*/
(builtins.attrNames args);
in in
assert args.lib.checkReqs args defList reqsList; assert args.lib.checkReqs args defList reqsList;
with args; with args;