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

* Merged the stdenv branch

Browse Source 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
This commit is contained in:
Eelco Dolstra
2008-06-13 11:46:39 +00:00
parent 4192f35202 cd60dc0ede
commit fc5eebdf8b
89 changed files with 1486 additions and 1852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
pkgs/development/libraries/acl/acl-2.2.45-patch
View File

@@ -1,222 +0,0 @@
diff -u -U3 -r acl-2.2.45-orig/aclocal.m4 acl-2.2.45-mod/aclocal.m4
--- acl-2.2.45-orig/aclocal.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/aclocal.m4 2007-12-23 18:09:04.000000000 +0300
@@ -228,32 +228,32 @@
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MAKE, gmake,,)
fi
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
+ AC_PATH_PROG(MAKE, make,, )
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
+ AC_PATH_PROG(LIBTOOL, glibtool,, )
fi
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(LIBTOOL, libtool,, )
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+ AC_PATH_PROG(TAR, tar,, )
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(ZIP, gzip,, )
fi
zip=$ZIP
@@ -266,25 +266,25 @@
AC_SUBST(makedepend)
if test -z "$AWK"; then
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
+ AC_PATH_PROG(AWK, awk,, )
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
+ AC_PATH_PROG(SED, sed,, )
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
+ AC_PATH_PROG(ECHO, echo,, )
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
+ AC_PATH_PROG(SORT, sort,, )
fi
sort=$SORT
AC_SUBST(sort)
@@ -294,21 +294,21 @@
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MSGFMT, msgfmt,, )
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MSGMERGE, msgmerge,, )
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(XGETTEXT, xgettext,, )
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -316,7 +316,7 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+ AC_PATH_PROG(RPM, rpm,, )
fi
rpm=$RPM
AC_SUBST(rpm)
ôÏÌØËÏ × acl-2.2.45-orig/: configure
diff -u -U3 -r acl-2.2.45-orig/m4/package_utilies.m4 acl-2.2.45-mod/m4/package_utilies.m4
--- acl-2.2.45-orig/m4/package_utilies.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/m4/package_utilies.m4 2007-12-23 18:01:28.000000000 +0300
@@ -23,32 +23,26 @@
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
fi
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
zip=$ZIP
@@ -61,25 +55,21 @@
AC_SUBST(makedepend)
if test -z "$AWK"; then
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
fi
sort=$SORT
AC_SUBST(sort)
@@ -89,21 +79,18 @@
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -111,7 +98,6 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
fi
rpm=$RPM
AC_SUBST(rpm)
diff -u -U3 -r acl-2.2.45-orig/Makefile acl-2.2.45-mod/Makefile
--- acl-2.2.45-orig/Makefile 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/Makefile 2007-12-23 18:01:28.000000000 +0300
@@ -33,19 +33,6 @@
endif
$(CONFIGURE):
- autoconf
- ./configure \
- --prefix=/ \
- --exec-prefix=/ \
- --sbindir=/bin \
- --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --enable-lib64=yes \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --datadir=/usr/share \
- $$LOCAL_CONFIGURE_OPTIONS
touch .census
aclocal.m4::

12
pkgs/development/libraries/acl/builder.sh
View File

@@ -1,12 +0,0 @@
source $stdenv/setup
preConfigure() {
rm configure
autoconf
}
preConfigure=preConfigure
installFlags='install-lib install-dev'
genericBuild

22
pkgs/development/libraries/acl/default.nix
View File

@@ -1,14 +1,16 @@
args: with args;
{stdenv, fetchurl, gettext, attr, libtool}:
stdenv.mkDerivation {
name = "acl-2.2.45";
name = "acl-2.2.47";
builder = ./builder.sh;
src =
fetchurl {
url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.45-1.tar.gz;
sha256 = "1bb2k5br494yk863w27k1h8gkdkq4kzakvajhj844hl1cixhhf1a";
};
buildInputs = [autoconf libtool gettext attr];
patches = [ ./acl-2.2.45-patch ];
src = fetchurl {
url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz;
sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294";
};
buildInputs = [gettext attr libtool];
configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";
installTargets = "install install-lib install-dev";
}

25
pkgs/development/libraries/attr/attr-2.4.32-makefile.patch
View File

