dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* ltrace: updated to 0.5.3.

Browse Source 
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
This commit is contained in:
Eelco Dolstra 2010-07-29 18:55:16 +00:00
parent ad1c77118f
commit 907bb1aac6
29 changed files with 335 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/graphics/gocr/default.nix
View File

@ -1,21 +1,14 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
};
{ stdenv, fetchurl }:
buildInputs = [];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "gocr";
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "GPL Optical Character Recognition";
inherit src;
};
name = "gocr-0.44";
src = fetchurl {
url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
};
meta = {
description = "GPL Optical Character Recognition";
};
}

8
pkgs/applications/networking/p2p/ldcpp/default.nix
View File

@ -1,4 +1,6 @@
args : with args; with builderDefs;
{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
with builderDefs;
let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */
fetchurl {
@ -6,7 +8,7 @@ args : with args; with builderDefs;
sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
};
buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
buildInputs = [scons pkgconfig gtk bzip2 libglade
openssl libX11];
configureFlags = [];
doScons = fullDepEntry (''
@ -15,7 +17,7 @@ args : with args; with builderDefs;
scons PREFIX=$out
scons PREFIX=$out install
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
}) // args);
}));
in with localDefs;
stdenv.mkDerivation rec {
name = "ldcpp-1.0.3";

43
pkgs/applications/virtualization/qemu/linux-img/default.nix
View File

@ -1,27 +1,22 @@
{ stdenv, fetchurl }:
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];
sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
};
buildInputs = [];
configureFlags = [];
};
in with localDefs;
let
doCopy = fullDepEntry ("
ensureDir \$out/share/qemu-images
cp linux-0.2.img \$out/share/qemu-images/
") [minInit doUnpack defEnsureDir];
in
stdenv.mkDerivation rec {
name = "QEmu-Linux-Image-0.2";
builder = writeScript (name + "-builder")
(textClosure localDefs [doCopy doForceShare doPropagate]);
meta = {
description = "Qemu sample image.";
inherit src;
};
name = "qemu-linux-image-0.2";
src = fetchurl {
url = http://wiki.qemu.org/download/linux-0.2.img.bz2;
sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
};
unpackPhase = "true";
installPhase =
''
ensureDir $out/share/qemu-images
bunzip2 < $src > $out/share/qemu-images/linux-0.2.img
'';
meta = {
description = "QEMU sample Linux disk image";
};
}

4
pkgs/applications/window-managers/fbpanel/default.nix
View File

@ -1,4 +1,6 @@
args : with args;
{ stdenv, fetchurl, builderDefs, libX11, gtk, pkgconfig, libXmu
, libXpm, libpng, libjpeg, libtiff, librsvg }:
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {

52
pkgs/data/fonts/clearlyU/default.nix
View File

@ -1,29 +1,25 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz;
sha256 = "0256h6f3ky529jc39hh0nvkngy48a0x3gss2z81g5ddi1qzfw0pn";
};
buildInputs = [mkfontdir mkfontscale];
configureFlags = [];
doInstall = fullDepEntry (''
tar xf ${src}
ensureDir $out/share/fonts/
cp *.bdf $out/share/fonts
cd $out/share/fonts
mkfontdir
mkfontscale
'') ["minInit" "defEnsureDir" "addInputs"];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "clearlyU-12-1.9";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doInstall doForceShare doPropagate]);
meta = {
description = "A Unicode font";
inherit src;
};
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
stdenv.mkDerivation {
name = "clearlyU-12-1.9";
src = fetchurl {
url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
};
buildInputs = [ mkfontdir mkfontscale ];
installPhase =
''
ensureDir $out/share/fonts
cp *.bdf $out/share/fonts
cd $out/share/fonts
mkfontdir
mkfontscale
'';
meta = {
description = "A Unicode font";
};
}

50
pkgs/data/fonts/junicode/default.nix
View File

