From 3b8b92515358a68d522a1e98f004b8b66f60a739 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 5 Oct 2007 07:26:23 +0000 Subject: [PATCH] Commented someadditions out and corrected spelling - mkDerivationByConfiguration ruins all-packages.nix svn path=/nixpkgs/trunk/; revision=9408 --- pkgs/lib/default-unstable.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/lib/default-unstable.nix b/pkgs/lib/default-unstable.nix index 52af2005909..b718383e544 100644 --- a/pkgs/lib/default-unstable.nix +++ b/pkgs/lib/default-unstable.nix @@ -209,10 +209,10 @@ rec { # calls chooseOptionsByFlags2 with some preprocessing # chooseOptionsByFlags2 returns an attribute set meant to be used to create new derivaitons. - # see mkDerivationByConfigruation in all-packages.nix and the examples given below. + # see mkDerivationByConfiguration in all-packages.nix and the examples given below. # You can just copy paste them into all-packages.nix to test them.. - chooseOptionsByFlags = { flagConfig, args, optionals ? [], defaults ? [], + /*chooseOptionsByFlags = { flagConfig, args, optionals ? [], defaults ? [], collectExtraPhaseActions ? [] } : let passedOptionals = filter ( x : __hasAttr x args ) optionals; # these are in optionals and in args # we simply merge in = { buildInputs = ; pass = ; } @@ -223,7 +223,7 @@ rec { passedOptionals ) ); in chooseOptionsByFlags2 flagConfigWithOptionals collectExtraPhaseActions args - ( (getAttr ["flags"] defaults args) ++ passedOptionals); + ( (getAttr ["flags"] defaults args) ++ passedOptionals);*/ chooseOptionsByFlags2 = flagConfig : collectExtraPhaseActions : args : flags : let @@ -323,7 +323,7 @@ rec { # * extra phase dependend commands can be added # Its easy to add your own stuff using co.collectAttrs or co.optsConcatStrs # ( perhaps this name will change?) - simpleFlagYesNoF = namePrefix : extraFlagAttrs : mkDerivationByConfigruation ( { +/* simpleFlagYesNoF = namePrefix : extraFlagAttrs : mkDerivationByConfiguration ( { flagConfig = { flag = { name = namePrefix + "simpleYes"; cfgOption = [ "--Yes" "--you-dont-need-a-list" ]; @@ -380,7 +380,7 @@ rec { "; configurePhase = co.extraConfigureCmd; }; - } // extraFlagAttrs ); + } // extraFlagAttrs ); */ simpleYes = simpleFlagYesNoF "" {} { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9402d23cc7..050e429946c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -189,8 +189,8 @@ rec { }; # commented out because it's using the new configuration style proposal which is unstable - /* - mkDerivationByConfigruation = { flagConfig ? {}, optionals ? [], defaults ? [], + + /*mkDerivationByConfiguration = ({ flagConfig ? {}, optionals ? [], defaults ? [], extraAttrs, collectExtraPhaseActions ? []} : args: with args.lib; with args; if ( __isAttrs extraAttrs ) then builtins.throw "the argument extraAttrs needs to be a function beeing passed co, but attribute set passed " @@ -199,8 +199,8 @@ rec { args.stdenv.mkDerivation ( { inherit (co) configureFlags buildInputs /*flags* /; - } // extraAttrs co // co.pass // co.flags_prefixed ); - */ + } // extraAttrs co // co.pass // co.flags_prefixed ));*/ + # Check absence of non-used options checker = x: flag: opts: config: @@ -4141,12 +4141,12 @@ rec { #inherit (xlibs) libX11; #}; - # using the new configuration style proposal which is unstable + /*# using the new configuration style proposal which is unstable jackaudio = import ../misc/jackaudio { - inherit mkDerivationByConfigruation + inherit mkDerivationByConfiguration ncurses lib stdenv fetchurl; flags = [ "posix_shm" "timestamps"]; - }; + };*/ keynav = import ../tools/X11/keynav { inherit stdenv fetchurl;