There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
* Add an alias with a deprecation warning for `nxproxy` to avoid an
immediate breaking change.
* Use the default shell used in the build environment (`stdenv.shell`)
for patching. This shell is in the environment and thus used to patch
scripts using `patchShebangs`. The shell is referenced as `stdenv.shell`
in Makefiles to patch the remaining occurrences of `/bin/bash` in the
build environment.
