Nix-expr style review

Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
This commit is contained in:
Yury G. Kudryashov 2008-01-31 10:41:04 +00:00
parent b1b8c4f258
commit fbfab88e04
53 changed files with 220 additions and 248 deletions

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args : with args;
stdenv.mkDerivation {
name = "bvi-1.3.2";
src = args.fetchurl {
src = fetchurl {
url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
};
buildInputs =(with args; [ncurses]);
buildInputs = [ncurses];
meta = {
description = "hex editor with vim style keybindings";

View File

@ -1,23 +1,23 @@
args:
args: with args;
assert args.fltk.flag_set_gl;
args.stdenv.mkDerivation {
assert fltk.flag_set_gl;
stdenv.mkDerivation {
name ="openexr_viewers-1.0.1";
src = args.fetchurl {
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
};
inherit (args) fltk mesa;
inherit fltk mesa;
configurePhase = "
# don't know why.. adding these flags it works
#export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
buildInputs =(with args; [openexr fltk pkgconfig mesa which openexr_ctl]);
buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
meta = {
description = "tool to view OpenEXR images";

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "jedit-4.2";
src = args.fetchurl {
src = fetchurl {
url = http://kent.dl.sourceforge.net/sourceforge/jedit/jedit42source.tar.gz;
sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
};
@ -18,7 +18,7 @@ args.stdenv.mkDerivation {
cp modes/catalog \$out/lib/modes
";
buildInputs =(with args; [ant]);
buildInputs = [ant];
meta = {
description = "really nice programmers editor written in Java. Give it a try";

View File

@ -1,18 +1,18 @@
args:
args.stdenv.mkDerivation {
name = args.jedit.name+"_startscript";
args: with args;
stdenv.mkDerivation {
name = jedit.name+"_startscript";
java = args.jre+"/bin/java";
jeditjar = args.jedit+"/lib/jedit.jar";
java = jre+"/bin/java";
jeditjar = jedit+"/lib/jedit.jar";
phases = "buildPhase";
buildPhase = "
ensureDir \$out/bin
cat > \$out/bin/${args.jedit.name} << EOF
cat > \$out/bin/${jedit.name} << EOF
#!/bin/sh
exec $java -jar $jeditjar \\$*
EOF
chmod +x \$out/bin/${args.jedit.name}
chmod +x \$out/bin/${jedit.name}
";
}

View File

@ -1,18 +1,18 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "blender-2.45";
src = args.fetchurl {
src = fetchurl {
url = http://download.blender.org/source/blender-2.45.tar.gz;
sha256 = "1bi7j1fcvrpb96sjpcbm4sldf359sgskfhv7a8pgcxj0bnhp47wj";
};
phases="unpackPhase buildPhase";
inherit (args) scons SDL freetype openal python openexr mesa;
inherit scons SDL freetype openal python openexr mesa;
buildInputs =(with args; [python scons
gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ]);
buildInputs = [python scons
gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ];
# patch SConstruct so that we can pass on additional include. Either blender
# or openEXR is broken. I think OpenEXR should use include "" isntead of <> to

View File

@ -1,10 +1,10 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "d4x-2.5.7.1";
inherit (args) boost;
inherit boost;
src = args.fetchurl {
src = fetchurl {
url = http://d4x.krasu.ru/files/d4x-2.5.7.1.tar.bz2;
sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
};
@ -12,7 +12,7 @@ args.stdenv.mkDerivation {
configurePhase = "./configure --prefix=\$out "
+ " --with-boost-libdir=\$boost/lib"
+ " --with-boost-includedir=\$boost/include";
buildInputs =(with args; [gtk glib pkgconfig openssl boost]);
buildInputs = [gtk glib pkgconfig openssl boost];
meta = {
description = "graphical download manager";

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "flite-1.3-release";
src = args.fetchurl {
src = fetchurl {
url = http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz;
sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
};
@ -18,8 +18,6 @@ args.stdenv.mkDerivation {
cp -r bin \$out
";
buildInputs = (with args; []);
meta = {
description = "Flite text to speech engine";
homepage = http://www.speech.cs.cmu.edu/flite/download.html;

View File

@ -1,15 +1,15 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "freemind-0.9.0_Beta_13";
src = args.fetchurl {
src = fetchurl {
url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz;
sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w";
};
buildInputs =(with args; [jdk ant]);
buildInputs = [jdk ant];
inherit (args) jre;
inherit jre;
phases="buildPhase installPhase";

View File

@ -10,11 +10,11 @@ let
};
};
in args.stdenv.mkDerivation {
in stdenv.mkDerivation {
inherit (co) buildInputs configureFlags;
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
};

View File

@ -1,14 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "pgadmin3-1.8.1";
src = args.fetchurl {
src = fetchurl {
name = "pgadmin3-v1.8.1.tar.gz";
url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
};
buildInputs =(with args; [postgresql wxGTK libxml2 libxslt openssl]);
buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
meta = {
description = "postgresql admin gui tool";

View File

@ -1,14 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "pstree-2.31";
src = args.fetchurl {
src = fetchurl {
url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
};
unpackPhase="unpackFile \$src; sourceRoot=.";
#buildInputs =(with args; []);
buildPhase="pwd; gcc -o pstree pstree.c";
installPhase="ensureDir \$out/bin; cp pstree \$out/bin";

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "rxvt-2.6.4";
src = args.fetchurl {
src = fetchurl {
url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
};
buildInputs =(with args; [ libX11 libXt ]);
buildInputs = [ libX11 libXt ];
meta = {
description = "colour vt102 terminal emulator with less features and lower memory consumption";

View File

@ -1,5 +1,5 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "sbagen-1.4.4";
buildPhases="buildPhase installPhase";
@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
";
src = args.fetchurl {
src = fetchurl {
url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
};

View File

@ -1,15 +1,15 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "synergy-cvs";
src = args.fetchcvs {
src = fetchcvs {
url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
module = "synergy";
date = "NOW";
sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
};
buildInputs =(with args; [x11 xextproto libXtst inputproto]);
buildInputs = [x11 xextproto libXtst inputproto];
meta= {
description = "share mouse keyboard and clipboard between computers";

View File

@ -33,18 +33,18 @@ Sincerly
Marc Weber (small nix contributor)
*/
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "teamspeak-client-rc2-2032";
src = args.fetchurl {
src = fetchurl {
url = ftp://213.202.254.114/teamspeak/releases/ts2_client_rc2_2032.tar.bz2;
md5 = "e93d17a25e07b1cbe400e4eb028ca8f8";
};
phases="installPhase";
rpathInputs = (with args; [ glibc x11 ] );
rpathInputs = [ glibc x11 ];
installPhase="
set -x

View File

@ -1,14 +1,12 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "msmtp-1.4.13";
src = args.fetchurl {
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
};
buildInputs =(with args; []);
meta = {
description = "a MUA";
homepage = http://msmtp.sourceforge.net/;

View File

@ -1,16 +1,16 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "skype-1.4";
src = args.fetchurl {
src = fetchurl {
url = http://www.skype.com/go/getskype-linux-static;
sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz";
name = "skype_static-1.4.0.99.tar.bz2";
};
buildInputs =(with args; [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes
buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes
libXcursor libXinerama freetype fontconfig libXext libX11
fontconfig libXinerama libsigcxx gcc41.gcc ]);
fontconfig libXinerama libsigcxx gcc41.gcc ];
phases = "installPhase";
installPhase ="

View File

@ -51,19 +51,19 @@
#AMR-WB IF2 support no
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "kino-1.2.0";
phases = "unpackPhase configurePhase buildPhase installPhase";
src = args.fetchurl {
src = fetchurl {
url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz;
sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9";
};
buildInputs =(with args; [ gtk libglade libxml2 libraw1394 libsamplerate libdv
pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]); # TODOoptional packages
buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv
pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]; # TODOoptional packages
#preConfigure = "
# grep 11 env-vars

View File

@ -1,9 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "fpc-2.0.4-binary";
src = args.
fetchurl {
src = fetchurl {
url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.0.4/fpc-2.0.4.i386-linux.tar;
sha256 = "0b2szv2anbf58h4i5mlph93afv9qdx6i0jqggba04d3anjbl9gfy";
};

View File

@ -1,16 +1,16 @@
args:
if ((args ? startFPC) && (args.startFPC != null))
then
args.stdenv.mkDerivation {
with args;
stdenv.mkDerivation {
name = "fpc-2.2.0";
src = args.
fetchurl {
src = fetchurl {
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.0/fpcbuild-2.2.0.tar.gz;
sha256 = "0pvsdmimknkgy8jgdz9kd7w5bs9fy5ynrgswpk0ib6x0y26zxijm";
};
buildInputs = [args.startFPC args.gawk];
buildInputs = [startFPC gawk];
installFlags = "INSTALL_PREFIX=\${out}";
postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;

View File

@ -1,14 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "SDL_image-1.2.6";
src = args.
fetchurl {
src = fetchurl {
url = http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz;
sha256 = "1i3f72dw3i3l6d77dk81gw57sp0629rng9k76qb37brlz7dv3z48";
};
buildInputs =(with args; [SDL libpng libjpeg libtiff libungif libXpm]);
buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
postInstall = "ln -s \${out}/include/SDL/SDL_image.h \${out}/include/";

View File

@ -1,14 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "SDL_image-1.2.6";
src = args.
fetchurl {
src = fetchurl {
url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
};
buildInputs =(with args; [SDL freetype]);
buildInputs = [SDL freetype];
postInstall = "ln -s \${out}/include/SDL/SDL_ttf.h \${out}/include/";

View File

@ -1,16 +1,16 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "ctl-1.4.1";
src = args.fetchurl {
src = fetchurl {
url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
};
propagatedBuildInputs = (with args; [ilmbase]);
configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
propagatedBuildInputs = [ilmbase];
configureFlags="--with-ilmbase-prefix=${ilmbase}";
#configurePhase = "
#export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
#export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
#echo $CXXFLAGS
#unset configurePhase; configurePhase
#";

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "glew-1.5.0";
src = args.fetchurl {
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.0-src.tgz;
sha256 = "1kjr1fchnl785wsg11vzc03q3pm12lh20n1i593zr1xqfjgx2b4h";
};
buildInputs =(with args; [mesa x11 libXmu libXi]);
buildInputs = [mesa x11 libXmu libXi];
meta = {
description = "cross-platform open-source C/C++ extension loading library";

View File

@ -1,14 +1,12 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "gsl-1.9";
src = args.fetchurl {
src = fetchurl {
url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.9.tar.gz;
sha256 = "0l12js65c1qf3s7gmgay6gj5nbs6635py41dj8nk3hlp95wcdlgw";
};
buildInputs =(with args; []);
meta = {
description = "numerical library (>1000 functions)";
homepage = http://www.gnu.org/software/gsl;

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "libavc1394-0.5.3";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz;
sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
};
buildInputs =(with args; [pkgconfig libraw1394]);
buildInputs = [pkgconfig libraw1394];
meta = {
description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "libiec61883-1.1.0";
src = args.fetchurl {
src = fetchurl {
url = http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz;
sha256 = "09f0ca7bp6lqlz6601gnyl04mfabv0azg49n1cmjyqpzh35cgxkq";
};
buildInputs =(with args; [pkgconfig libraw1394]);
buildInputs = [pkgconfig libraw1394];
meta = {
description = "TODO";

View File

@ -1,14 +1,12 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "libraw1394-1.2.0";
src = args.fetchurl {
src = fetchurl {
url = "mirror://sourceforge/libraw1394/libraw1394-1.2.0.tar.gz";
sha256 = "1b9zqqzyz0ihyfvhn135y3wc6vmym5yz21jxj9dp0f09b96gmp0z";
};
buildInputs =(with args; []);
meta = {
description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
homepage = "http://wiki.linux1394.org/";

View File

@ -1,15 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "libwmf-0.2.8.4";
src = args.
fetchurl {
src = fetchurl {
url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz;
sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
};
buildInputs =(with args; [zlib imagemagick libpng
pkgconfig glib freetype libjpeg libxml2]);
buildInputs = [zlib imagemagick libpng
pkgconfig glib freetype libjpeg libxml2];
meta = {
description = "

View File

@ -1,17 +1,17 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "openexr_ctl-1.0.1";
src = args.fetchurl {
src = fetchurl {
url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
};
propagatedBuildInputs = (with args; [ilmbase]);
buildInputs = ( with args; [openexr ctl]);
configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
propagatedBuildInputs = [ilmbase];
buildInputs = [openexr ctl];
configureFlags="--with-ilmbase-prefix=${ilmbase}";
#configurePhase = "
#export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
#export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
#echo $CXXFLAGS
#unset configurePhase; configurePhase
#";

View File

@ -1,14 +1,12 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "proj-4.5.0";
src = args.fetchurl {
src = fetchurl {
url = ftp://ftp.remotesensing.org/proj/proj-4.5.0.tar.gz;
sha256 = "1d2qz0vgp13hkfgaz7hkblhb9w2fh2blbjqz73xdinwc08cmflqv";
};
buildInputs =(with args; []);
meta = {
description = "Cartographic Projections Library";
homepage = http://proj.maptools.org;

View File

@ -1,20 +1,20 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "python-imaging-1.1.6";
src = args.fetchurl {
src = fetchurl {
url = http://effbot.org/downloads/Imaging-1.1.6.tar.gz;
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
};
buildInputs =(with args; [python zlib libtiff libjpeg freetype]);
buildInputs = [python zlib libtiff libjpeg freetype];
configurePhase = (with args;"
configurePhase = "
sed -e 's@FREETYPE_ROOT = None@FREETYPE_ROOT = libinclude(\"${freetype}\")@' -i setup.py
sed -e 's@JPEG_ROOT = None@JPEG_ROOT = libinclude(\"${libjpeg}\")@' -i setup.py
sed -e 's@TIFF_ROOT = None@TIFF_ROOT = libinclude(\"${libtiff}\")@' -i setup.py
sed -e 's@ZLIB_ROOT = None@ZLIB_ROOT = libinclude(\"${zlib}\")@' -i setup.py
");
";
buildPhase = "true";

View File

@ -1,22 +1,22 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "pygame-1.7";
src = args.fetchurl {
src = fetchurl {
url = http://www.pygame.org/ftp/pygame-1.7.1release.tar.gz ;
sha256 = "0hl0rmgjcqj217fibwyilz7w9jpg0kh7hsa7vyzd4cgqyliskpqi";
};
buildInputs =(with args; [python pkgconfig SDL SDL_image SDL_ttf]);
buildInputs = [python pkgconfig SDL SDL_image SDL_ttf];
configurePhase = (with args;
configurePhase =
"
export LOCALBASE=///
sed -e \"/origincdirs =/a'${SDL_image}/include/SDL','${SDL_image}/include',\" -i config_unix.py
sed -e \"/origlibdirs =/aoriglibdirs += '${SDL_image}/lib',\" -i config_unix.py
sed -e \"/origincdirs =/a'${SDL_ttf}/include/SDL','${SDL_ttf}/include',\" -i config_unix.py
sed -e \"/origlibdirs =/aoriglibdirs += '${SDL_ttf}/lib',\" -i config_unix.py
yes Y | python config.py ");
yes Y | python config.py ";
buildPhase = "yes Y | python setup.py build";

View File

@ -12,7 +12,7 @@ let
#defaultFlags = ["doc"];
};
in args.stdenv.mkDerivation {
in stdenv.mkDerivation {
# passing the flags in case a library using this want's to check them (*) ..
inherit (co) /* flags */ buildInputs configureFlags;

View File

@ -1,16 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "uisp-20050207";
configureFlags="--disable-dependency-tracking";
src = args.fetchurl {
src = fetchurl {
url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz;
sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
};
#buildInputs =(with args; []);
meta = {
description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers";
license = "GPL-2";

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "selenium-rc-0.8.3-binary";
src = args.fetchurl {
src = fetchurl {
url = http://release.openqa.org/cgi-bin/selenium-remote-control-redirect.zip;
sha256 = "694b46a8440011bcedc4fdc6d01fd91c8b4b4b62b7c6629ace4e745ef47f583e";
};
@ -13,7 +13,7 @@ args.stdenv.mkDerivation {
cp selenium-server-*/*.jar \$out/lib
";
buildInputs =(with args; [unzip]);
buildInputs = [unzip];
meta = {
description = "test tool for web applications";

View File

@ -1,20 +1,19 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "thePenguinMachine";
src = args.
fetchurl {
src = fetchurl {
url = http://www.migniot.com/matrix/projects/thepenguinmachine/ThePenguinMachine.tar.gz;
sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv";
};
buildInputs =(with args; [python24 pil pygame SDL]);
buildInputs = [python24 pil pygame SDL];
configurePhase = (with args; "
configurePhase = "
sed -e \"/includes = /aincludes.append('${SDL}/include/SDL')\" -i setup.py;
sed -e \"/includes = /aincludes.append('${pygame}/include/python2.4')\" -i setup.py;
cat setup.py;
");
";
buildPhase = "
python setup.py build;
python setup.py build_clib;
@ -22,13 +21,13 @@ args.stdenv.mkDerivation {
python setup.py build_py;
python setup.py build_scripts;
";
installPhase = (with args ; "
installPhase = "
python setup.py install --prefix=\${out}
cp -r . /tmp/tpm-build
echo 'export PYTHONPATH=$PYTHONPATH:${pygame}/lib/python2.4/site-packages:${pil}/lib/python2.4/site-packages/PIL
python ThePenguinMachine.py' >/tmp/tpm-build/tpm.sh;
chmod a+rx /tmp/tpm-build/tpm.sh
");
";
meta = {
description = "

View File

@ -12,7 +12,7 @@ let
optionals = ["libX11"];
defaultFlags = [ "demos" "doc" ];
};
in args.stdenv.mkDerivation {
in stdenv.mkDerivation {
inherit name;
inherit (co) /* flags */ buildInputs configureFlags;

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "maven-2.0.8-bin";
src = args.fetchurl {
src = fetchurl {
# TODO mirrors
url = http://apache.linux-mirror.org/maven/binaries/apache-maven-2.0.8-bin.tar.bz2;
sha256 = "1wasvqplw7xk04j38vsq94zbrlpdg2k4348bg8730snr6zgaasai";
@ -14,8 +14,6 @@ args.stdenv.mkDerivation {
ensureDir \$out; mv * \$out
";
buildInputs =(with args; []);
meta = {
description = "Java build tool";
homepage = "apache.org";

View File

@ -1,15 +1,13 @@
args:
args: with args;
args.stdenv.mkDerivation {
name = "ntfsprogs-2.0.0";
src = args.fetchurl {
src = fetchurl {
name = "ntfsprogs-2.0.0.tar.bz2";
url = "http://garr.dl.sourceforge.net/sourceforge/linux-ntfs/ntfsprogs-2.0.0.tar.bz2";
sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432";
};
buildInputs =(with args; []);
meta = {
description = "ntfs utilities";
homepage = http://sourceforge.net/projects/linux-ntfs;

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "bridge-utils-1.2";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/bridge/bridge-utils-1.2.tar.gz;
sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
};
buildInputs =(with args; [autoconf automake]);
buildInputs = [autoconf automake];
preConfigure="autoreconf";

View File

@ -1,14 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "acerhk_kernel_patch-0.5.35";
kernel = args.kernel.src;
inherit (args) debug;
acerhk = args.fetchurl {
kernel = kernel.src;
inherit debug;
acerhk = fetchurl {
url = http://mirror.switch.ch/mirror/gentoo/distfiles/acerhk-0.5.35.tar.bz2;
sha256 = "1kg002qraa8vha2cgza3z74d9j46g180g5b44zbv64dsa9n2j4b0";
};
buildInputs =(with args; [gnupatch]);
buildInputs = [gnupatch];
builder = ./builder.sh;

View File

@ -1,13 +1,13 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "nfs-utils-1.1.1";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/nfs/nfs-utils-1.1.1.tar.gz;
sha256 = "0aa434cv7lgbrhks0rzhwxvbk2zsa17kjwxqjrrh87zrv9d2sr1x";
};
buildInputs =(with args; [kernelHeaders tcp_wrapper]);
buildInputs = [kernelHeaders tcp_wrapper];
meta = {
description = "nfs utils";

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "radeontool-1.5";
inherit (args) pciutils;
inherit pciutils;
# Don't know wether it's a good idea to hardcode the lspci path..
# But it will work on nix..
@ -12,7 +12,7 @@ args.stdenv.mkDerivation {
cd ..
";
src = args.fetchurl {
src = fetchurl {
url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
};

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "tcp-wrappers-7.6";
src = args.fetchurl {
src = fetchurl {
url = http://ftp.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
};
@ -20,7 +20,7 @@ args.stdenv.mkDerivation {
make CFLAGS='-DSYS_ERRLIST_DEFINED=1 -Dvsyslog=1' tcpd
"
buildInputs =(with args; [kernelHeaders gnused]);
buildInputs = [kernelHeaders gnused];
# meta = ...
}

View File

@ -1,17 +1,17 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "ircd-hybrid-7.2.2";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-7.2.2.tgz;
sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
};
buildInputs =(with args; [openssl zlib]);
buildInputs = [openssl zlib];
configureFlags = (with args; ["--with-nicklen=100"
configureFlags = ["--with-nicklen=100"
"--with-topiclen=360"
("--enable-openssl=" + openssl)]);
("--enable-openssl=" + openssl)];
preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "xmacro";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
md5 = "d2956b82f3d5380e58a75ccc721fb746";
};
@ -11,6 +11,5 @@ args.stdenv.mkDerivation {
preInstall="echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
buildInputs = (with args;
[libX11 libXtst xextproto libXi inputproto]);
buildInputs = [libX11 libXtst xextproto libXi inputproto];
}

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "rdiff-backup-1.1.14";
src = args.fetchurl {
src = fetchurl {
url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.14.tar.gz;
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
};
@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
";
buildInputs = (with args; [python librsync gnused ]);
buildInputs = [python librsync gnused ];
meta = {
description = "backup system trying to combine best a mirror and an incremental backup system";

View File

@ -1,12 +1,12 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "hddtemp-0.3-beta15";
db = args.fetchurl{
db = fetchurl{
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
};
src = args.fetchurl {
src = fetchurl {
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
};
@ -17,8 +17,6 @@ args.stdenv.mkDerivation {
./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
";
buildInputs =(with args; []);
meta = {
description = "shows the harddisk temperature";
homepage = https://savannah.nongnu.org/projects/hddtemp/;

View File

@ -1,8 +1,8 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "shebangfix-0.0";
buildInputs = [args.perl];
buildInputs = [perl];
file = ./shebangfix.pl;

View File

@ -1,15 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "wv-1.2.4";
src = args.
fetchurl {
src = fetchurl {
url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
};
buildInputs =(with args; [zlib imagemagick libpng glib
pkgconfig libgsf libxml2 bzip2]);
buildInputs = [zlib imagemagick libpng glib
pkgconfig libgsf libxml2 bzip2];
meta = {
description = "

View File

@ -1,15 +1,15 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "xclip-0.08";
src = args.fetchurl {
src = fetchurl {
url = http://people.debian.org/~kims/xclip/xclip-0.08.tar.gz;
sha256 = "0py6ijw7ln892gzxxm2w47nn97nb6psb8g6clkpz86gg706yjxpf";
};
patchPhase = "sed -i s=/usr/X11R6/bin=/bin= Makefile";
buildInputs =(with args; [x11 libXmu]);
buildInputs = [x11 libXmu];
installPhase="make install DESTDIR=\$out";

View File

@ -1,16 +1,14 @@
args:
args.stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "dnsmasq-2.40";
src = args.fetchurl {
src = fetchurl {
url = http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.40.tar.gz;
sha256 = "1q346l403rvvmvr14fk2l201p8fl3p5417vkp95zlx00jdb7hl8n";
};
installPhase = "ensureDir \$out; make DESTDIR=\$out PREFIX=ôônstall";
buildInputs =(with args; []);
meta = {
description = "DNS forwarder and DHCP server";
homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;