From 5bca69ac34e4b9aaa233aef75396830f42b2d3d7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 30 Jan 2008 17:20:48 +0000 Subject: 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/trunk/; revision=10415 --- pkgs/applications/editors/bvi/default.nix | 8 ++++---- pkgs/applications/graphics/exrdisplay/default.nix | 12 ++++++------ pkgs/applications/jedit/default.nix | 8 ++++---- pkgs/applications/jedit/wrapper.nix | 14 +++++++------- pkgs/applications/misc/blender/default.nix | 12 ++++++------ pkgs/applications/misc/d4x/default.nix | 10 +++++----- pkgs/applications/misc/flite/default.nix | 8 +++----- pkgs/applications/misc/freemind/default.nix | 10 +++++----- pkgs/applications/misc/mrxvt/default.nix | 4 ++-- pkgs/applications/misc/pgadmin/default.nix | 8 ++++---- pkgs/applications/misc/pstree/default.nix | 7 +++---- pkgs/applications/misc/rxvt/default.nix | 8 ++++---- pkgs/applications/misc/sbagen/default.nix | 6 +++--- pkgs/applications/misc/synergy/default.nix | 8 ++++---- .../networking/instant-messengers/teamspeak/client.nix | 8 ++++---- pkgs/applications/networking/msmtp/default.nix | 8 +++----- pkgs/applications/networking/skype/default.nix | 10 +++++----- pkgs/applications/video/kino/default.nix | 10 +++++----- pkgs/development/compilers/fpc/binary.nix | 7 +++---- pkgs/development/compilers/fpc/default.nix | 8 ++++---- pkgs/development/libraries/SDL_image/default.nix | 9 ++++----- pkgs/development/libraries/SDL_ttf/default.nix | 9 ++++----- pkgs/development/libraries/ctl/default.nix | 12 ++++++------ pkgs/development/libraries/glew/default.nix | 8 ++++---- pkgs/development/libraries/gsl/default.nix | 8 +++----- pkgs/development/libraries/libavc1394/default.nix | 8 ++++---- pkgs/development/libraries/libiec61883/default.nix | 8 ++++---- pkgs/development/libraries/libraw1394/default.nix | 8 +++----- pkgs/development/libraries/libwmf/default.nix | 11 +++++------ pkgs/development/libraries/openexr_ctl/default.nix | 14 +++++++------- pkgs/development/libraries/proj.4/default.nix | 8 +++----- pkgs/development/python-modules/pil/default.nix | 12 ++++++------ pkgs/development/python-modules/pygame/default.nix | 12 ++++++------ pkgs/development/tools/misc/avrdude/default.nix | 2 +- pkgs/development/tools/misc/uisp/default.nix | 8 +++----- .../tools/selenium/remote-control/default.nix | 8 ++++---- pkgs/games/thePenguinMachine/default.nix | 17 ++++++++--------- pkgs/misc/gxemul/default.nix | 2 +- pkgs/misc/maven/maven-2.nix | 8 +++----- pkgs/misc/ntfsprogs/default.nix | 6 ++---- pkgs/os-specific/linux/bridge_utils/default.nix | 8 ++++---- pkgs/os-specific/linux/kernel/acerhk/default.nix | 12 ++++++------ pkgs/os-specific/linux/nfs-utils/default.nix | 8 ++++---- pkgs/os-specific/linux/radeontools/default.nix | 8 ++++---- pkgs/os-specific/linux/tcp-wrapper/default.nix | 8 ++++---- pkgs/servers/irc/ircd-hybrid/default.nix | 12 ++++++------ pkgs/tools/X11/xmacro/default.nix | 9 ++++----- pkgs/tools/backup/rdiff-backup/default.nix | 8 ++++---- pkgs/tools/hddtemp/default.nix | 10 ++++------ pkgs/tools/misc/shebangfix/default.nix | 6 +++--- pkgs/tools/misc/wv/default.nix | 11 +++++------ pkgs/tools/misc/xclip/default.nix | 8 ++++---- pkgs/tools/networking/dnsmasq/default.nix | 8 +++----- 53 files changed, 220 insertions(+), 248 deletions(-) diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 6d9ffdaecc8..223aabcdf82 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -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"; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 4778c4bf7c4..f82f07602f8 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -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"; diff --git a/pkgs/applications/jedit/default.nix b/pkgs/applications/jedit/default.nix index 3d694ee3ed7..aaf558ace09 100644 --- a/pkgs/applications/jedit/default.nix +++ b/pkgs/applications/jedit/default.nix @@ -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"; diff --git a/pkgs/applications/jedit/wrapper.nix b/pkgs/applications/jedit/wrapper.nix index ff8f6abacfc..8af3d96918d 100644 --- a/pkgs/applications/jedit/wrapper.nix +++ b/pkgs/applications/jedit/wrapper.nix @@ -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} "; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e722d4ff9db..aa50f67719c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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 diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 5a20893e9f3..f4ad3cc8421 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -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"; diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix index 291cce6c1f9..ad3b9df164d 100644 --- a/pkgs/applications/misc/flite/default.nix +++ b/pkgs/applications/misc/flite/default.nix @@ -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; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 79b00204fd4..b7bc3f3c8dd 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -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"; diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index aaabef2b6b8..f58fff56bc0 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -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"; }; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 733bf02a054..d60a3ca1548 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -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"; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index c59148e854e..c26876f2fcb 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -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"; diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index c875e55a8cb..58366c6aa04 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -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"; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index d78742bfc5b..6bf28580b35 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -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"; }; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 7872c6abaaf..be0c449abc7 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -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"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index bbdd265f7da..2763969ddec 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -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 diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 523620a403e..67839833c31 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -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/; diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 443c92527f2..285cba82a3f 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -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 =" diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 8e501f40cc0..cac769d60de 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -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 diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index b76441e38d6..99725b501c0 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -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"; }; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 5da4f65aea7..0d2f1fb525d 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -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; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 93e1cc31f44..4dd7d3679b8 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -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/"; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 77b95d02cc3..c7a356adc61 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -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/"; diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index c6a6cee0ca6..6e1c212703c 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -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 #"; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 2af500b3db6..82925d144b5 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -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"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index a5248d42299..19655f97b0d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -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; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 3d1d63780c2..0834c212fe9 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 3f167eb81de..c4062403d38 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 62398404ac2..8463749fcb3 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -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/"; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index ea2eecd90d2..6f580613b16 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -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 = " diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix index 634a38990cb..288067a4bf2 100644 --- a/pkgs/development/libraries/openexr_ctl/default.nix +++ b/pkgs/development/libraries/openexr_ctl/default.nix @@ -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 #"; diff --git a/pkgs/development/libraries/proj.4/default.nix b/pkgs/development/libraries/proj.4/default.nix index 6449a188f2b..ffb3bed5054 100644 --- a/pkgs/development/libraries/proj.4/default.nix +++ b/pkgs/development/libraries/proj.4/default.nix @@ -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; diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 863366f1a42..d5ed9aae12a 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 0ed717479d8..cad9b17ebad 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -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"; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e573d0751f2..f87d305dfb2 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index c6810939dd4..694dc940d92 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -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"; diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix index e2bf63264a6..4c55805e5c8 100644 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ b/pkgs/development/tools/selenium/remote-control/default.nix @@ -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"; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 89f675e083d..4ce42934b5a 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -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 = " diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index e7fdc96d32e..e7d0c92a1c5 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -12,7 +12,7 @@ let optionals = ["libX11"]; defaultFlags = [ "demos" "doc" ]; }; -in args.stdenv.mkDerivation { +in stdenv.mkDerivation { inherit name; inherit (co) /* flags */ buildInputs configureFlags; diff --git a/pkgs/misc/maven/maven-2.nix b/pkgs/misc/maven/maven-2.nix index 9f96639689b..be84f212e8b 100644 --- a/pkgs/misc/maven/maven-2.nix +++ b/pkgs/misc/maven/maven-2.nix @@ -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"; diff --git a/pkgs/misc/ntfsprogs/default.nix b/pkgs/misc/ntfsprogs/default.nix index 6e79ea61d89..8f2e6839309 100644 --- a/pkgs/misc/ntfsprogs/default.nix +++ b/pkgs/misc/ntfsprogs/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix index 9763e28915d..b4f5efce22f 100644 --- a/pkgs/os-specific/linux/bridge_utils/default.nix +++ b/pkgs/os-specific/linux/bridge_utils/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/kernel/acerhk/default.nix b/pkgs/os-specific/linux/kernel/acerhk/default.nix index 577d0f51027..8fe45048d7f 100644 --- a/pkgs/os-specific/linux/kernel/acerhk/default.nix +++ b/pkgs/os-specific/linux/kernel/acerhk/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 5240bba5d14..18278ef3c34 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 67d6cc4575f..d4d39606d62 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -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"; }; diff --git a/pkgs/os-specific/linux/tcp-wrapper/default.nix b/pkgs/os-specific/linux/tcp-wrapper/default.nix index 35c68a6d9a4..9c952bcabf8 100644 --- a/pkgs/os-specific/linux/tcp-wrapper/default.nix +++ b/pkgs/os-specific/linux/tcp-wrapper/default.nix @@ -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 = ... } diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 3f9fd380d14..572cc28e55b 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -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;"; diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index c1f039a9215..4cceb720e19 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -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]; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 43fd17a6178..8cd660adc8c 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -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"; diff --git a/pkgs/tools/hddtemp/default.nix b/pkgs/tools/hddtemp/default.nix index 0bb51287474..9f285a6cd51 100644 --- a/pkgs/tools/hddtemp/default.nix +++ b/pkgs/tools/hddtemp/default.nix @@ -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/; diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix index 94ecc1e00f7..f5ed86e99f7 100644 --- a/pkgs/tools/misc/shebangfix/default.nix +++ b/pkgs/tools/misc/shebangfix/default.nix @@ -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; diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 1bf88edef2a..9fe71248e8d 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -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 = " diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 305e38da464..fbf148721ca 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -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"; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 7b3cd59ba6c..b50cdeadfa3 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -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; -- cgit 1.4.1