pyrox.dev
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
+4
-4
pkgs/applications/editors/bvi/default.nix
+4
-4
pkgs/applications/editors/bvi/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args : with args;
2
+
stdenv.mkDerivation {
3
3
name = "bvi-1.3.2";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
7
7
sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
8
8
};
9
9
10
-
buildInputs =(with args; [ncurses]);
10
+
buildInputs = [ncurses];
11
11
12
12
meta = {
13
13
description = "hex editor with vim style keybindings";
+6
-6
pkgs/applications/graphics/exrdisplay/default.nix
+6
-6
pkgs/applications/graphics/exrdisplay/default.nix
···
1
-
args:
1
+
args: with args;
2
2
3
-
assert args.fltk.flag_set_gl;
4
-
args.stdenv.mkDerivation {
3
+
assert fltk.flag_set_gl;
4
+
stdenv.mkDerivation {
5
5
6
6
name ="openexr_viewers-1.0.1";
7
7
8
-
src = args.fetchurl {
8
+
src = fetchurl {
9
9
url = "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
10
10
sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
11
11
};
12
12
13
-
inherit (args) fltk mesa;
13
+
inherit fltk mesa;
14
14
15
15
configurePhase = "
16
16
# don't know why.. adding these flags it works
17
17
#export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
18
18
./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
19
19
20
-
buildInputs =(with args; [openexr fltk pkgconfig mesa which openexr_ctl]);
20
+
buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
21
21
22
22
meta = {
23
23
description = "tool to view OpenEXR images";
+4
-4
pkgs/applications/jedit/default.nix
+4
-4
pkgs/applications/jedit/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "jedit-4.2";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://kent.dl.sourceforge.net/sourceforge/jedit/jedit42source.tar.gz;
7
7
sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
8
8
};
···
18
18
cp modes/catalog \$out/lib/modes
19
19
";
20
20
21
-
buildInputs =(with args; [ant]);
21
+
buildInputs = [ant];
22
22
23
23
meta = {
24
24
description = "really nice programmers editor written in Java. Give it a try";
+7
-7
pkgs/applications/jedit/wrapper.nix
+7
-7
pkgs/applications/jedit/wrapper.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
3
-
name = args.jedit.name+"_startscript";
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
+
name = jedit.name+"_startscript";
4
4
5
-
java = args.jre+"/bin/java";
6
-
jeditjar = args.jedit+"/lib/jedit.jar";
5
+
java = jre+"/bin/java";
6
+
jeditjar = jedit+"/lib/jedit.jar";
7
7
8
8
phases = "buildPhase";
9
9
10
10
buildPhase = "
11
11
ensureDir \$out/bin
12
-
cat > \$out/bin/${args.jedit.name} << EOF
12
+
cat > \$out/bin/${jedit.name} << EOF
13
13
#!/bin/sh
14
14
exec $java -jar $jeditjar \\$*
15
15
EOF
16
-
chmod +x \$out/bin/${args.jedit.name}
16
+
chmod +x \$out/bin/${jedit.name}
17
17
";
18
18
}
+6
-6
pkgs/applications/misc/blender/default.nix
+6
-6
pkgs/applications/misc/blender/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "blender-2.45";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://download.blender.org/source/blender-2.45.tar.gz;
7
7
sha256 = "1bi7j1fcvrpb96sjpcbm4sldf359sgskfhv7a8pgcxj0bnhp47wj";
8
8
};
9
9
10
10
phases="unpackPhase buildPhase";
11
11
12
-
inherit (args) scons SDL freetype openal python openexr mesa;
12
+
inherit scons SDL freetype openal python openexr mesa;
13
13
14
-
buildInputs =(with args; [python scons
15
-
gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ]);
14
+
buildInputs = [python scons
15
+
gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ];
16
16
17
17
# patch SConstruct so that we can pass on additional include. Either blender
18
18
# or openEXR is broken. I think OpenEXR should use include "" isntead of <> to
+5
-5
pkgs/applications/misc/d4x/default.nix
+5
-5
pkgs/applications/misc/d4x/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "d4x-2.5.7.1";
4
4
5
-
inherit (args) boost;
5
+
inherit boost;
6
6
7
-
src = args.fetchurl {
7
+
src = fetchurl {
8
8
url = http://d4x.krasu.ru/files/d4x-2.5.7.1.tar.bz2;
9
9
sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
10
10
};
···
12
12
configurePhase = "./configure --prefix=\$out "
13
13
+ " --with-boost-libdir=\$boost/lib"
14
14
+ " --with-boost-includedir=\$boost/include";
15
-
buildInputs =(with args; [gtk glib pkgconfig openssl boost]);
15
+
buildInputs = [gtk glib pkgconfig openssl boost];
16
16
17
17
meta = {
18
18
description = "graphical download manager";
+3
-5
pkgs/applications/misc/flite/default.nix
+3
-5
pkgs/applications/misc/flite/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "flite-1.3-release";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz;
7
7
sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
8
8
};
···
17
17
ensureDir \$out/share/flite
18
18
cp -r bin \$out
19
19
";
20
-
21
-
buildInputs = (with args; []);
22
20
23
21
meta = {
24
22
description = "Flite text to speech engine";
+5
-5
pkgs/applications/misc/freemind/default.nix
+5
-5
pkgs/applications/misc/freemind/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "freemind-0.9.0_Beta_13";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz;
7
7
sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w";
8
8
};
9
9
10
-
buildInputs =(with args; [jdk ant]);
10
+
buildInputs = [jdk ant];
11
11
12
-
inherit (args) jre;
12
+
inherit jre;
13
13
14
14
phases="buildPhase installPhase";
15
15
+2
-2
pkgs/applications/misc/mrxvt/default.nix
+2
-2
pkgs/applications/misc/mrxvt/default.nix
···
10
10
};
11
11
};
12
12
13
-
in args.stdenv.mkDerivation {
13
+
in stdenv.mkDerivation {
14
14
15
15
inherit (co) buildInputs configureFlags;
16
16
17
-
src = args.fetchurl {
17
+
src = fetchurl {
18
18
url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
19
19
sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
20
20
};
+4
-4
pkgs/applications/misc/pgadmin/default.nix
+4
-4
pkgs/applications/misc/pgadmin/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "pgadmin3-1.8.1";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
name = "pgadmin3-v1.8.1.tar.gz";
7
7
url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
8
8
sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
9
9
};
10
10
11
-
buildInputs =(with args; [postgresql wxGTK libxml2 libxslt openssl]);
11
+
buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
12
12
13
13
meta = {
14
14
description = "postgresql admin gui tool";
+3
-4
pkgs/applications/misc/pstree/default.nix
+3
-4
pkgs/applications/misc/pstree/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "pstree-2.31";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
7
7
sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
8
8
};
9
9
10
10
unpackPhase="unpackFile \$src; sourceRoot=.";
11
-
#buildInputs =(with args; []);
12
11
13
12
buildPhase="pwd; gcc -o pstree pstree.c";
14
13
installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
+4
-4
pkgs/applications/misc/rxvt/default.nix
+4
-4
pkgs/applications/misc/rxvt/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "rxvt-2.6.4";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
7
7
sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
8
8
};
9
9
10
-
buildInputs =(with args; [ libX11 libXt ]);
10
+
buildInputs = [ libX11 libXt ];
11
11
12
12
meta = {
13
13
description = "colour vt102 terminal emulator with less features and lower memory consumption";
+3
-3
pkgs/applications/misc/sbagen/default.nix
+3
-3
pkgs/applications/misc/sbagen/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "sbagen-1.4.4";
4
4
5
5
buildPhases="buildPhase installPhase";
···
14
14
15
15
";
16
16
17
-
src = args.fetchurl {
17
+
src = fetchurl {
18
18
url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
19
19
sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
20
20
};
+4
-4
pkgs/applications/misc/synergy/default.nix
+4
-4
pkgs/applications/misc/synergy/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "synergy-cvs";
4
4
5
-
src = args.fetchcvs {
5
+
src = fetchcvs {
6
6
url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
7
7
module = "synergy";
8
8
date = "NOW";
9
9
sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
10
10
};
11
11
12
-
buildInputs =(with args; [x11 xextproto libXtst inputproto]);
12
+
buildInputs = [x11 xextproto libXtst inputproto];
13
13
14
14
meta= {
15
15
description = "share mouse keyboard and clipboard between computers";
+4
-4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+4
-4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
···
33
33
Marc Weber (small nix contributor)
34
34
*/
35
35
36
-
args:
37
-
args.stdenv.mkDerivation {
36
+
args: with args;
37
+
stdenv.mkDerivation {
38
38
name = "teamspeak-client-rc2-2032";
39
39
40
-
src = args.fetchurl {
40
+
src = fetchurl {
41
41
url = ftp://213.202.254.114/teamspeak/releases/ts2_client_rc2_2032.tar.bz2;
42
42
md5 = "e93d17a25e07b1cbe400e4eb028ca8f8";
43
43
};
44
44
45
45
phases="installPhase";
46
46
47
-
rpathInputs = (with args; [ glibc x11 ] );
47
+
rpathInputs = [ glibc x11 ];
48
48
49
49
installPhase="
50
50
set -x
+3
-5
pkgs/applications/networking/msmtp/default.nix
+3
-5
pkgs/applications/networking/msmtp/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "msmtp-1.4.13";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
7
7
sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
8
8
};
9
-
10
-
buildInputs =(with args; []);
11
9
12
10
meta = {
13
11
description = "a MUA";
+5
-5
pkgs/applications/networking/skype/default.nix
+5
-5
pkgs/applications/networking/skype/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "skype-1.4";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://www.skype.com/go/getskype-linux-static;
7
7
sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz";
8
8
name = "skype_static-1.4.0.99.tar.bz2";
9
9
};
10
10
11
-
buildInputs =(with args; [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes
11
+
buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes
12
12
libXcursor libXinerama freetype fontconfig libXext libX11
13
-
fontconfig libXinerama libsigcxx gcc41.gcc ]);
13
+
fontconfig libXinerama libsigcxx gcc41.gcc ];
14
14
15
15
phases = "installPhase";
16
16
installPhase ="
+5
-5
pkgs/applications/video/kino/default.nix
+5
-5
pkgs/applications/video/kino/default.nix
···
51
51
#AMR-WB IF2 support no
52
52
53
53
54
-
args:
55
-
args.stdenv.mkDerivation {
54
+
args: with args;
55
+
stdenv.mkDerivation {
56
56
name = "kino-1.2.0";
57
57
58
58
phases = "unpackPhase configurePhase buildPhase installPhase";
59
59
60
-
src = args.fetchurl {
60
+
src = fetchurl {
61
61
url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz;
62
62
sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9";
63
63
};
64
64
65
-
buildInputs =(with args; [ gtk libglade libxml2 libraw1394 libsamplerate libdv
66
-
pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]); # TODOoptional packages
65
+
buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv
66
+
pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]; # TODOoptional packages
67
67
68
68
#preConfigure = "
69
69
# grep 11 env-vars
+3
-4
pkgs/development/compilers/fpc/binary.nix
+3
-4
pkgs/development/compilers/fpc/binary.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "fpc-2.0.4-binary";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.0.4/fpc-2.0.4.i386-linux.tar;
8
7
sha256 = "0b2szv2anbf58h4i5mlph93afv9qdx6i0jqggba04d3anjbl9gfy";
9
8
};
+4
-4
pkgs/development/compilers/fpc/default.nix
+4
-4
pkgs/development/compilers/fpc/default.nix
···
1
1
args:
2
2
if ((args ? startFPC) && (args.startFPC != null))
3
3
then
4
-
args.stdenv.mkDerivation {
4
+
with args;
5
+
stdenv.mkDerivation {
5
6
name = "fpc-2.2.0";
6
7
7
-
src = args.
8
-
fetchurl {
8
+
src = fetchurl {
9
9
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.0/fpcbuild-2.2.0.tar.gz;
10
10
sha256 = "0pvsdmimknkgy8jgdz9kd7w5bs9fy5ynrgswpk0ib6x0y26zxijm";
11
11
};
12
12
13
-
buildInputs = [args.startFPC args.gawk];
13
+
buildInputs = [startFPC gawk];
14
14
15
15
installFlags = "INSTALL_PREFIX=\${out}";
16
16
postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;
+4
-5
pkgs/development/libraries/SDL_image/default.nix
+4
-5
pkgs/development/libraries/SDL_image/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "SDL_image-1.2.6";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz;
8
7
sha256 = "1i3f72dw3i3l6d77dk81gw57sp0629rng9k76qb37brlz7dv3z48";
9
8
};
10
9
11
-
buildInputs =(with args; [SDL libpng libjpeg libtiff libungif libXpm]);
10
+
buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
12
11
13
12
postInstall = "ln -s \${out}/include/SDL/SDL_image.h \${out}/include/";
14
13
+4
-5
pkgs/development/libraries/SDL_ttf/default.nix
+4
-5
pkgs/development/libraries/SDL_ttf/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "SDL_image-1.2.6";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
8
7
sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
9
8
};
10
9
11
-
buildInputs =(with args; [SDL freetype]);
10
+
buildInputs = [SDL freetype];
12
11
13
12
postInstall = "ln -s \${out}/include/SDL/SDL_ttf.h \${out}/include/";
14
13
+6
-6
pkgs/development/libraries/ctl/default.nix
+6
-6
pkgs/development/libraries/ctl/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "ctl-1.4.1";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
7
7
sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
8
8
};
9
9
10
-
propagatedBuildInputs = (with args; [ilmbase]);
11
-
configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
10
+
propagatedBuildInputs = [ilmbase];
11
+
configureFlags="--with-ilmbase-prefix=${ilmbase}";
12
12
#configurePhase = "
13
-
#export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
13
+
#export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
14
14
#echo $CXXFLAGS
15
15
#unset configurePhase; configurePhase
16
16
#";
+4
-4
pkgs/development/libraries/glew/default.nix
+4
-4
pkgs/development/libraries/glew/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "glew-1.5.0";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.0-src.tgz;
7
7
sha256 = "1kjr1fchnl785wsg11vzc03q3pm12lh20n1i593zr1xqfjgx2b4h";
8
8
};
9
9
10
-
buildInputs =(with args; [mesa x11 libXmu libXi]);
10
+
buildInputs = [mesa x11 libXmu libXi];
11
11
12
12
meta = {
13
13
description = "cross-platform open-source C/C++ extension loading library";
+3
-5
pkgs/development/libraries/gsl/default.nix
+3
-5
pkgs/development/libraries/gsl/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "gsl-1.9";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.9.tar.gz;
7
7
sha256 = "0l12js65c1qf3s7gmgay6gj5nbs6635py41dj8nk3hlp95wcdlgw";
8
8
};
9
-
10
-
buildInputs =(with args; []);
11
9
12
10
meta = {
13
11
description = "numerical library (>1000 functions)";
+4
-4
pkgs/development/libraries/libavc1394/default.nix
+4
-4
pkgs/development/libraries/libavc1394/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "libavc1394-0.5.3";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz;
7
7
sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
8
8
};
9
9
10
-
buildInputs =(with args; [pkgconfig libraw1394]);
10
+
buildInputs = [pkgconfig libraw1394];
11
11
12
12
meta = {
13
13
description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
+4
-4
pkgs/development/libraries/libiec61883/default.nix
+4
-4
pkgs/development/libraries/libiec61883/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "libiec61883-1.1.0";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz;
7
7
sha256 = "09f0ca7bp6lqlz6601gnyl04mfabv0azg49n1cmjyqpzh35cgxkq";
8
8
};
9
9
10
-
buildInputs =(with args; [pkgconfig libraw1394]);
10
+
buildInputs = [pkgconfig libraw1394];
11
11
12
12
meta = {
13
13
description = "TODO";
+3
-5
pkgs/development/libraries/libraw1394/default.nix
+3
-5
pkgs/development/libraries/libraw1394/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "libraw1394-1.2.0";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = "mirror://sourceforge/libraw1394/libraw1394-1.2.0.tar.gz";
7
7
sha256 = "1b9zqqzyz0ihyfvhn135y3wc6vmym5yz21jxj9dp0f09b96gmp0z";
8
8
};
9
-
10
-
buildInputs =(with args; []);
11
9
12
10
meta = {
13
11
description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
+5
-6
pkgs/development/libraries/libwmf/default.nix
+5
-6
pkgs/development/libraries/libwmf/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "libwmf-0.2.8.4";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz;
8
7
sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
9
8
};
10
9
11
-
buildInputs =(with args; [zlib imagemagick libpng
12
-
pkgconfig glib freetype libjpeg libxml2]);
10
+
buildInputs = [zlib imagemagick libpng
11
+
pkgconfig glib freetype libjpeg libxml2];
13
12
14
13
meta = {
15
14
description = "
+7
-7
pkgs/development/libraries/openexr_ctl/default.nix
+7
-7
pkgs/development/libraries/openexr_ctl/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "openexr_ctl-1.0.1";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
7
7
sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
8
8
};
9
9
10
-
propagatedBuildInputs = (with args; [ilmbase]);
11
-
buildInputs = ( with args; [openexr ctl]);
12
-
configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
10
+
propagatedBuildInputs = [ilmbase];
11
+
buildInputs = [openexr ctl];
12
+
configureFlags="--with-ilmbase-prefix=${ilmbase}";
13
13
#configurePhase = "
14
-
#export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
14
+
#export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
15
15
#echo $CXXFLAGS
16
16
#unset configurePhase; configurePhase
17
17
#";
+3
-5
pkgs/development/libraries/proj.4/default.nix
+3
-5
pkgs/development/libraries/proj.4/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "proj-4.5.0";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = ftp://ftp.remotesensing.org/proj/proj-4.5.0.tar.gz;
7
7
sha256 = "1d2qz0vgp13hkfgaz7hkblhb9w2fh2blbjqz73xdinwc08cmflqv";
8
8
};
9
-
10
-
buildInputs =(with args; []);
11
9
12
10
meta = {
13
11
description = "Cartographic Projections Library";
+6
-6
pkgs/development/python-modules/pil/default.nix
+6
-6
pkgs/development/python-modules/pil/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "python-imaging-1.1.6";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://effbot.org/downloads/Imaging-1.1.6.tar.gz;
7
7
sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
8
8
};
9
9
10
-
buildInputs =(with args; [python zlib libtiff libjpeg freetype]);
10
+
buildInputs = [python zlib libtiff libjpeg freetype];
11
11
12
-
configurePhase = (with args;"
12
+
configurePhase = "
13
13
sed -e 's@FREETYPE_ROOT = None@FREETYPE_ROOT = libinclude(\"${freetype}\")@' -i setup.py
14
14
sed -e 's@JPEG_ROOT = None@JPEG_ROOT = libinclude(\"${libjpeg}\")@' -i setup.py
15
15
sed -e 's@TIFF_ROOT = None@TIFF_ROOT = libinclude(\"${libtiff}\")@' -i setup.py
16
16
sed -e 's@ZLIB_ROOT = None@ZLIB_ROOT = libinclude(\"${zlib}\")@' -i setup.py
17
-
");
17
+
";
18
18
19
19
buildPhase = "true";
20
20
+6
-6
pkgs/development/python-modules/pygame/default.nix
+6
-6
pkgs/development/python-modules/pygame/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "pygame-1.7";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://www.pygame.org/ftp/pygame-1.7.1release.tar.gz ;
7
7
sha256 = "0hl0rmgjcqj217fibwyilz7w9jpg0kh7hsa7vyzd4cgqyliskpqi";
8
8
};
9
9
10
-
buildInputs =(with args; [python pkgconfig SDL SDL_image SDL_ttf]);
10
+
buildInputs = [python pkgconfig SDL SDL_image SDL_ttf];
11
11
12
-
configurePhase = (with args;
12
+
configurePhase =
13
13
"
14
14
export LOCALBASE=///
15
15
sed -e \"/origincdirs =/a'${SDL_image}/include/SDL','${SDL_image}/include',\" -i config_unix.py
16
16
sed -e \"/origlibdirs =/aoriglibdirs += '${SDL_image}/lib',\" -i config_unix.py
17
17
sed -e \"/origincdirs =/a'${SDL_ttf}/include/SDL','${SDL_ttf}/include',\" -i config_unix.py
18
18
sed -e \"/origlibdirs =/aoriglibdirs += '${SDL_ttf}/lib',\" -i config_unix.py
19
-
yes Y | python config.py ");
19
+
yes Y | python config.py ";
20
20
21
21
buildPhase = "yes Y | python setup.py build";
22
22
+1
-1
pkgs/development/tools/misc/avrdude/default.nix
+1
-1
pkgs/development/tools/misc/avrdude/default.nix
+3
-5
pkgs/development/tools/misc/uisp/default.nix
+3
-5
pkgs/development/tools/misc/uisp/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "uisp-20050207";
4
4
5
5
configureFlags="--disable-dependency-tracking";
6
6
7
-
src = args.fetchurl {
7
+
src = fetchurl {
8
8
url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz;
9
9
sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
10
10
};
11
-
12
-
#buildInputs =(with args; []);
13
11
14
12
meta = {
15
13
description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers";
+4
-4
pkgs/development/tools/selenium/remote-control/default.nix
+4
-4
pkgs/development/tools/selenium/remote-control/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "selenium-rc-0.8.3-binary";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://release.openqa.org/cgi-bin/selenium-remote-control-redirect.zip;
7
7
sha256 = "694b46a8440011bcedc4fdc6d01fd91c8b4b4b62b7c6629ace4e745ef47f583e";
8
8
};
···
13
13
cp selenium-server-*/*.jar \$out/lib
14
14
";
15
15
16
-
buildInputs =(with args; [unzip]);
16
+
buildInputs = [unzip];
17
17
18
18
meta = {
19
19
description = "test tool for web applications";
+8
-9
pkgs/games/thePenguinMachine/default.nix
+8
-9
pkgs/games/thePenguinMachine/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "thePenguinMachine";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = http://www.migniot.com/matrix/projects/thepenguinmachine/ThePenguinMachine.tar.gz;
8
7
sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv";
9
8
};
10
9
11
-
buildInputs =(with args; [python24 pil pygame SDL]);
10
+
buildInputs = [python24 pil pygame SDL];
12
11
13
-
configurePhase = (with args; "
12
+
configurePhase = "
14
13
sed -e \"/includes = /aincludes.append('${SDL}/include/SDL')\" -i setup.py;
15
14
sed -e \"/includes = /aincludes.append('${pygame}/include/python2.4')\" -i setup.py;
16
15
cat setup.py;
17
-
");
16
+
";
18
17
buildPhase = "
19
18
python setup.py build;
20
19
python setup.py build_clib;
···
22
21
python setup.py build_py;
23
22
python setup.py build_scripts;
24
23
";
25
-
installPhase = (with args ; "
24
+
installPhase = "
26
25
python setup.py install --prefix=\${out}
27
26
cp -r . /tmp/tpm-build
28
27
echo 'export PYTHONPATH=$PYTHONPATH:${pygame}/lib/python2.4/site-packages:${pil}/lib/python2.4/site-packages/PIL
29
28
python ThePenguinMachine.py' >/tmp/tpm-build/tpm.sh;
30
29
chmod a+rx /tmp/tpm-build/tpm.sh
31
-
");
30
+
";
32
31
33
32
meta = {
34
33
description = "
+1
-1
pkgs/misc/gxemul/default.nix
+1
-1
pkgs/misc/gxemul/default.nix
+3
-5
pkgs/misc/maven/maven-2.nix
+3
-5
pkgs/misc/maven/maven-2.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "maven-2.0.8-bin";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
# TODO mirrors
7
7
url = http://apache.linux-mirror.org/maven/binaries/apache-maven-2.0.8-bin.tar.bz2;
8
8
sha256 = "1wasvqplw7xk04j38vsq94zbrlpdg2k4348bg8730snr6zgaasai";
···
13
13
installPhase = "
14
14
ensureDir \$out; mv * \$out
15
15
";
16
-
17
-
buildInputs =(with args; []);
18
16
19
17
meta = {
20
18
description = "Java build tool";
+2
-4
pkgs/misc/ntfsprogs/default.nix
+2
-4
pkgs/misc/ntfsprogs/default.nix
···
1
-
args:
1
+
args: with args;
2
2
args.stdenv.mkDerivation {
3
3
name = "ntfsprogs-2.0.0";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
name = "ntfsprogs-2.0.0.tar.bz2";
7
7
url = "http://garr.dl.sourceforge.net/sourceforge/linux-ntfs/ntfsprogs-2.0.0.tar.bz2";
8
8
sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432";
9
9
};
10
-
11
-
buildInputs =(with args; []);
12
10
13
11
meta = {
14
12
description = "ntfs utilities";
+4
-4
pkgs/os-specific/linux/bridge_utils/default.nix
+4
-4
pkgs/os-specific/linux/bridge_utils/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "bridge-utils-1.2";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = mirror://sourceforge/bridge/bridge-utils-1.2.tar.gz;
7
7
sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
8
8
};
9
9
10
-
buildInputs =(with args; [autoconf automake]);
10
+
buildInputs = [autoconf automake];
11
11
12
12
preConfigure="autoreconf";
13
13
+6
-6
pkgs/os-specific/linux/kernel/acerhk/default.nix
+6
-6
pkgs/os-specific/linux/kernel/acerhk/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "acerhk_kernel_patch-0.5.35";
4
-
kernel = args.kernel.src;
5
-
inherit (args) debug;
6
-
acerhk = args.fetchurl {
4
+
kernel = kernel.src;
5
+
inherit debug;
6
+
acerhk = fetchurl {
7
7
url = http://mirror.switch.ch/mirror/gentoo/distfiles/acerhk-0.5.35.tar.bz2;
8
8
sha256 = "1kg002qraa8vha2cgza3z74d9j46g180g5b44zbv64dsa9n2j4b0";
9
9
};
10
10
11
-
buildInputs =(with args; [gnupatch]);
11
+
buildInputs = [gnupatch];
12
12
13
13
builder = ./builder.sh;
14
14
+4
-4
pkgs/os-specific/linux/nfs-utils/default.nix
+4
-4
pkgs/os-specific/linux/nfs-utils/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "nfs-utils-1.1.1";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = mirror://sourceforge/nfs/nfs-utils-1.1.1.tar.gz;
7
7
sha256 = "0aa434cv7lgbrhks0rzhwxvbk2zsa17kjwxqjrrh87zrv9d2sr1x";
8
8
};
9
9
10
-
buildInputs =(with args; [kernelHeaders tcp_wrapper]);
10
+
buildInputs = [kernelHeaders tcp_wrapper];
11
11
12
12
meta = {
13
13
description = "nfs utils";
+4
-4
pkgs/os-specific/linux/radeontools/default.nix
+4
-4
pkgs/os-specific/linux/radeontools/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "radeontool-1.5";
4
4
5
-
inherit (args) pciutils;
5
+
inherit pciutils;
6
6
7
7
# Don't know wether it's a good idea to hardcode the lspci path..
8
8
# But it will work on nix..
···
12
12
cd ..
13
13
";
14
14
15
-
src = args.fetchurl {
15
+
src = fetchurl {
16
16
url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
17
17
sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
18
18
};
+4
-4
pkgs/os-specific/linux/tcp-wrapper/default.nix
+4
-4
pkgs/os-specific/linux/tcp-wrapper/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "tcp-wrappers-7.6";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://ftp.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
7
7
sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
8
8
};
···
20
20
make CFLAGS='-DSYS_ERRLIST_DEFINED=1 -Dvsyslog=1' tcpd
21
21
"
22
22
23
-
buildInputs =(with args; [kernelHeaders gnused]);
23
+
buildInputs = [kernelHeaders gnused];
24
24
25
25
# meta = ...
26
26
}
+6
-6
pkgs/servers/irc/ircd-hybrid/default.nix
+6
-6
pkgs/servers/irc/ircd-hybrid/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "ircd-hybrid-7.2.2";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-7.2.2.tgz;
7
7
sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
8
8
};
9
9
10
-
buildInputs =(with args; [openssl zlib]);
10
+
buildInputs = [openssl zlib];
11
11
12
-
configureFlags = (with args; ["--with-nicklen=100"
12
+
configureFlags = ["--with-nicklen=100"
13
13
"--with-topiclen=360"
14
-
("--enable-openssl=" + openssl)]);
14
+
("--enable-openssl=" + openssl)];
15
15
16
16
preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";
17
17
+4
-5
pkgs/tools/X11/xmacro/default.nix
+4
-5
pkgs/tools/X11/xmacro/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "xmacro";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
7
7
md5 = "d2956b82f3d5380e58a75ccc721fb746";
8
8
};
···
11
11
12
12
preInstall="echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
13
13
14
-
buildInputs = (with args;
15
-
[libX11 libXtst xextproto libXi inputproto]);
14
+
buildInputs = [libX11 libXtst xextproto libXi inputproto];
16
15
}
+4
-4
pkgs/tools/backup/rdiff-backup/default.nix
+4
-4
pkgs/tools/backup/rdiff-backup/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "rdiff-backup-1.1.14";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.14.tar.gz;
7
7
sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
8
8
};
···
14
14
15
15
";
16
16
17
-
buildInputs = (with args; [python librsync gnused ]);
17
+
buildInputs = [python librsync gnused ];
18
18
19
19
meta = {
20
20
description = "backup system trying to combine best a mirror and an incremental backup system";
+4
-6
pkgs/tools/hddtemp/default.nix
+4
-6
pkgs/tools/hddtemp/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "hddtemp-0.3-beta15";
4
4
5
-
db = args.fetchurl{
5
+
db = fetchurl{
6
6
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
7
7
sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
8
8
};
9
-
src = args.fetchurl {
9
+
src = fetchurl {
10
10
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
11
11
sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
12
12
};
···
16
16
cp \$db \$out/nix-support/hddtemp.db
17
17
./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
18
18
";
19
-
20
-
buildInputs =(with args; []);
21
19
22
20
meta = {
23
21
description = "shows the harddisk temperature";
+3
-3
pkgs/tools/misc/shebangfix/default.nix
+3
-3
pkgs/tools/misc/shebangfix/default.nix
+5
-6
pkgs/tools/misc/wv/default.nix
+5
-6
pkgs/tools/misc/wv/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "wv-1.2.4";
4
4
5
-
src = args.
6
-
fetchurl {
5
+
src = fetchurl {
7
6
url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
8
7
sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
9
8
};
10
9
11
-
buildInputs =(with args; [zlib imagemagick libpng glib
12
-
pkgconfig libgsf libxml2 bzip2]);
10
+
buildInputs = [zlib imagemagick libpng glib
11
+
pkgconfig libgsf libxml2 bzip2];
13
12
14
13
meta = {
15
14
description = "
+4
-4
pkgs/tools/misc/xclip/default.nix
+4
-4
pkgs/tools/misc/xclip/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "xclip-0.08";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://people.debian.org/~kims/xclip/xclip-0.08.tar.gz;
7
7
sha256 = "0py6ijw7ln892gzxxm2w47nn97nb6psb8g6clkpz86gg706yjxpf";
8
8
};
9
9
10
10
patchPhase = "sed -i s=/usr/X11R6/bin=/bin= Makefile";
11
11
12
-
buildInputs =(with args; [x11 libXmu]);
12
+
buildInputs = [x11 libXmu];
13
13
14
14
installPhase="make install DESTDIR=\$out";
15
15
+3
-5
pkgs/tools/networking/dnsmasq/default.nix
+3
-5
pkgs/tools/networking/dnsmasq/default.nix
···
1
-
args:
2
-
args.stdenv.mkDerivation {
1
+
args: with args;
2
+
stdenv.mkDerivation {
3
3
name = "dnsmasq-2.40";
4
4
5
-
src = args.fetchurl {
5
+
src = fetchurl {
6
6
url = http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.40.tar.gz;
7
7
sha256 = "1q346l403rvvmvr14fk2l201p8fl3p5417vkp95zlx00jdb7hl8n";
8
8
};
9
9
10
10
installPhase = "ensureDir \$out; make DESTDIR=\$out PREFIX=��nstall";
11
-
12
-
buildInputs =(with args; []);
13
11
14
12
meta = {
15
13
description = "DNS forwarder and DHCP server";