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

* Remove sumArgs and its few remaining uses. Idem for composedArgs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18388
This commit is contained in:
Eelco Dolstra 2009-11-17 15:26:22 +00:00
parent 18a08aa008
commit 802fa4ba0b
4 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/fsg/alt-builder.nix
View File

@ -1,6 +1,6 @@
args: with args;
let localDefs = builderDefs.passthru.function {
buildInputs =[mesa (wxGTK null) libX11 xproto];
buildInputs =[mesa wxGTK libX11 xproto];
src =
fetchurl {
url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;

2
pkgs/games/fsg/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
};
buildInputs = [gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
buildInputs = [gtk glib pkgconfig mesa wxGTK libX11 xproto];
/*
# One day Unicode will overcome?

17
pkgs/lib/misc.nix
View File

@ -9,23 +9,6 @@ with import ./strings.nix;
rec {
# accumulates / merges all attr sets until null is fed.
# example: sumArgs id { a = 'a'; x = 'x'; } { y = 'y'; x = 'X'; } null
# result : { a = 'a'; x = 'X'; y = 'Y'; }
innerSumArgs = f : x : y : (if y == null then (f x)
else (innerSumArgs f (x // y)));
sumArgs = f : innerSumArgs f {};
# Advanced sumArgs version. Hm, twice as slow, I'm afraid.
# composedArgs id (x:x//{a="b";}) (x:x//{b=x.a + "c";}) null;
# {a="b" ; b="bc";};
innerComposedArgs = f : x : y : (if y==null then (f x)
else (if (builtins.isAttrs y) then
(innerComposedArgs f (x//y))
else (innerComposedArgs f (y x))));
composedArgs = f: innerComposedArgs f {};
defaultMergeArg = x : y: if builtins.isAttrs y then
y
else

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

@ -938,14 +938,6 @@ let
inherit fetchurl stdenv;
};
/*
hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") {
inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse
pkgconfig perl gettext dbus dbus_glib pcre libscd bison glib;
flex = flex2533;
};
*/
iasl = import ../development/compilers/iasl {
inherit fetchurl stdenv bison flex;
};
@ -4046,12 +4038,6 @@ let
inherit fetchurl stdenv pkgconfig ncurses glib;
};
/*libscdFun = lib.sumArgs (selectVersion ../development/libraries/libscd "0.4.2") {
inherit stdenv fetchurl builderDefs libextractor perl pkgconfig;
};
libscd = libscdFun null;*/
libsigcxx = import ../development/libraries/libsigcxx {
inherit fetchurl stdenv pkgconfig;
};
@ -4608,16 +4594,12 @@ let
inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
};
wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8);
wxGTK28deps = wxGTK28fun {
wxGTK28 = makeOverridable (import ../development/libraries/wxGTK-2.8) {
inherit fetchurl stdenv pkgconfig mesa;
inherit (gtkLibs216) gtk;
inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
};
wxGTK28 = wxGTK28deps null;
wtk = import ../development/libraries/wtk {
inherit fetchurl stdenv unzip xlibs;
};
@ -7199,14 +7181,6 @@ let
qt = qt3;
};
/*kiwixBuilderFun = lib.sumArgs (import ../applications/misc/kiwixbuilder) {
inherit builderDefs;
inherit (gnome) glib;
zlib = zlibStatic;
};
kiwixBuilder = kiwixBuilderFun null;*/
konversation = import ../applications/networking/irc/konversation {
inherit fetchurl stdenv perl arts kdelibs zlib libpng libjpeg expat;
inherit (xlibs) libX11 libXt libXext libXrender libXft;
@ -8064,12 +8038,12 @@ let
inherit stdenv fetchurl pkgconfig mesa;
inherit (gtkLibs) glib gtk;
inherit (xlibs) libX11 xproto;
wxGTK = wxGTK28deps {unicode = false;};
wxGTK = wxGTK28.override {unicode = false;};
};
fsgAltBuild = import ../games/fsg/alt-builder.nix {
inherit stdenv fetchurl mesa;
wxGTK = wxGTK28deps {unicode = false;};
wxGTK = wxGTK28.override {unicode = false;};
inherit (xlibs) libX11 xproto;
inherit stringsWithDeps builderDefs;
};