@ -1,30 +1,24 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
};
{ stdenv, fetchurl, unzip }:
buildInputs = [unzip];
configureFlags = [];
doInstall = fullDepEntry (''
unzip ${src}
ensureDir $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf
'') ["minInit" "addInputs" "defEnsureDir"];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "junicode-0.6.15";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doInstall doForceShare doPropagate]);
meta = {
description = "A Unicode font";
inherit src;
};
stdenv.mkDerivation {
name = "junicode-0.6.15";
src = fetchurl {
url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
};
buildInputs = [ unzip ];
sourceRoot = ".";
installPhase =
''
ensureDir $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf
'';
meta = {
description = "A Unicode font";
};
}

21
pkgs/data/fonts/wqy-zenhei/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "wqy-zenhei-0.4.23-1";
src = fetchurl {
url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
};
installPhase =
''
ensureDir $out/share/fonts
cp *.ttf $out/share/fonts
'';
meta = {
description = "A (mainly) Chinese Unicode font";
};
}

27
pkgs/data/fonts/wqy_zenhei/default.nix
View File

@ -1,27 +0,0 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
};
buildInputs = [];
configureFlags = [];
doInstall = fullDepEntry (''
ensureDir $out/share/fonts
cp *.ttf $out/share/fonts
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "wqy-zenhei-0.4.23-1";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doInstall doForceShare doPropagate]);
meta = {
description = "A (mainly) Chinese Unicode font";
inherit src;
};
}

2
pkgs/development/compilers/qi/default.nix
View File

@ -1,4 +1,4 @@
args : with args;
{ stdenv, fetchurl, builderDefs, unzip, clisp }:
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {

64
pkgs/development/libraries/libdbi-drivers/default.nix
View File

@ -1,39 +1,31 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;
sha256 = "1bflwl1k3rf1h8clx3zv5pxnm5hbhq6izikv0phkss3qxkjm61ap";
};
{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }:
buildInputs = [libdbi]
++(if args ? mysql then [args.mysql] else [])
++(if args ? sqlite then [args.sqlite] else [])
;
configureFlags = [
" --enable-libdbi "
" --with-dbi-incdir=${libdbi}/include "
" --with-dbi-libdir=${libdbi}/lib "
]
++ (if args ? mysql then [
" --with-mysql "
" --with-mysql-incdir=${args.mysql}/include/mysql "
" --with-mysql-libdir=${args.mysql}/lib/mysql "
] else [])
++ (if args ? sqlite then [
" --with-sqlite "
" --with-sqlite-incdir=${args.sqlite}/include/sqlite "
" --with-sqlite-libdir=${args.sqlite}/lib/sqlite "
] else [])
;
};
in with localDefs;
stdenv.mkDerivation rec {
name = "libdbi-0.8.2-1";
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "DB independent interface to DB; DB drivers (mysql only for now)";
inherit src;
};
name = "libdbi-drivers-0.8.3-1";
src = fetchurl {
url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz";
sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa";
};
buildInputs = [ libdbi mysql sqlite ];
configureFlags =
[ "--disable-docs"
"--enable-libdbi"
"--with-dbi-incdir=${libdbi}/include"
"--with-dbi-libdir=${libdbi}/lib"
] ++ stdenv.lib.optionals (mysql != null)
[ "--with-mysql"
"--with-mysql-incdir=${mysql}/include/mysql"
"--with-mysql-libdir=${mysql}/lib/mysql"
] ++ stdenv.lib.optionals (sqlite != null)
[ "--with-sqlite3"
"--with-sqlite3-incdir=${sqlite}/include/sqlite"
"--with-sqlite3-libdir=${sqlite}/lib/sqlite"
];
meta = {
description = "Database drivers for libdbi";
};
}

31
pkgs/development/libraries/libdbi/default.nix
View File

