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

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-22 23:23:53 +01:00
parent 3e2e62ca31 296cd66009
commit 0a47a28f1d
73 changed files with 2686 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
View File

@@ -1,15 +0,0 @@
{ fetchurl, buildPerlPackage, bzip2 }:
buildPerlPackage rec {
name = "Compress-Raw-Bzip2-2.055";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
sha256 = "1qssagii3xy87lsnlq5y7cngasiiq7jmbi1s6lcwwfhv36ydlmx8";
};
# Don't build a private copy of bzip2.
BUILD_BZIP2 = false;
BZIP2_LIB = "${bzip2}/lib";
BZIP2_INCLUDE = "${bzip2}/include";
}

8
pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, zlib, stdenv }:
buildPerlPackage rec {
name = "Compress-Raw-Zlib-2.056";
name = "Compress-Raw-Zlib-2.060";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
sha256 = "08cbgbrfx718r1n9d8hzmv7ssnhw41b0pwg7fw6dcq3svqhmwkyl";
sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3";
};
preConfigure = ''
@@ -19,4 +19,8 @@ buildPerlPackage rec {
'';
doCheck = !stdenv.isDarwin;
meta = {
license = "perl5";
};
}

11
pkgs/development/perl-modules/DBD-Pg/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
buildPerlPackage rec {
name = "DBD-Pg-2.19.2";
name = "DBD-Pg-2.19.3";
src = fetchurl {
url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz";
sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9";
sha256 = "0ai6p2094hrh6kjlwfjvpw2z8wqa3scr4ba3p6rqza3z9c9hsd9p";
};
buildInputs = [ postgresql ];
@@ -13,5 +13,10 @@ buildPerlPackage rec {
makeMakerFlags = "POSTGRES_HOME=${postgresql}";
meta.platforms = stdenv.lib.platforms.linux;
meta = {
homepage = http://search.cpan.org/dist/DBD-Pg/;
description = "DBI PostgreSQL interface";
license = "perl";
platforms = stdenv.lib.platforms.linux;
};
}

23
pkgs/development/perl-modules/starman-dont-change-name.patch
View File

@@ -1,23 +0,0 @@
Changing the process name breaks applying libcgroup rules, so don't do it.
diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm
--- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000 +0200
+++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653 +0100
@@ -100,7 +100,7 @@
sub run_parent {
my $self = shift;
- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
+ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
$self->SUPER::run_parent(@_);
}
@@ -113,7 +113,7 @@
DEBUG && warn "[$$] Initializing the PSGI app\n";
$self->{app} = $self->{options}->{psgi_app_builder}->();
}
- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
+ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
}
sub post_accept_hook {

23
pkgs/development/perl-modules/template-toolkit-nix-store.patch
View File

@@ -1,23 +0,0 @@
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;
}
#------------------------------------------------------------------------