5 files changed, 21 insertions, 18 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index f8be40eecab5..04420370ff1c 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -82,7 +82,10 @@ rec {
   };
 
   clang = wrapCCWith {
-    cc = binaries;
+    cc = binaries // {
+      # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib)
+      lib = targetAndroidndkPkgs.libraries;
+    };
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
     extraBuildCommands = ''
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 8fee93cc4abe..b524d3d6b093 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -30,11 +30,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.13.8";
+  version = "1.13.11";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi";
+    sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9";
   };
 
   # perl is used for testing go vet
@@ -229,8 +229,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  setupHook = ./setup-hook.sh;
-
   disallowedReferences = [ goBootstrap ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix
new file mode 100644
index 000000000000..db77d989c1df
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.11.nix
@@ -0,0 +1,6 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "11";
+  patch_version = "0+alpha1";
+  sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg";
+}
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index a1cf5b2debd5..ac4bc324868a 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, boost, cmake, ncurses, python2
+{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
 , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
 , cln ? null, gmp ? null
 }:
@@ -16,12 +16,12 @@ in
 stdenv.mkDerivation rec {
 
   pname = "solc";
-  version = "0.5.15";
+  version = "0.6.8";
 
   # upstream suggests avoid using archive generated by github
   src = fetchzip {
     url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-    sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y";
+    sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ boost ]
     ++ stdenv.lib.optionals z3Support [ z3 ]
     ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ];
-  checkInputs = [ ncurses python2 ];
+  checkInputs = [ ncurses python3 ];
 
   # Test fails on darwin for unclear reason
   doCheck = stdenv.hostPlatform.isLinux;
@@ -56,13 +56,7 @@ stdenv.mkDerivation rec {
     pushd ..
     # IPC tests need aleth avaliable, so we disable it
     sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
-    for i in ./scripts/*.sh; do
-      patchShebangs "$i"
-    done
-    for i in ./scripts/*.py; do
-      patchShebangs "$i"
-    done
-    for i in ./test/*.sh; do
+    for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
       patchShebangs "$i"
     done
     TERM=xterm ./scripts/tests.sh
diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
index 3185b1f9fae9..1fcc0bbd4b13 100644
--- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
@@ -4,12 +4,14 @@ venvShellHook() {
 
     if [ -d "${venvDir}" ]; then
       echo "Skipping venv creation, '${venvDir}' already exists"
+      source "${venvDir}/bin/activate"
     else
       echo "Creating new venv environment in path: '${venvDir}'"
       @pythonInterpreter@ -m venv "${venvDir}"
-    fi
 
-    source "${venvDir}/bin/activate"
+      source "${venvDir}/bin/activate"
+      runHook postVenvCreation
+    fi
 
     runHook postShellHook
     echo "Finished executing venvShellHook"