Merge master into staging-next

2021-02-13 06:16:33 +00:00
parent 1d62dc37db 63bffaf227
commit 318f95e4c2
33 changed files with 281 additions and 138 deletions
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -46,8 +46,7 @@ in
       b=$(basename $f)
        if [ "$b" = mix ]; then continue; fi
        wrapProgram $f \
-          --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
-          --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
+          --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}"
      done

      substituteInPlace $out/bin/mix \