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/tools/text | |
| 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/tools/text')
| -rw-r--r-- | pkgs/tools/text/enca/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/sgml/opensp/setup-hook.sh | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 14014d06052d..043f7cf5a12b 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconvOrNull, recode }: stdenv.mkDerivation rec { - name = "enca-1.15"; + name = "enca-1.16"; src = fetchurl { - url = "http://dl.cihar.com/enca/${name}.tar.bz2"; - sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; + url = "http://dl.cihar.com/enca/${name}.tar.xz"; + sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw"; }; buildInputs = [ recode libiconvOrNull ]; diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 52da517a8cbe..5775832789a1 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -9,14 +9,6 @@ addSGMLCatalogs () { if test -z "$sgmlHookDone"; then sgmlHookDone=1 - # Set http_proxy and ftp_proxy to a 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/ - export SGML_CATALOG_FILES envHooks+=(addSGMLCatalogs) fi |