Merge branch 'master' into staging

pkgs/development/interpreters/python/python-linkme-wrapper.nix

@@ -1,15 +0,0 @@
-{ stdenv }:
-
-stdenv.mkDerivation {
-  name = "python-linkme-wrapper-1.0";
-
-  unpackPhase = "true";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cat ${./python-linkme-wrapper.sh} >  $out/bin/.python-linkme-wrapper
-    chmod +x $out/bin/.python-linkme-wrapper
-  '';
-
-  preferLocalBuild = true;
-}

pkgs/development/interpreters/python/python-linkme-wrapper.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Install it into a nix profile and from there build symlink chains.
-# The chain will be followed to set the PYTHONPATH
-# A/bin/foo -> B/bin/bar -> NIXENV/bin/.python-linkme-wrapper.sh
-#
-
-if test ! -L "$0"; then
-   echo "Link me!"
-   exit 1
-fi
-
-PROG=$(basename "$0")
-SITES=
-
-pypath() {
-  BIN=$(realpath -s "$(dirname "$1")")
-  ENV=$(dirname "$BIN")
-  SITE="$ENV/lib/python2.7/site-packages"
-  SITES="$SITES${SITES:+:}$SITE"
-
-  PRG="$BIN"/$(readlink "$1")
-
-  if test -L "$PRG"; then
-    pypath "$PRG"
-  fi
-}
-
-pypath $(realpath -s "$0")
-
-export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES"
-
-exec "$BIN/$PROG" "$@"