* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14073
This commit is contained in:
Eelco Dolstra 2009-02-13 13:49:29 +00:00
commit 48eb3bd187
9 changed files with 66 additions and 64 deletions

View file

@ -3,7 +3,7 @@ args.stdenv.mkDerivation {
name = "thinkingrock-2.0.1-binary";
src = args.fetchurl {
url = mirror://sourceforge.net/thinkingrock/tr-2.0.1.tar.gz;
url = mirror://sourceforge/thinkingrock/tr-2.0.1.tar.gz;
sha256 = "1fsanxh0li8yqsspagx1w1ykmvfnm6h44i6gd02v05abx8q25jk1";
};

View file

@ -81,7 +81,7 @@ xkb_symbols "altgr-intl" {
key <AB02> { [ x, X, oe, OE ] };
key <AB03> { [ c, C, copyright, cent ] };
key <AB04> { [ v, V, registered, registered ] };
key <AB05> { [ b, B ] };
key <AB05> { [ b, B, emdash, endash ] };
key <AB06> { [ n, N, ntilde, Ntilde ] };
key <AB07> { [ m, M, mu, mu ] };
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };

View file

@ -1,36 +1,31 @@
{stdenv, fetchurl, cmake, qt4, xlibs, bzip2, libxml2, libxslt, perl, exiv2, aspell,
pthread_stubs, gst_all, xineLib, fam, log4cxx, cluceneCore, redland, avahi, jdk,
pcre, jasper, openexr, shared_mime_info, giflib}:
pkgs:
rec {
### SUPPORT
automoc4 = import ./support/automoc4 {
inherit stdenv fetchurl cmake;
inherit qt4;
inherit (pkgs) stdenv fetchurl cmake;
inherit (pkgs) qt4;
};
phonon = import ./support/phonon {
inherit stdenv fetchurl cmake;
inherit qt4 pthread_stubs gst_all xineLib;
inherit (xlibs) libXau libXdmcp;
inherit (pkgs) stdenv fetchurl cmake;
inherit (pkgs) qt4 pthread_stubs gst_all xineLib;
inherit (pkgs.xlibs) libXau libXdmcp;
inherit automoc4;
};
strigi = import ./support/strigi {
inherit stdenv fetchurl cmake perl;
inherit bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore;
inherit (pkgs) stdenv fetchurl cmake perl;
inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore;
};
soprano = import ./support/soprano {
inherit stdenv fetchurl cmake;
inherit qt4 jdk cluceneCore redland;
inherit (pkgs) stdenv fetchurl cmake;
inherit (pkgs) qt4 jdk cluceneCore redland;
};
### LIBS
kdelibs = import ./libs {
inherit stdenv fetchurl cmake perl;
inherit qt4 bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper;
inherit openexr aspell avahi;
inherit automoc4 phonon strigi soprano;
};
kdelibs = import ./libs (pkgs // {
inherit automoc4 phonon strigi soprano;
});
}

View file

@ -1,15 +1,20 @@
{stdenv, fetchurl, cmake, perl,
qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper,
openexr, aspell, avahi,
automoc4, phonon, strigi, soprano}:
{ stdenv, fetchurl, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, openexr, aspell, avahi
, automoc4, phonon, strigi, soprano, ...
}:
stdenv.mkDerivation {
name = "kdelibs-4.2.0";
src = fetchurl {
url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2;
md5 = "2d830a922195fefe6e073111850247ac";
};
buildInputs = [ cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper openexr aspell avahi
automoc4 phonon strigi soprano ];
buildInputs = [
cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper openexr aspell avahi
automoc4 phonon strigi soprano
];
}

View file

@ -0,0 +1,26 @@
diff --git a/pcap.c b/pcap.c
index 010ef74..0bfb191 100644
--- a/pcap.c
+++ b/pcap.c
@@ -211,7 +211,7 @@ pcap_set_buffer_size(pcap_t *p, int buffer_size)
return 0;
}
-int
+pcap_t *
pcap_activate(pcap_t *p)
{
int status;
diff --git a/pcap/pcap.h b/pcap/pcap.h
index ea18edc..3910a2d 100644
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -263,7 +263,7 @@ int pcap_can_set_rfmon(pcap_t *);
int pcap_set_rfmon(pcap_t *, int);
int pcap_set_timeout(pcap_t *, int);
int pcap_set_buffer_size(pcap_t *, int);
-int pcap_activate(pcap_t *);
+pcap_t *pcap_activate(pcap_t *);
pcap_t *pcap_open_live(const char *, int, int, int, char *);
pcap_t *pcap_open_dead(int, int);

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation {
-system-zlib -system-libpng -system-libjpeg -fast
-qt-gif -confirm-license
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-qdbus -cups -glib -xfixes
-qdbus -cups -glib -xfixes -dbus-linked
-fontconfig -I${freetype}/include/freetype2
'';

View file

@ -1,11 +1,11 @@
{fetchurl, perl, db4}:
{buildPerlPackage, fetchurl, db4}:
import ../generic perl {
name = "BerkeleyDB-0.27";
buildPerlPackage rec {
name = "BerkeleyDB-0.36";
src = fetchurl {
url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz;
md5 = "43aa72c0c6941af0d656d749ad543e96";
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
};
preConfigure = ''

View file

@ -1,17 +0,0 @@
args:
args.stdenv.mkDerivation {
name = "cgdb-0.6.4";
src = args.fetchurl {
url = http://prdownloads.sourceforge.net/cgdb/cgdb-0.6.4.tar.gz;
sha256 = "10c03p3bbr1glyw7j2i2sv97riiksw972pdamcqdqrzzfdcly54w";
};
buildInputs =(with args; [readline ncurses]);
meta = {
description = "curses interface to gdb";
homepage = http://cgdb.sourceforge.net/;
license ="GPLv2";
};
}

View file

@ -481,10 +481,6 @@ let
inherit fetchurl stdenv;
};
cgdb = import ../tools/misc/cgdb {
inherit fetchurl stdenv ncurses readline;
};
ccrypt = import ../tools/security/ccrypt {
inherit fetchurl stdenv;
};
@ -4084,12 +4080,13 @@ let
url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz;
sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9";
};
propagatedBuildInputs = [perlAlgorithmDiff];
};
perlAlgorithmDiff = buildPerlPackage {
name = "Algorithm-Diff-1.15";
perlAlgorithmDiff = buildPerlPackage rec {
name = "Algorithm-Diff-1.1901";
src = fetchurl {
url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1901.zip;
url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip";
sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2";
};
buildInputs = [unzip];
@ -4129,7 +4126,7 @@ let
};
perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB {
inherit fetchurl perl db4;
inherit buildPerlPackage fetchurl db4;
};
perlBitVector = buildPerlPackage {
@ -8967,13 +8964,9 @@ let
openexr = openexr_1_6_1 ;
});
kde42 = import ../desktops/kde-4.2 {
inherit stdenv fetchurl cmake jdk;
inherit xlibs qt4 bzip2 libxml2 libxslt perl pcre exiv2 aspell;
inherit pthread_stubs gst_all xineLib fam log4cxx cluceneCore;
inherit redland avahi jasper shared_mime_info giflib;
kde42 = import ../desktops/kde-4.2 (pkgs // {
openexr = openexr_1_6_1;
};
});
kdebase = import ../desktops/kde/kdebase {
inherit