@ -1,21 +1,16 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
sha256 = "01zlfv9hd4iv9v1xlh64ajdgx95jb0sjpazavapqc0zwiagwcg4d";
};
{ stdenv, fetchurl }:
buildInputs = [];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "libdbi-0.8.2";
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "DB independent interface to DB";
inherit src;
};
name = "libdbi-0.8.3";
src = fetchurl {
url = "mirror://sourceforge/libdbi/${name}.tar.gz";
sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j";
};
configureFlags = "--disable-docs";
meta = {
description = "DB independent interface to DB";
};
}

51
pkgs/development/tools/misc/ltrace/default.nix
View File

@ -1,35 +1,22 @@
args : with args; let
patch = ./ltrace_0.5-3.diff.gz;
localDefs = with builderDefs;
builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
sha256 = "1nbjcnizc0w3p41g7hqf1qiany8qk4xs9g4zrlq4fpxdykdwla3v";
};
{ stdenv, fetchurl, elfutils }:
buildInputs = [elfutils ];
configureFlags = [];
goSrcDir = "
cd ltrace-*;
";
preBuild = fullDepEntry (''
gunzip < ${patch} | patch -Np1
sed -e s@-Werror@@ -i Makefile.in
'')["minInit" "doUnpack"];
};
in with localDefs;
let
preConfigure = fullDepEntry ("
sed -e 's@-o root -g root@@' -i Makefile.in;
") [doUnpack minInit];
in
stdenv.mkDerivation rec {
name = "ltrace-0.5";
builder = writeScript (name + "-builder")
(textClosure localDefs [preBuild preConfigure doConfigure doMakeInstall doForceShare]);
meta = {
description = "Library call tracer";
inherit src;
};
name = "ltrace-0.5.3";
src = fetchurl {
url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz;
sha256 = "0cmyw8zyw8b1gszrwizcm53cr0mig1iw3kv18v5952m9spb2frjw";
};
buildInputs = [ elfutils ];
preBuild =
''
makeFlagsArray=(INSTALL="install -c")
'';
meta = {
description = "Library call tracer";
homepage = http://www.ltrace.org/;
};
}

BIN
pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz
View File

Binary file not shown.

8
pkgs/games/construo/default.nix
View File

@ -1,4 +1,5 @@
args : with args;
{ stdenv, fetchurl, builderDefs, libX11, zlib, xproto, mesa ? null, freeglut ? null }:
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
@ -6,10 +7,7 @@ args : with args;
sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
};
buildInputs = [libX11 zlib xproto]
++ (if args ? mesa then [args.mesa args.freeglut] else [])
;
configureFlags = [""];
buildInputs = [libX11 zlib xproto mesa freeglut];
preConfigure = builderDefs.stringsWithDeps.fullDepEntry (''
sed -e 's/math[.]h/cmath/' -i vector.cxx
sed -e 's/games/bin/' -i Makefile.in

5
pkgs/games/orbit/default.nix
View File

@ -1,4 +1,7 @@
args : with args; with builderDefs;
{ stdenv, fetchurl, builderDefs, mesa, libXi, libXt, libXext, libX11
, libXmu, freeglut, esound }:
with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {

2
pkgs/os-specific/linux/atheros/0.9.4.nix
View File

@ -1,4 +1,4 @@
args : with args;
{ stdenv, fetchurl, builderDefs, kernel }:
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {

4
pkgs/servers/xmpp/openfire/default.nix
View File

@ -1,4 +1,6 @@
args : with args; with builderDefs;
{ stdenv, fetchurl, builderDefs, jre }:
with builderDefs;
let
version="3_6_3";
localDefs = builderDefs.passthru.function (rec {

38
pkgs/tools/X11/x11vnc/default.nix
View File

@ -1,27 +1,23 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a";
};
{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
buildInputs = [libXfixes fixesproto openssl libXdamage damageproto
zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
libXrandr randrproto libXext xextproto inputproto recordproto libXi
libXrender renderproto];
configureFlags = [];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "x11vnc-0.9.3";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
name = "x11vnc-0.9.10";
src = fetchurl {
url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck";
};
buildInputs =
[ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
];
meta = {
description = "A VNC server connected to a real X11 screen";
homepage = "http://www.karlrunge.com/x11vnc/";
inherit src;
homepage = http://www.karlrunge.com/x11vnc/;
};
}

42
pkgs/tools/X11/x2vnc/default.nix
View File

@ -1,26 +1,22 @@
{ stdenv, fetchurl, xorg }:
args : with args; with builderDefs.passthru.function {src="";};
let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */
fetchurl {
url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
};
buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
doCreatePrefix = fullDepEntry (''
ensureDir $out
'') ["defEnsureDir"];
configureFlags = [];
}) // args); /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "x2vnc-1.7.2";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
meta = {
description = "A program to control a remote VNC server";
inherit src;
};
name = "x2vnc-1.7.2";
src = fetchurl {
url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
};
buildInputs =
[ xorg.libX11 xorg.xproto xorg.xextproto xorg.libXext
xorg.libXrandr xorg.randrproto
];
preInstall = "ensureDir $out";
meta = {
homepahe = http://fredrik.hubbe.net/x2vnc.html;
description = "A program to control a remote VNC server";
};
}

2
pkgs/tools/filesystems/dosfstools/default.nix
View File

@ -1,4 +1,4 @@
args : with args; with builderDefs;
{builderDefs}: with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {

23
pkgs/tools/filesystems/fusesmb/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, samba, fuse }:
stdenv.mkDerivation rec {
name = "fusesmb-0.8.7";
src = fetchurl {
url = "http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/${name}.tar.gz";
sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
};
buildInputs = [ samba fuse ];
postInstall =
''
ensureDir $out/lib
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
'';
meta = {
description = "Samba mounted via FUSE";
homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/;
};
}

12
pkgs/tools/filesystems/relfs/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
, libuuid, gnomevfs, pkgconfig, GConf }:
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
if args ? src then args.src else fetchcvs {
src = fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
module = "relfs";
date = "2008-03-05";
@ -40,7 +40,7 @@ args : with args;
};
in with localDefs;
assert args.libuuid != null;
assert libuuid != null;
stdenv.mkDerivation rec {
name = "relfs-2008.03.05";
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A relational filesystem on top of FUSE";
inherit src;
maintainers = [args.stdenv.lib.maintainers.raskin];
platforms = args.stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

28
pkgs/tools/filesystems/smbfs-fuse/default.nix
View File

@ -1,28 +0,0 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;
sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
};
buildInputs = [samba fuse];
configureFlags = [];
postInstall = fullDepEntry
(''
ensureDir $out/lib
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
'')
[ "minInit" "defEnsureDir" "doMakeInstall"];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "smbfs-fuse-0.8.7";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
meta = {
description = "Samba mounted via FUSE";
inherit src;
};
}

2
pkgs/tools/misc/eProver/default.nix
View File

@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, which, texLive }:
stdenv.mkDerivation {
name = "EProver-0.999";

33
pkgs/tools/misc/rlwrap/default.nix
View File

@ -1,22 +1,17 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
sha256 = "07jzhcqzb8jsmsscc28dk4md7swnhn3vyai5fpxwdj6a1kbn4y3p";
};
{ stdenv, fetchurl, readline }:
buildInputs = [readline ];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "rlwrap-0.28";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "Readline wrapper for console programs";
inherit src;
};
name = "rlwrap-0.37";
src = fetchurl {
url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
sha256 = "1gcb95i839pwn9a3phs2wq7bwz9f6v8sydq6lf9y4gm3hk0s40w4";
};
buildInputs = [ readline ];
meta = {
description = "Readline wrapper for console programs";
homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
};
}

27
pkgs/tools/networking/nc6/default.nix
View File

@ -1,24 +1,15 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
};
{ stdenv, fetchurl }:
buildInputs = [];
configureFlags = [];
});
in with localDefs;
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "nc6-1.0";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
src = fetchurl {
url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
};
meta = {
description = "A netcat implementation with IPv6 support";
homepage = "http://www.deepspace6.net/projects/netcat6.html";
inherit src;
homepage = http://www.deepspace6.net/projects/netcat6.html;
};
}

49
pkgs/tools/security/ssss/default.nix
View File

@ -1,29 +1,26 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
};
{ stdenv, fetchurl, gmp }:
buildInputs = [gmp];
configureFlags = [];
doPatch = fullDepEntry (''
sed -e s@/usr/@$out/@g -i Makefile
cp ssss.manpage.xml ssss.1
cp ssss.manpage.xml ssss.1.html
ensureDir $out/bin $out/share/man/man1
echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
'') ["minInit" "doUnpack" "defEnsureDir"];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "ssss-0.5";
builder = writeScript (name + "-builder")
(textClosure localDefs
["doPatch" doMakeInstall doForceShare doPropagate]);
meta = {
description = "Shamir Secret Sharing Scheme";
inherit src;
};
name = "ssss-0.5";
src = fetchurl {
url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
};
buildInputs = [ gmp ];
preBuild =
''
sed -e s@/usr/@$out/@g -i Makefile
cp ssss.manpage.xml ssss.1
cp ssss.manpage.xml ssss.1.html
ensureDir $out/bin $out/share/man/man1
echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
'';
meta = {
description = "Shamir Secret Sharing Scheme";
homepage = http://point-at-infinity.org/ssss/;
};
}

33
pkgs/tools/system/gdmap/default.nix
View File

@ -1,21 +1,16 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
};
{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
buildInputs = [gtk pkgconfig libxml2 intltool gettext];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "gdmap-0.8.1";
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "Recursive rectangle map of disk usage";
inherit src;
};
stdenv.mkDerivation {
name = "gdmap-0.8.1";
src = fetchurl {
url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
};
buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
meta = {
description = "Recursive rectangle map of disk usage";
};
}

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

