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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source
This commit is contained in:
Peter Simons
2014-10-31 11:14:24 +01:00
parent c04e492898 e18e77fbcd
commit b11060d8db
261 changed files with 4084 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ assert pythonSupport -> python != null;
#TODO: share most stuff between python and non-python builds, perhaps via multiple-output
let
version = "2.9.1";
version = "2.9.2";
in
stdenv.mkDerivation (rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "1nqgd1qqmg0cg09mch78m2ac9klj9n87blilx4kymi7jcv5n8g7x";
sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
};
buildInputs = stdenv.lib.optional pythonSupport python

8
pkgs/development/libraries/libxml2/setup-hook.sh
View File

@@ -11,14 +11,6 @@ addXMLCatalogs () {
if test -z "$libxmlHookDone"; then
libxmlHookDone=1
# Set http_proxy and ftp_proxy to an invalid host to prevent
# xmllint and xsltproc from trying to download DTDs from the
# network even when --nonet is not given. That would be impure.
# (Note that .invalid is a reserved domain guaranteed not to
# work.)
export http_proxy=http://nodtd.invalid/
export ftp_proxy=http://nodtd.invalid/
# Set up XML_CATALOG_FILES. An empty initial value prevents
# xmllint and xsltproc from looking in /etc/xml/catalog.
export XML_CATALOG_FILES