From 907bb1aac65dd3acbdd2b6be831a82d051b8c5c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Jul 2010 18:55:16 +0000 Subject: * 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/development/compilers/qi/default.nix | 2 +- .../libraries/libdbi-drivers/default.nix | 64 +++++++++------------ pkgs/development/libraries/libdbi/default.nix | 31 +++++----- pkgs/development/tools/misc/ltrace/default.nix | 51 ++++++---------- .../tools/misc/ltrace/ltrace_0.5-3.diff.gz | Bin 9636 -> 0 bytes 5 files changed, 61 insertions(+), 87 deletions(-) delete mode 100644 pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz (limited to 'pkgs/development') 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 596e5ad6eb0..00000000000 Binary files a/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz and /dev/null differ -- cgit 1.4.1