@ -785,9 +785,9 @@ let
});
gdmap = makeOverridable (import ../tools/system/gdmap) {
inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool
inherit stdenv fetchurl pkgconfig libxml2 intltool
gettext;
inherit (gtkLibs) gtk;
inherit (gtkLibs216) gtk;
};
genext2fs = import ../tools/filesystems/genext2fs {
@ -1228,7 +1228,7 @@ let
};
nc6 = makeOverridable (import ../tools/networking/nc6) {
inherit builderDefs;
inherit fetchurl stdenv;
};
ncat = import ../tools/networking/ncat {
@ -1584,7 +1584,7 @@ let
};
rlwrap = makeOverridable (import ../tools/misc/rlwrap) {
inherit builderDefs readline;
inherit fetchurl stdenv readline;
};
rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
@ -1666,8 +1666,8 @@ let
inherit fetchurl stdenv;
};
smbfsFuse = makeOverridable (import ../tools/filesystems/smbfs-fuse) {
inherit builderDefs samba fuse;
fusesmb = makeOverridable (import ../tools/filesystems/fusesmb) {
inherit fetchurl stdenv samba fuse;
};
socat = import ../tools/networking/socat {
@ -1703,7 +1703,7 @@ let
};
ssss = makeOverridable (import ../tools/security/ssss) {
inherit builderDefs gmp;
inherit fetchurl stdenv gmp;
};
stun = import ../tools/networking/stun {
@ -3350,7 +3350,7 @@ let
};
ltrace = makeOverridable (import ../development/tools/misc/ltrace) {
inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils;
inherit fetchurl stdenv elfutils;
};
mig = import ../os-specific/gnu/mig {
@ -4018,6 +4018,9 @@ let
inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
};
glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11)
@ -4535,11 +4538,13 @@ let
};
libdbi = makeOverridable (import ../development/libraries/libdbi) {
inherit stdenv fetchurl builderDefs;
inherit stdenv fetchurl;
};
libdbiDriversBase = makeOverridable (import ../development/libraries/libdbi-drivers) {
inherit stdenv fetchurl builderDefs libdbi;
inherit stdenv fetchurl libdbi;
mysql = null;
sqlite = null;
};
libdbiDrivers = libdbiDriversBase.override {
@ -5328,6 +5333,7 @@ let
inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
mysql libxslt curl pcre librdf_rasqal librdf_raptor;
bdb = db4;
postgresql = null;
};
rhino = import ../development/libraries/java/rhino {
@ -6028,7 +6034,7 @@ let
};
openfire = makeOverridable (import ../servers/xmpp/openfire) {
inherit builderDefs jre;
inherit stdenv fetchurl builderDefs jre;
};
postgresql = postgresql83;
@ -6343,6 +6349,8 @@ let
inherit fetchgit stdenv autoconf libtool texinfo mig machHeaders;
automake = automake111x;
headersOnly = true;
gccCross = null;
glibcCross = null;
};
hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread {
@ -6595,7 +6603,7 @@ let
else iwlwifi4965ucodeV1);
atheros = makeOverridable (import ../os-specific/linux/atheros/0.9.4.nix) {
inherit fetchurl stdenv builderDefs kernel lib;
inherit fetchurl stdenv builderDefs kernel;
};
nvidia_x11 = makeOverridable (import ../os-specific/linux/nvidia-x11) {
@ -7148,7 +7156,7 @@ let
});
clearlyU = makeOverridable (import ../data/fonts/clearlyU) {
inherit builderDefs;
inherit fetchurl stdenv;
inherit (xorg) mkfontdir mkfontscale;
};
@ -7194,8 +7202,7 @@ let
};
junicode = makeOverridable (import ../data/fonts/junicode) {
inherit builderDefs fontforge unzip;
inherit (xorg) mkfontdir mkfontscale;
inherit fetchurl stdenv unzip;
};
freefont_ttf = import ../data/fonts/freefont-ttf {
@ -7291,8 +7298,8 @@ let
inherit fetchurl stdenv cabextract;
};
wqy_zenhei = makeOverridable (import ../data/fonts/wqy_zenhei) {
inherit builderDefs;
wqy_zenhei = makeOverridable (import ../data/fonts/wqy-zenhei) {
inherit fetchurl stdenv;
};
xhtml1 = import ../data/sgml+xml/schemas/xml-dtd/xhtml1 {
@ -8069,7 +8076,7 @@ let
};
gocr = makeOverridable (import ../applications/graphics/gocr) {
inherit builderDefs fetchurl stdenv;
inherit fetchurl stdenv;
};
gphoto2 = import ../applications/misc/gphoto2 {
@ -8649,7 +8656,7 @@ let
};
qemuImage = makeOverridable (import ../applications/virtualization/qemu/linux-img) {
inherit builderDefs fetchurl stdenv;
inherit fetchurl stdenv;
};
qtpfsgui = import ../applications/graphics/qtpfsgui {
@ -9027,16 +9034,11 @@ let
};
x11vnc = makeOverridable (import ../tools/X11/x11vnc) {
inherit builderDefs openssl zlib libjpeg ;
inherit (xlibs) libXfixes fixesproto libXdamage damageproto
libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto
libXext xextproto inputproto recordproto libXi renderproto
libXrender;
inherit stdenv fetchurl xorg openssl zlib libjpeg;
};
x2vnc = makeOverridable (import ../tools/X11/x2vnc) {
inherit builderDefs;
inherit (xlibs) libX11 xproto xextproto libXext libXrandr randrproto;
inherit stdenv fetchurl xorg;
};
xaos = builderDefsPackage (import ../applications/graphics/xaos) {
@ -9250,9 +9252,10 @@ let
};
construoBase = makeOverridable (import ../games/construo) {
inherit stdenv fetchurl builderDefs
zlib;
inherit stdenv fetchurl builderDefs zlib;
inherit (xlibs) libX11 xproto;
mesa = null;
freeglut = null;
};
construo = construoBase.override {