From 907bb1aac65dd3acbdd2b6be831a82d051b8c5c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Jul 2010 18:55:16 +0000 Subject: [PATCH] * ltrace: updated to 0.5.3. * 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 --- pkgs/applications/graphics/gocr/default.nix | 29 +++----- .../networking/p2p/ldcpp/default.nix | 8 ++- .../virtualization/qemu/linux-img/default.nix | 43 ++++++------ .../window-managers/fbpanel/default.nix | 4 +- pkgs/data/fonts/clearlyU/default.nix | 52 +++++++------- pkgs/data/fonts/junicode/default.nix | 50 ++++++-------- pkgs/data/fonts/wqy-zenhei/default.nix | 21 ++++++ pkgs/data/fonts/wqy_zenhei/default.nix | 27 -------- pkgs/development/compilers/qi/default.nix | 2 +- .../libraries/libdbi-drivers/default.nix | 64 ++++++++---------- pkgs/development/libraries/libdbi/default.nix | 31 ++++----- .../development/tools/misc/ltrace/default.nix | 51 ++++++-------- .../tools/misc/ltrace/ltrace_0.5-3.diff.gz | Bin 9636 -> 0 bytes pkgs/games/construo/default.nix | 8 +-- pkgs/games/orbit/default.nix | 5 +- pkgs/os-specific/linux/atheros/0.9.4.nix | 2 +- pkgs/servers/xmpp/openfire/default.nix | 4 +- pkgs/tools/X11/x11vnc/default.nix | 38 +++++------ pkgs/tools/X11/x2vnc/default.nix | 42 ++++++------ pkgs/tools/filesystems/dosfstools/default.nix | 2 +- pkgs/tools/filesystems/fusesmb/default.nix | 23 +++++++ pkgs/tools/filesystems/relfs/default.nix | 12 ++-- pkgs/tools/filesystems/smbfs-fuse/default.nix | 28 -------- pkgs/tools/misc/eProver/default.nix | 2 +- pkgs/tools/misc/rlwrap/default.nix | 33 ++++----- pkgs/tools/networking/nc6/default.nix | 27 +++----- pkgs/tools/security/ssss/default.nix | 49 +++++++------- pkgs/tools/system/gdmap/default.nix | 33 ++++----- pkgs/top-level/all-packages.nix | 59 ++++++++-------- 29 files changed, 335 insertions(+), 414 deletions(-) create mode 100644 pkgs/data/fonts/wqy-zenhei/default.nix delete mode 100644 pkgs/data/fonts/wqy_zenhei/default.nix delete mode 100644 pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz create mode 100644 pkgs/tools/filesystems/fusesmb/default.nix delete mode 100644 pkgs/tools/filesystems/smbfs-fuse/default.nix diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4d3d33f58f5..4b2ebceda47 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -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"; + }; } diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 52491aa29fb..79e7601e46e 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -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"; diff --git a/pkgs/applications/virtualization/qemu/linux-img/default.nix b/pkgs/applications/virtualization/qemu/linux-img/default.nix index 748f67c7448..23e2ab17477 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/default.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/default.nix @@ -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"; + }; } diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 6aa47a490bd..c7bba46ec05 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -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 { diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 69296a45c24..32050ac5c28 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -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"; + }; } diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index f991a387976..eb7547e628f 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -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"; + }; } - - - diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix new file mode 100644 index 00000000000..ba38d8dc1ab --- /dev/null +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -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"; + }; +} + diff --git a/pkgs/data/fonts/wqy_zenhei/default.nix b/pkgs/data/fonts/wqy_zenhei/default.nix deleted file mode 100644 index 4b6120ad108..00000000000 --- a/pkgs/data/fonts/wqy_zenhei/default.nix +++ /dev/null @@ -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; - }; -} - diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index 8f094f9965a..f1f34f87d69 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -1,4 +1,4 @@ -args : with args; +{ stdenv, fetchurl, builderDefs, unzip, clisp }: let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index bb146a5cddf..6f61d9b3cad 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -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"; + }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index b908c76fa78..11bb4965a4e 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -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"; + }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index d33f7ac566c..a436f29df14 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -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/; + }; } diff --git a/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz b/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz deleted file mode 100644 index 596e5ad6eb0ac3f88bb9aa8616818921b7643327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9636 zcmb2|=3tQay5Yve{3bfP`1X!Te`Wr2^=uBEsN6Ye#r8)_)>!lxUMq{K^U>N}e%g8B zgcig2)9s>X*ZzH9y^HbH!-$D<-Yj4HTBXZ_DPi%&+FvEi>%vwaIxlp5>eXFWw=Ht< z&AKEX{Vr~2Ok8DBo}6rF*6PcvzPQZ%_quEGV%v{zZW^14Ej97Jqo7yYy?MzmwGyUC zLGk6+U#{f}T_zL%S9kC2i+{?rgew)|_KSUG{^o6Kz8OpB3dt=|^7=mUQ=HtCKN@pnMBdJ;wXaKE zzee75rG_61Lw{Xr1gJjuCBTucQ|EE8E`t#(^ zV~0CSwB~TsUH%vMb>h_v*TWt^Y|?pmd6voRh;F0$OI;Dy#eY}`{$C*%{^4W)Ds^V{ zIX{a0_e{=v;u)y*PKLvNR%mUder@6u@9gPZ95S6YQ#&h9l&{_UDte|C|9N3am+vaO zh0nEK>^$LoM!$5iOP9sOjYpQMyA@CLRdw?>mUMXSFOj%r-$b7Ky^Y*cyAJF;Y;gR- zX$$_lKCTNV+D`0y-cysgcGV&65W`dI{aIFBnH^VV*@b-l#Q5^ox^SySIpVvf-8Y)q zvP7@3Z2R%`^K4h|ZJD*TYW|{_kDI>TEm$b$=cv8ouu`YS`A0UwecZa0OYD0@)i0_P zG8rD@mY04W)j!$q;|!6RD;aL}WCn;{D&ly#Blw}!KL5L?`FFYR+FfaU?|DFac<)s0 zW2dJ7Ic3YpaU%Av^1ib-8k3(sl(vii8}R&{+Fa=~8$F-@xMEe$cR1+r-lfx69DvBE(9ojyu-on2jaSQVdtcBqd7d&+>)|0!HMWgz1q-bI zy|P*Qt{aSzs7SPEq!_5&QJNOX}dbRwu-I)c*~k0S8h}D zj1On>9ABvIu~hKA_*91fu(iXEkJc~ldFV1c>`SnjHz8lF&vLewglU`K^ncC&@2shaf*7#y~DkS@f5q=%=l!@PJ{enXS3ZifHuOApXrJ-1;;f$bJI-p4&f9Ng z(T|&O<41AK9=Wja*gtFTh%bH2eDTHi-3uhYzRS~KdB5K#S@YpjPcwo0z1M`rH|*aY zq`FX~{bR>|8Q;YYQ3jkm2Q4;k{G7@%Uub```Mpl(eH(r}@@S3Ne&FPlxl`L$X$i|O zac`TZZuo4bm*%V5$uE_gza5pl*Cz4RF0fqlpFPiyD7mFt8xC>&<;|(p7dE*ppq_vJ zi0c&pW#vJ~Rx;%;w>};yq{=6KHu079Oq)}|-n~r5XTL9(Pgs+a(toOC>7Q!RiHA-; z<`3RyBek+q^wgQ6BA!A=i>kssfd*0L(L4v=JAD*;Rj}Nlw(!M;-o;lq-TVXv_1dN% zpIvfKeEyu>H7a(V4eFVH^>^8LEn!zMocyr${AP~C0-jY9`j4+>P88VP)!+AHf`{h1 zMTKUIJ!?A-Y>0He5b+}FNWu;8)i1v|{&!}ubxxhg$2Gizp^NG#;MkNiTyekc;k8wO-PR8JHLMazN9b?B{h}LK0HgBZY-bCC8=U? z)-r^#y|%vckF^!g{dsfd#nh|bw4W0*fB*hnLh^R;T?-qI#?6mQHI75aV6guBM+>-uBAET*_CFY4c7@nMeSi>02Hbt$GE9VdTiFS_d> zt-h!Ec=zfxN_Hy@cl=?u@0!$AA-z=c=gFG^9lP#kTv^?#77%bJhPPgXZ}Oe#FWUlE z%wOB$=*M&Fe0}oUCWb2-`^Byr>Q3W|wQsKqGv!|tmHi?ywVapZrnV>`r}~`v(5i+e3mEs zg(v-Yzsa#S%2j8Yx4LroRs^08h(CF1|D>t)s@nFG*Z6emHQVGKntb%Ls7vPe z(rrmkbQacbtz>X+{=qR}z016Yrrn>f*O@547k;#K$CRAgA--3mu8K$&Epk6#$1q=L z>3zN(>?-#d3s??KUDc81%=5YPLCMmK@>imptAeMz-mz?B*wQWAJ$^FoY}&52!0U31 z)XTcSP0tqGmAP^ExN3IJ#5XbLT;!UqJ!Y(VnA4ip{9;}X_l`;JDY_{e45GtcRUKj4 z`JC0Z_rcTS^Y!=5n^V6<=XHW%^~9zHf{dr06;A1z^x9oB)j$99$SipY7R# z^~F!RXFM+2)a$r<|3RCm=(CT5`d0XylGc8#!c}lMnWxmKT&poU(M0*(+%t^HGn)CA zr2gLV>v2qfK~C7Oop;}Ft2%q?bK2s&ufM+hAGi13@=nWn>OP-31!g=mT-wK7{9wn= zwTqk|{|Y{*U9sNv)h)K}rL47i+jrOg(EcRjkg3JVbE1cHpT;_eg4Gw^e4pdwsTppX z)qJqY&be7Ou-$4lb4MIoWbJ~B%dWo34b56ODQ)lN*Educd_Sk`u-YrjlB|+ZGQBBr zrSx6L)tenRybHT**XN|8I{mvQi|qdD>aANUcRgC*X5%H{^dn2s>jOtj5{JZW?m5t-K~D!E!8@T zz0rH|<`|aSa$BsM-LfAm{kdWFulQ~0|5OL5%!CaO&dgxjnE02YMx6Uu$6vz?rx%JM zX#ombCceow709yraHQ>S?)8VAW$W*){GQQO+0*08wW{^#gUwP)<-cT^{XQ$UT`iaC zMM}ka-jjE)Z>YTccB}Lv>7eBrohv(3kJ?7?s_(V?(D$u$lIN`e~$+Wuv z(aH+#$)1T(#{~r6b0j7z&NykCsPWw7noxsyU1)`UwW#fXNp?oBtZ-dA2Xt4V}1D}FBI+|Fck`r%s9)GuLb zc?Vi~6XT6Gyx$ZSm=z_vx^RP+{P)$Ndztsd2XvWArIz37jr;vz`f|RqD=+eARNcOH zO5NP~s=>9XJEtn_T`S__mApmsg-zuyx0kMIE@Cq?ITnQQ^94P5BB;y0J#Ry>xGZ@ec#_{fTLkQ)2Yb@k~3{ z>EUp5@p5<7{W0rf)|5QsuzB!v*0XGp*NOYg7VOxgz4?!8#nnay?yhY!ThxNv#0 z?ul=j-?wh*z1I-4PtE@{<>bP;2HyKCR%HA~m1?3>IYYRn$2zsi6+&UfOs zn=iiIR6E%ESE;4mFKjQwLn7=zP zYvr4>4!?6}ZY%6aEizb`DctnoqkwGMds+MAC2BGX!gBH7MU+D8PiL&@f7p4^=5pcu zV^@NfGER+F5Z6sB{G=*qe`y78(6#N|Qx_^*g>@l|`1SWBX=3Kr?7eNVW* zA>fp9w;5a7G;0l&r7v{&_vos7i?bdHy1wxF5t0AXrF(a`PEM`=q!3#Z>$qDz;NG*IDEzVOTE9bk+ztdA2j)-z zcH;8&*}{j#>cdtqTl9O;hYpwN?>O?zs$7NZxx`A?Zh4(c)$&}%vM~Ig*8VE{i1;|Y z7|~;249dC}y?r0R8FF%&mEe}{b>1-xi5F*oW*#o7Y{9yUG(6 ze0nm&gSz+=Th?qjEN665ZC&)di{D-foj7pW`Cjt>@(G&f#oHI}UMzCjzg^&mYRJEY znj}>_&c5|U5(aO|B-Gn}Hcoz=U(PI(|G4(p(gQOi#AknryC@ucu27q~CPSzCp`#S6{OpzP{YleEt<34c)|>9%*T-)m1%Ap8I%;%XpvoIq|@=H`c;Ccjb935!XM{ z-0&*7 zRM!<>l?nOF_T=oEUG$sE&Ge7~5xI`!t)(ASp|Wms;Xj;)PrRDC<^t%S4D z>gBC$h9O$&$?D%XFRxrO*)g8gy=jB+~_#Wz>?uhg0_?^N^G1wsd|Wh(Rfs9#rF zC$c=V{P{esn=aPfceOU(W4(Lx+va!k=T>dLx?;xrw|#ei?wmW_-)~2N^X`o|lXgXG z-?(*o>(mRuM#4vw7_vMKzq(eaXt7UPUT)drU+cNzmGQ#K(x+VY&Nr}KU-4p*@Y{8> zlpUv?KDI@rKU47cmTJRCiv<(S=1h6<#E9cXY;*jT!2Aox?tf#GEiF@$f94|ZGqZo@ zj5Cj42C_EIwUi0Xsk!hhWcB}wkd52Z%M~BbJe(EtX0G(Jh+9=+Zy#J=qJH@`@0)LI zFUwDV%Mn~LLCj9Rf8&RcSxZ0vz$ zCyUwoe!&;=CwuzeZkQ+XrCamwqn@ZO!T0X8T)*A%#NA__#`+cMSEhLa{Xk{S@Z9#-E{uo8xf28 zZ3W)?ecd*7o#4yLYOPkaXP2U5e*~PnHhJExGhNL!R*!Yos@a+tgnVTe`6%yDJULkI z-_$$ucdZ}ZFFDQiZtJZwmAJodo3H-oT&Eg#xHLH+|Fy~oL)q`!77EJmOAW4L*k9A} zJN;+H;`FMv*4Y6StC!up^L+BHElap-;x$*!y1S!XaQ+^n{kF@mONe_+{UNZrGPQNH z^tynH-_OKOzZN}j*Jb_{9sidcnOy5qQ~0U#=0S@yX(bz{z3nRvy*y{Sp4*-&_uhMa zT6x2Ax*t=h@1k(+nI`Xhg?HNgukkGojrq#?Wb)z5e6RE;4eO&HSwSLzO7aTGE1{sR!lv6GNIz{4yh+=W;82ZJId2A z@4`W*`<}+dJpr#LTw8y{>iW}jwZ_LiIRsW*YOGqc@V98##y`&jmi-gXG^ki|^6d;k z$E~x!-ITh`u{+bprmv^bFU@#jBmc}EzZFv__rLbpeDAgC?d;=g#iWIHm6`G}uUf09 z`DBgS)F)^DN8jH1Zd2*P2%ug z|A-El?Nf@6Zlou@_mn>QE#OxqT8HnWN)ex;Y`>VGc3f{cz{ z_P?#ivBBY?rqgPvH-{f|_cL_o3E$mXxM}^Qovx3!+`b$9yn}V)YzgCYj^+xRZY)R@ zoAd8mUEYes+J$RodoDR7$x^F+>83(slE~(UT{~`^Iux~^Z7ULsQzM(o*^PE@!hE7X=eA5y%k|<8e;w|=hyAqy3R79W#I+%2H=)wXMEKd#*DEF;4c?IyzSC3C#PQ~hPp;zd{AZk^lo^q&9qNirMcn6Cd8 zaqquSJENjPsaE*PjM^PXMO5;xhDwXhpBK9z?)Evq(|rk+1$k36I^9pMdec*U+F;+L zPhLxAaOEwmTC?HOLp_4yV_jU{4U%y?-H&&!Z{Qu|gFXr#Rc&Oy^hPu26d1e9c z<{e&oOCCQLa0^|ZU}0* z+V8l*MQr1zKkjRE&y~-+>Sb24$&Io3>od>2H~p@kWofzjQ*NzulX8=su7w+GZlQmM z?zfWt>!;Wzv{s5&&k<@2__BkwtbUEarOTNmeHP0dxG!D5dT{ZogxK$wgT5BHt#EE%2{UQKklH1F#z z)>qH;d^4DGj;^=njXq_&tM#VTuJ`%%Me^_JcJ1Gxb=a#x>=Z-Pm9P8fvS=&3KK5n5 zbb^uZl0zOmZ7=t-R`s5c2+#Jvu^&~sXV7f`uxEM+tmaTp9*)(mhkI4ZQk|Aq=orkF^jvAqt27$G31 zME+Y_qf?pMI#F{_ZDc=^o-S2zH;6vp%???e)7-v6X*#!k*4Z;R#*sVR42<0%&^^7d*i zeW3N~gWxl<2^ZxYR2G$pnB^?F>?GipzMk`J%9#yX(U+5#Y`&fsw)xyN)^;_$8OoU_ z*YHhax^?SElr59j%;VSZW!I>lHH-CP4zgJ-sQ;XYyKdRt+b6t!ZJZ*;Kb?C{niY#e zg+R(I)~2s@ucop`muzLyQ&ea=-&o4@<#B@8xysoZ8?~B$)-_aqTkeyg(-XF3>*Qk-e!0%dny4bi zb>?KK&w@1BkM1vao@1GD>hroIXJjKZ(*ss3PcuEb%jlb3HPf>MpP7BE?ent^v|N6f zdwFHr5gm&atKK+^yL>&n?(Wukdt9n|(+_GrNO+p?<(il6sg!R@kEZRjP+P_o*nQ;j zAt#;S`!d)6-)}9gtgVcei?F|c_kTyh!(TyKM-^{J2e#G!G`f9l?g5p4)f!LksOb-u zZolI{H(z&8%2yws?#J_krZQ|hxc>FY_YSX&^qdzM*1Me!k2>#NERwWs%B+r*<9C#+ zZ1#RN*zx-NdOc|=`wKbul*AQIG<}HOdH#rBNTFg%F}L`9WuK}Cs$nv&?hKm}rfVKL zaABWX^)}v?!d>!-2?iw=$Im`XT)`z7peDDx;K-Yf0I;wjziK9wx8SQtyJ5GQ@JW_+ zV!(og8+V8z!kIFwy+ZE0W+?d{PRMDKFAoqQVLC^}W zYBpP&2mkv|ADP&?&21;k{R2BPE*s2Uzwk~7|2cuROCOr;TlRc|LkI7x8P)sb4fgE| zdt)A_A5tY_G0j3og1I1|Zk5<6%S($2HXONqrtirXhFMSFh{)V;E!?!JZIhqm3XZ-x zDjxlcQ}Q2V&fWZbT{73EnVlK`0yiX1Iyk{um&2ned&zz~>9cOuMu$H8R=%7t;plIp z{um9Je5Z3Fn>#07pYlk(S^D~^DTfyw`q{B1Ds)qf7uRX4v%!{8{i%m8e9M@t@Sa`s zR5Z&E`Lol#pCwLO<#}Oh(k92guM6xu%GEV*^ryZ4c}S)GzQTs!=S-4*c~#7Z&+XN} zuz%-QUdF!@)3bA&_Z@!cSMot+SESFAqo%KmUU&F*+{)tp5FR zdh$4FGN;$s^9Q@;>^XkG+TV2D^DlEI$DKZLCwI!kCjHY2e1)xhXIkp9@Xum3VBC0H z%6dzN(T_0mJr!BbYP%AP1nj#b8QNy5{$3ogz;F7YDouGcruHb?Q z8l89g1;4p3<8*Pe3BrQ=E*t$in>%GqSy_d~j;hG62A(;d#WCN`v&)y28bzo+T(vRo zoV4R2$Ca&H|GEf;oW67Ro7~+g>D?Zw&$zBF38{Iys>xXM;@MOFaVKQ>ethB)OTKu( zA@t7S6IYgcX7gAj377}*Ic>W(B{E>Okl97=rlTinT_38Sx@TKcUR#`cGUoGB=5!yY zwO4u?3vP&TWFPL?`fY~cv+qKA_G{XoO8xm8aIV8&=ym%ZgJ1{Y8TEEkiW_bLb!)aw+u?(EpT_Ro(Z<0<4 z>itttK9haPb9*EI)ZcCWmB)BZ>%K1E-`!L5r?5uBEJpU5)S-hPRsF=hl`b1U%y{r& z!Tl0m*3=_Ue;dBI8o}_)bpL+8n={Ue8Zv1GmO$?x~(`?MS}Z&Og@EN)+>UK`MXpWg)XbR|VyfjM{^Wf4Pea4~vTcti z9SA#^7{2=1-{zZ5e_w8U+iY9@+%b3WgZTzW*2e~3NSc+trb#kv%g*CnlP(?;KX;DT zto>2_HG}Ga{F~t^*koh2sYzk8-$v%Ix!!y{bLsU=)p{$gRPCFS48;>q+&CuvIYVW?^v@0Jc7ET$ zRCgiZmH*=9tu@lGpWKo!77d)HKmTpsq4|q+?^vw5ST$2#$fiW=*|~-_4^+={+yB3G zN{iP>3a`TK%hOd|z)p>H2YiNM!3DZqmW$w8PDmMMI58rU(&M~{vV<%N)LVXTP zsAmVCY>5#onHv3W>LPJ9SA8F@I1jF0Azy6xjx5i9cF8kPvqsy1pWU15_uf0#6kb%` zSTgH#6Dyz4+VifwzTdJkHmzOgZeeq#_Gr&7OR>dM&+onX+<INz^V5b&vLw0kYp7XI+1mZd zT18r}e`EEx{Jf#D$nwsNB(L-8VG0~_S0z$Tm;7C-!XL1y+mB~~tWm&Uo9j#_wrIPK#Y;07+w$_-ne|ppIi_?#8DTs33 z*=V1ydHl3pQw?jcok0!HmZx1h=fXdp$liSN>9#wZuf*?go+?)>dvVPE$Lvo>FSFLX zkal1B&-(N+?Oz^O*WWN*U83LoV9Ig787cRo9?1qUeTdtCy=1lgUFMGRUwi95I;H#+ z`~D}fcmIM+M>qcK@7L$En{xjvU4Q@nrK1g*7azR(mmGNWC-1b6{~h0dePkJOAn~JX zo4R^Z#47uJJCX&88Fwn#`?pH{&AuP^|7dwc)#?k|Id*z1#!J6xDXT81f;9qj>;T`3#(;md#-Lrd#Wqn13V*QpmXN$f+{&}?h_3hQ- z;qrIu{xfY6e?7Z^CsgOUXr$qbj2ga zL&3V1wvE<(ul%>iUXgb%;h22+q}228;_`Re=l}Y<`}e`->g)SklnU3T-|~^awR8Wj zeS78R+>f!J!@ur*-d*`$8Od5ZMZAKWZdv4)iLX3l$Go>gkK^dqHvV1P%WJQ+~3qdi%(3{>)YH9Uo50 d*}Ni)sa$8JwAbq&?tlJ?t6xgY&#q)(008C|vseHC diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 2b32020d8e9..0de0732b374 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -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 diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 84a699d1a14..f2e12f22912 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -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 { diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index 780e19757b2..b139867be60 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -1,4 +1,4 @@ -args : with args; +{ stdenv, fetchurl, builderDefs, kernel }: let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index dae058d3292..e5e5273783f 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -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 { diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index b8587ed223f..bc846312835 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -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/; }; } - diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index c65105e4796..a3d21ab1800 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -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"; + }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 43691c22714..7ef741753ba 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -args : with args; with builderDefs; +{builderDefs}: with builderDefs; let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix new file mode 100644 index 00000000000..4bc9348adbf --- /dev/null +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -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/; + }; +} diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 178aa700fa5..2eb8e3a0b3b 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -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; }; } diff --git a/pkgs/tools/filesystems/smbfs-fuse/default.nix b/pkgs/tools/filesystems/smbfs-fuse/default.nix deleted file mode 100644 index 4b656b70388..00000000000 --- a/pkgs/tools/filesystems/smbfs-fuse/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix index 30353e122c1..ff92b235e09 100644 --- a/pkgs/tools/misc/eProver/default.nix +++ b/pkgs/tools/misc/eProver/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, which, texLive }: stdenv.mkDerivation { name = "EProver-0.999"; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 1b9bbb995ac..7402209960d 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -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/; + }; } diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix index 5cba3ae017c..348fc2e26a6 100644 --- a/pkgs/tools/networking/nc6/default.nix +++ b/pkgs/tools/networking/nc6/default.nix @@ -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; }; } - diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 15288361baf..3816df415c6 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -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/; + }; } diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 73d3ff92323..f361e862b63 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -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"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61d3bc99cc3..ef0c3cf07a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {