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

Remove http_proxy/ftp_proxy overrides used in setup hooks.

Browse Source 
Partially reverts eaa4db148d. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
This commit is contained in:
Domen Kožar 2014-10-28 23:17:52 +01:00
parent 2ee8be5db5
commit 419f15b060
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

8
pkgs/tools/text/sgml/opensp/setup-hook.sh
View File

@ -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=(${envHooks[@]} addSGMLCatalogs)
fi