diff options
| author | Peter Simons <simons@cryp.to> | 2014-10-31 11:14:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-10-31 11:14:24 +0100 |
| commit | b11060d8db2f856f3feaaa9d84df36606504d071 (patch) | |
| tree | 74d8e01a5d7eb246dd25819a1b7f926082700732 /pkgs/development/libraries/libxml2 | |
| parent | c04e49289871232ff3c2fd1239b64c2513f18fd1 (diff) | |
| parent | e18e77fbcdebc5bf1768157747b7e6d1ae7d9379 (diff) | |
| download | nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar.gz nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar.bz2 nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar.lz nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar.xz nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.tar.zst nixlib-b11060d8db2f856f3feaaa9d84df36606504d071.zip | |
Merge remote-tracking branch 'origin/master' into staging.
Diffstat (limited to 'pkgs/development/libraries/libxml2')
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxml2/setup-hook.sh | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 7e3ee3e9adc7..8dfe60f9026d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -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 diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index f9fc633c7da7..4acdd25a6b28 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -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 |