* 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
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
@@ -1,4 +1,4 @@
args : with args; with builderDefs;
{builderDefs}: with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */
fetchurl {
@@ -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/;
};
}
+6 -6
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;
};
}
@@ -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;
};
}