public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merged from the trunk. Let's see how well this works with

Browse Source 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
This commit is contained in:
Eelco Dolstra
2008-12-10 09:59:21 +00:00
parent 903ca0fc40 016e2d912e
commit e31341510d
331 changed files with 14072 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/perl-modules/Archive-Zip/default.nix
-9
View File
@@ -1,9 +0,0 @@
{fetchurl, perl}:
import ../generic perl {
name = "Archive-Zip-1.16";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/Archive-Zip-1.16.tar.gz;
md5 = "e28dff400d07b1659d659d8dde7071f1";
};
}
pkgs/development/perl-modules/BerkeleyDB/default.nix
+7 -3
View File
@@ -2,10 +2,14 @@
import ../generic perl {
name = "BerkeleyDB-0.27";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/BerkeleyDB-0.27.tar.gz;
url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz;
md5 = "43aa72c0c6941af0d656d749ad543e96";
};
perlPreHook = "source ${./hook.sh}";
inherit db4;
preConfigure = ''
echo "LIB = ${db4}/lib" > config.in
echo "INCLUDE = ${db4}/include" >> config.in
'';
}
pkgs/development/perl-modules/BerkeleyDB/hook.sh
-7
View File
@@ -1,7 +0,0 @@
oldPreConfigure=$preConfigure
preConfigure=myPreConfigure
myPreConfigure() {
echo "LIB = $db4/lib" > config.in
echo "INCLUDE = $db4/include" >> config.in
$oldPreConfigure
}
pkgs/development/perl-modules/Compress-Zlib/default.nix
-9
View File
@@ -1,9 +0,0 @@
{fetchurl, perl}:
import ../generic perl {
name = "Compress-Zlib-1.41";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/Compress-Zlib-1.41.tar.gz;
md5 = "ac135b84a03e814734496777cf5e5722";
};
}
pkgs/development/perl-modules/DBD-SQLite/default.nix
+19
View File
@@ -0,0 +1,19 @@
{fetchurl, buildPerlPackage, perlDBI, sqlite}:
buildPerlPackage {
name = "DBD-SQLite-1.14";
src = fetchurl {
url = mirror://cpan/authors/id/M/MS/MSERGEANT/DBD-SQLite-1.14.tar.gz;
sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624";
};
propagatedBuildInputs = [perlDBI];
makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
patches = [
# Prevent segfaults in case of timeouts.
./reset.patch
];
}
pkgs/development/perl-modules/DBD-SQLite/reset.patch
+40
View File
@@ -0,0 +1,40 @@
diff -rc DBD-SQLite-1.14-orig/dbdimp.c DBD-SQLite-1.14/dbdimp.c
*** DBD-SQLite-1.14-orig/dbdimp.c 2007-08-24 04:51:25.000000000 +0200
--- DBD-SQLite-1.14/dbdimp.c 2008-11-10 18:31:53.000000000 +0100
***************
*** 398,405 ****
if (imp_sth->retval == SQLITE_ROW) {
continue;
}
! /* There are bug reports that say this should be sqlite3_reset() */
! sqlite3_finalize(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -5;
}
--- 398,404 ----
if (imp_sth->retval == SQLITE_ROW) {
continue;
}
! sqlite3_reset(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -5;
}
***************
*** 418,425 ****
case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth);
sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth));
return 0;
! /* There are bug reports that say this should be sqlite3_reset() */
! default: sqlite3_finalize(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -6;
}
--- 417,423 ----
case SQLITE_DONE: DBIc_ACTIVE_on(imp_sth);
sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth));
return 0;
! default: sqlite3_reset(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
return -6;
}
Only in DBD-SQLite-1.14/: dbdimp.c~
pkgs/development/perl-modules/DB_File/default.nix
+11 -1
View File
@@ -2,10 +2,20 @@
import ../generic perl {
name = "DB_File-1.816";
src = fetchurl {
url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.816.tar.gz;
sha256 = "1a668hk5v0l180kbqss2hq9khl756cmrykn8fz1rl4qzsp6lq284";
};
perlPreHook = "source ${./hook.sh}";
preConfigure = ''
cat > config.in <<EOF
PREFIX = size_t
HASH = u_int32_t
LIB = ${db4}/lib
INCLUDE = ${db4}/include
EOF
'';
inherit db4;
}
pkgs/development/perl-modules/DB_File/hook.sh
-11
View File
@@ -1,11 +0,0 @@
oldPreConfigure=$preConfigure
preConfigure=myPreConfigure
myPreConfigure() {
cat > config.in <<EOF
PREFIX = size_t
HASH = u_int32_t
LIB = $db4/lib
INCLUDE = $db4/include
EOF
$oldPreConfigure
}
pkgs/development/perl-modules/XML-Parser/default.nix
-11
View File
@@ -1,11 +0,0 @@
{fetchurl, perl, expat}:
import ../generic perl {
name = "XML-Parser-2.34";
src = fetchurl {
url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz;
md5 = "84d9e0001fe01c14867256c3fe115899";
};
perlPreHook = "makeMakerFlags=\"EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include\"";
inherit expat;
}
pkgs/development/perl-modules/generic/builder.sh
+3
View File
@@ -11,9 +11,12 @@ done
IFS=$oldIFS
echo "Perl flags: $perlFlags"
oldPreConfigure="$preConfigure"
preConfigure=preConfigure
preConfigure() {
eval "$oldPreConfigure"
find . | while read fn; do
if test -f "$fn"; then
first=$(dd if="$fn" count=2 bs=1 2> /dev/null)
pkgs/development/perl-modules/template-toolkit-nix-store.patch
+23
View File
@@ -0,0 +1,23 @@
diff -rc Template-Toolkit-2.20-orig/lib/Template/Provider.pm Template-Toolkit-2.20/lib/Template/Provider.pm
*** Template-Toolkit-2.20-orig/lib/Template/Provider.pm 2008-08-06 11:32:02.000000000 +0200
--- Template-Toolkit-2.20/lib/Template/Provider.pm 2008-11-28 16:37:36.000000000 +0100
***************
*** 936,942 ****
sub _template_modified {
my $self = shift;
my $template = shift || return;
! return (stat( $template ))[9];
}
#------------------------------------------------------------------------
--- 936,945 ----
sub _template_modified {
my $self = shift;
my $template = shift || return;
! # Nix specific hack: timestamps of 0 (1-1-1970) should not be
! # treated as undefined, so return 1 instead.
! my $t = (stat( $template ))[9];
! return (defined $t && $t == 0) ? 1 : $t;
}
#------------------------------------------------------------------------