@@ -1,25 +0,0 @@
diff -rc attr-2.4.32/Makefile attr-2.4.32.new/Makefile
*** attr-2.4.32/Makefile 2006-06-20 08:51:25.000000000 +0200
--- attr-2.4.32.new/Makefile 2006-08-13 20:47:52.000000000 +0200
***************
*** 33,51 ****
endif
$(CONFIGURE):
- autoconf
- ./configure \
- --prefix=/ \
- --exec-prefix=/ \
- --sbindir=/bin \
- --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --enable-lib64=yes \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --datadir=/usr/share \
- $$LOCAL_CONFIGURE_OPTIONS
touch .census
aclocal.m4::
--- 33,38 ----

171
pkgs/development/libraries/attr/attr-2.4.32.patch
View File

@@ -1,171 +0,0 @@
diff -rc attr-2.4.32/aclocal.m4 attr-2.4.32.new/aclocal.m4
*** attr-2.4.32/aclocal.m4 2006-06-20 08:51:25.000000000 +0200
--- attr-2.4.32.new/aclocal.m4 2006-08-13 19:57:07.000000000 +0200
***************
*** 144,175 ****
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, make,, /usr/bin)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
fi
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
! AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
! AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
zip=$ZIP
--- 144,175 ----
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, gmake)
fi
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, make)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, glibtool)
fi
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, libtool)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
! AC_PATH_PROG(TAR, tar)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
! AC_PATH_PROG(ZIP, gzip)
fi
zip=$ZIP
***************
*** 182,206 ****
AC_SUBST(makedepend)
if test -z "$AWK"; then
! AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
! AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
! AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
! AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
fi
sort=$SORT
AC_SUBST(sort)
--- 182,206 ----
AC_SUBST(makedepend)
if test -z "$AWK"; then
! AC_PATH_PROG(AWK, awk)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
! AC_PATH_PROG(SED, sed)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
! AC_PATH_PROG(ECHO, echo)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
! AC_PATH_PROG(SORT, sort)
fi
sort=$SORT
AC_SUBST(sort)
***************
*** 210,223 ****
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
! AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
! AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
--- 210,223 ----
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
! AC_PATH_PROG(MSGFMT, msgfmt)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
! AC_PATH_PROG(MSGMERGE, msgmerge)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
***************
*** 225,231 ****
fi
if test -z "$RPM"; then
! AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
fi
rpm=$RPM
AC_SUBST(rpm)
--- 225,231 ----
fi
if test -z "$RPM"; then
! AC_PATH_PROG(RPM, rpm)
fi
rpm=$RPM
AC_SUBST(rpm)

11
pkgs/development/libraries/attr/builder.sh
View File

@@ -1,11 +0,0 @@
source $stdenv/setup
preConfigure() {
autoconf
}
preConfigure=preConfigure
installFlags='install-lib install-dev'
genericBuild

16
pkgs/development/libraries/attr/default.nix
View File

@@ -1,14 +1,16 @@
{stdenv, fetchurl, autoconf, libtool, gettext}:
{stdenv, fetchurl, libtool, gettext}:
stdenv.mkDerivation {
name = "attr-2.4.32";
name = "attr-2.4.41";
builder = ./builder.sh;
src = fetchurl {
url = ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/attr_2.4.32-1.tar.gz;
md5 = "092739e9b944815aecc1f5d8379d5ea5";
url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz;
sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp";
};
buildInputs = [autoconf libtool gettext];
patches = [./attr-2.4.32.patch ./attr-2.4.32-makefile.patch];
buildInputs = [libtool gettext];
configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
installTargets = "install install-lib install-dev";
}

9
pkgs/development/libraries/audiofile/default.nix
View File

@@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "audiofile-0.2.6";
src = fetchurl {
url = http://www.68k.org/~michael/audiofile/audiofile-0.2.6.tar.gz;
sha256 = "1a921w6jwcnkmx3vm091qrj7109jzri6kw4ygjq6ym91dssnfqab";
};
}

27
pkgs/development/libraries/cairo/default.nix
View File

