my-env: Preserve http_proxy and ftp_proxy variables

There are few build scripts which set them to `nodtd.invalid` to disable
downloading files by buildscript. But for user environment we should
restore original values
add game 'tcl2048'
tcl2048: update to 0.2.6
tcl2048: wrong sha256sum.
grub: fix grub merge error
Merge pull request #3892 from robberer/bugfix/grub

grub: fix grub merge error
gource: update to version 0.42
Merge pull request #3893 from robberer/pkgs/gource

gource: update to version 0.42
Merge pull request #3889 from dbohdan/master

Added package tcl2048
haskell-xml-html-conduit-lens 0.3.2.0 -> 0.3.2.1
Bump snort and daq
pypyPackages.pycryptopp: mark as not supported on pypy
pythonPackages.cffi: 0.7.2 -> 0.8.6
PyPy ships with cffi, so don't use external cffi for packages
audacious: update to version 3.5.1
rdesktop: update to version 1.8.2

rdesktop: add meta fields
ruby: add version 2.1.2
deluge: update to version 1.3.7
Merge pull request #3898 from robberer/pkgs/deluge

deluge: update to version 1.3.7
Merge pull request #3897 from dmalikov/haskell-xml-html-conduit-lens

haskell-xml-html-conduit-lens 0.3.2.0 -> 0.3.2.1