summaryrefslogtreecommitdiffstats
path: root/pkgs/misc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-10 18:07:14 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-10 18:07:14 +0100
commit66fe4af226cf09ed2659aac43bf38098d42d95a7 (patch)
tree0773be7b3adb574bd3c5514ff4658d76fa99becd /pkgs/misc
parentc9f4d714fe4638ac939e3494ba4b781d59b6a549 (diff)
parent5efc5a4ede9f07994f85fe8bec9d86d1943e4a11 (diff)
Merge recent staging
It's the version last built on Hydra, almost fully.
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/my-env/loadenv.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 816c1b8a7111..1688d2f158fb 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -10,7 +10,6 @@ PATH="$PATH:$OLDPATH"
export PS1="\n@name@:[\u@\h:\w]\$ "
export NIX_MYENV_NAME="@name@"
export buildInputs
-export NIX_STRIP_DEBUG=0
export TZ="$OLDTZ"
export http_proxy="$OLD_http_proxy"
export ftp_proxy="$OLD_ftp_proxy"