Merge branch 'master' into staging

2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
@@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec {

  postPatch = ''
    substituteInPlace "salt/utils/rsax931.py" \
-      --subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so"
+      --subst-var-by "libcrypto" "${openssl.out}/lib/libcrypto.so"
  '';

  # The tests fail due to socket path length limits at the very least;