@@ -2,26 +2,33 @@
, pdfSupport ? true
, pngSupport ? true
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng
, zlib, libpng, pixman
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
stdenv.mkDerivation {
name = "cairo-1.4.6";
name = "cairo-1.6.4";
src = fetchurl {
url = http://cairographics.org/releases/cairo-1.4.6.tar.gz;
sha256 = "15l87pzmlwbxk6m4102g2zln4drq0l32qs60ccs5bpmcnky2lqya";
url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
};
buildInputs = [
pkgconfig x11 fontconfig freetype
(if pngSupport then libpng else null)
];
propagatedBuildInputs = [
(if postscriptSupport then zlib else null)
(if pngSupport then libpng else null)
pkgconfig x11 fontconfig freetype pixman
];
propagatedBuildInputs =
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags =
(if pdfSupport then ["--enable-pdf"] else []);
meta = {
description = "A 2D graphics library with support for multiple output devices";
homepage = http://cairographics.org/;
};
}

18
pkgs/development/libraries/fontconfig/default.nix
View File

@@ -3,12 +3,22 @@
assert freetype != null && expat != null;
stdenv.mkDerivation {
name = "fontconfig-2.4.2";
builder = ./builder.sh;
name = "fontconfig-2.6.0";
src = fetchurl {
url = http://fontconfig.org/release/fontconfig-2.4.2.tar.gz;
sha256 = "0qqk6hqh8ardqlgzdgj0zjn6a61z4j6ba9x3xs8pp0c2650xd8v3";
url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
};
buildInputs = [freetype];
propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
preConfigure = ''
configureFlags="--with-confdir=$out/etc/fonts --disable-docs --with-default-fonts="
'';
meta = {
description = "A library for font customization and configuration";
homepage = http://fontconfig.org/;
};
}

12
pkgs/development/libraries/freetype/default.nix
View File

@@ -1,9 +1,15 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "freetype-2.3.1";
name = "freetype-2.3.6";
src = fetchurl {
url = mirror://sourceforge/freetype/freetype-2.3.1.tar.bz2;
sha256 = "0mb11mprdlcvxyjb62ganwfgvzg4kk3rmr677li8j0484b6ywf5y";
url = mirror://sourceforge/freetype/freetype-2.3.6.tar.bz2;
sha256 = "0xqf24d42qj5x8h6cmwpdqg455kpcbaxc3jlwqf4rlbn0g1ri9nm";
};
meta = {
description = "A font engine";
homepage = http://www.freetype.org/;
};
}

3
pkgs/development/libraries/glibc-2.7/builder.sh
View File

@@ -7,6 +7,9 @@ source $stdenv/setup
# Explicitly tell glibc to use our pwd, not /bin/pwd.
export PWD_P=$(type -tP pwd)
# Needed to install share/zoneinfo/zone.tab.
export BASH_SHELL=$SHELL
preConfigure=preConfigure
preConfigure() {

25
pkgs/development/libraries/glibc-2.7/default.nix
View File

@@ -16,6 +16,31 @@ stdenv.mkDerivation {
inherit (stdenv) is64bit;
patches = [
/* Fix for NIXPKGS-79: when doing host name lookups, when
nsswitch.conf contains a line like
hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4
don't return an error when mdns4_minimal can't be found. This
is a bug in Glibc: when a service can't be found, NSS should
continue to the next service unless "UNAVAIL=return" is set.
("NOTFOUND=return" refers to the service returning a NOTFOUND
error, not the service itself not being found.) The reason is
that the "status" variable (while initialised to UNAVAIL) is
outside of the loop that iterates over the services, the
"files" service sets status to NOTFOUND. So when the call to
find "mdns4_minimal" fails, "status" will still be NOTFOUND,
and it will return instead of continuing to "dns". Thus, the
line
hosts: mdns4_minimal [NOTFOUND=return] dns mdns4
does work because "status" will contain UNAVAIL after the
failure to find mdns4_minimal. */
./nss-skip-unavail.patch
];
# `--with-tls --without-__thread' enables support for TLS but causes
# it not to be used. Required if we don't want to barf on 2.4
# kernels. Or something.

25
pkgs/development/libraries/glibc-2.7/nss-skip-unavail.patch Normal file
View File

@@ -0,0 +1,25 @@
diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c
*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c 2007-10-17 18:05:12.000000000 +0200
--- glibc-2.7/sysdeps/posix/getaddrinfo.c 2008-04-08 12:17:09.000000000 +0200
***************
*** 498,505 ****
int no_data = 0;
int no_inet6_data = 0;
service_user *nip = NULL;
- enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
- enum nss_status status = NSS_STATUS_UNAVAIL;
int no_more;
int old_res_options;
--- 498,503 ----
***************
*** 689,694 ****
--- 687,694 ----
while (!no_more)
{
+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+ enum nss_status status = NSS_STATUS_UNAVAIL;
nss_gethostbyname3_r fct = NULL;
if (req->ai_flags & AI_CANONNAME)
/* No need to use this function if we do not look for

2
pkgs/development/libraries/gnutls/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [zlib lzo libgcrypt]
++ (if guileBindings then [guile] else []);
++ stdenv.optional guileBindings guile;
doCheck = true;

6
pkgs/development/libraries/gtk-libs/2.12/atk/default.nix
View File

@@ -1,10 +1,10 @@
args: with args;
stdenv.mkDerivation {
name = "atk-1.12.4";
name = "atk-1.20.0";
src = fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/atk-1.22.0.tar.bz2;
sha256 = "1sax4a63v7vy2f23lqgy33956nglas9vyh4dq91914gwl3lnczb7";
url = mirror://gnome/sources/atk/1.20/atk-1.20.0.tar.bz2;
sha256 = "1ja76wd40ibmvgqhl2rnwk217znb7rnccw29jah8s3avpcn2yfqz";
};
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];

11
pkgs/development/libraries/gtk-libs/2.12/glib/default.nix
View File

@@ -2,9 +2,16 @@ args: with args;
stdenv.mkDerivation {
name = "glib-2.16.3";
src = fetchurl {
url = ftp://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.3.tar.bz2;
sha256 = "0zc8irn9zx8j37ih3jiwhqrkq2ddpv4x93pcj7c45f676ji449sn";
url = mirror://gnome/sources/glib/2.16/glib-2.16.3.tar.bz2;
md5 = "195f9a803cc5279dbb39afdf985f44cb";
};
buildInputs = [pkgconfig gettext perl];
meta = {
description = "A C library providing non-GUI functionality";
homepage = http://www.gtk.org/;
};
}

7
pkgs/development/libraries/gtk-libs/2.12/glibmm/default.nix
View File

@@ -1,13 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "glibmm-2.16.1";
name = "glibmm-2.16.2";
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.1.tar.bz2;
sha256 = "0x710y9pkn4nfhl95dqfk90bk29qr5alzqxdl3l1n6af5yl2yn3i";
url = mirror://gnome/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2;
sha256 = "0a3d4z3kzbr84pg873397nja6wc6810pw233rvn1gz1jkkrzcczh";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
}

22
pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix
View File

@@ -1,13 +1,23 @@
args: with args;
stdenv.mkDerivation {
name = "gtk+-2.12.9";
name = "gtk+-2.12.10";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.12/gtk+-2.12.9.tar.bz2;
sha256 = "1j0fil4rzvkrlq3mwpb5mpwks1h5sk580qq54l69y99incgvznav";
url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.10.tar.bz2;
md5 = "5fcbdd2254eedb6b9ae828afc01d9eaa";
};
buildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [x11 glib atk pango libtiff libjpeg libpng cairo
libXrandr (if xineramaSupport then libXinerama else null)];
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [
x11 glib atk pango libtiff libjpeg libpng cairo libXrandr
] ++ stdenv.lib.optional xineramaSupport libXinerama;
passthru = { inherit libtiff libjpeg libpng; };
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
homepage = http://www.gtk.org/;
};
}

3
pkgs/development/libraries/gtk-libs/2.12/gtkmm/default.nix
View File

@@ -3,11 +3,10 @@ args: with args;
stdenv.mkDerivation {
name = "gtkmm-2.12.7";
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/gtkmm-2.12.7.tar.bz2;
url = mirror://gnome/sources/gtkmm/2.12/gtkmm-2.12.7.tar.bz2;
sha256 = "1syrn4ppjd0an4ly6vmi388q6aav5fakj39wbcvs4nbphanwjn2f";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [glibmm gtk atk cairomm];
}

19
pkgs/development/libraries/gtk-libs/2.12/pango/default.nix
View File

@@ -1,11 +1,24 @@
args: with args;
stdenv.mkDerivation {
name = "pango-1.20.2";
name = "pango-1.18.4";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/pango/1.20/pango-1.20.2.tar.bz2;
sha256 = "0kjqhlwm43ad8avxz4b8l4w37jjhfilv30ph8sklnqzjj5vz3ayk";
url = mirror://gnome/sources/pango/1.18/pango-1.18.4.tar.bz2;
sha256 = "1pggwyvklj5pbfwab0dki8nqhph90nq8j4g2rl8d87xanwpcilvg";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib cairo libpng];
# The configure script doesn't seem to pick up the Cairo cflags.
preConfigure = ''
CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug)
'';
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";
homepage = http://www.pango.org/;
};
}

14
pkgs/development/libraries/libpng/default.nix
View File

@@ -3,11 +3,19 @@
assert zlib != null;
stdenv.mkDerivation {
name = "libpng-1.2.24";
name = "libpng-1.2.29";
src = fetchurl {
url = mirror://sourceforge/libpng/libpng-1.2.24.tar.bz2;
sha256 = "0kd0qkakc5zh2inrzw5r0h02761v1s9q223lv7za7iaxyl4byash";
url = mirror://sourceforge/libpng/libpng-1.2.29.tar.bz2;
md5 = "f588cb4ee39e3a333604096f937ea157";
};
propagatedBuildInputs = [zlib];
inherit zlib;
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
};
}

17
pkgs/development/libraries/librsvg/default.nix
View File

@@ -1,17 +0,0 @@
{stdenv, fetchurl
, pkgconfig, glib, cairo, fontconfig, freetype, pango, gtk
, libxml2, libart
}:
#required: libxml and libart at a minimum, while providing extra features when used with libcroco, libgsf, and mozilla
stdenv.mkDerivation {
name = "librsvg-2.16.1";
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.16/librsvg-2.16.1.tar.gz;
md5 = "2bbd4f634ef229cbb1552b574aacf0bd";
};
propagatedBuildInputs = [ libxml2 libart pkgconfig glib pkgconfig cairo fontconfig freetype pango gtk ];
}

15
pkgs/development/libraries/libtasn1/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libtasn1-1.4";
src = fetchurl {
url = http://josefsson.org/gnutls/releases/libtasn1/libtasn1-1.4.tar.gz;
sha256 = "15k14cl334cjdw6hbw3scdxm0pfv078kfq6bnz9ngyg4by1kgal4";
};
meta = {
homepage = http://josefsson.org/libtasn1/;
description = "An ASN.1 library";
};
}

6
pkgs/development/libraries/libxml2/default.nix
View File

@@ -4,12 +4,12 @@ assert zlib != null;
assert pythonSupport -> python != null;
stdenv.mkDerivation {
name = "libxml2-2.6.30";
name = "libxml2-2.6.32";
builder = ./builder.sh;
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-2.6.30.tar.gz;
sha256 = "0pkk6cw0qd56kz2fkn768dcygbb4ncyvvmvyfiyli1a7yjh64xw7";
url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz;
sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v";
};
python = if pythonSupport then python else null;

6
pkgs/development/libraries/libxslt/default.nix
View File

@@ -3,10 +3,10 @@
assert libxml2 != null;
stdenv.mkDerivation {
name = "libxslt-1.1.22";
name = "libxslt-1.1.24";
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz;
sha256 = "1nj9pvn4ibhwxpl3ry9n6d7jahppcnqc7mi87nld4vsr2vp3j7sf";
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
sha256 = "0ghb31mgm3bq5k41jf7b0c2azcfil26nz720kpr7k6hyhi20khf0";
};
buildInputs = [libxml2];
postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/";

10
pkgs/development/libraries/openssl/default.nix
View File

@@ -1,9 +1,11 @@
{stdenv, fetchurl, perl}: stdenv.mkDerivation {
name = "openssl-0.9.8g";
{stdenv, fetchurl, perl}:
stdenv.mkDerivation {
name = "openssl-0.9.8h";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8g.tar.gz;
sha256 = "1w0wj3pgg9ga0hay3jdxs9sl17bfw307b6qvkxn735fy8ml8h9hf";
url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8h.tar.gz;
sha1 = "ced4f2da24a202e01ea22bef30ebc8aee274de86";
};
buildInputs = [perl];
}