Merge staging-next into staging

2021-05-02 18:24:58 +00:00
parent da64b5289b 03120b685d
commit 0e4580d4d0
32 changed files with 4090 additions and 231 deletions
--- a/pkgs/development/compilers/ophis/default.nix
+++ b/pkgs/development/compilers/ophis/default.nix
@@ -11,7 +11,7 @@ buildPythonApplication rec {
    sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g=";
  };

-  sourceRoot = "./src";
+  sourceRoot = "${src.name}/src";

  meta = with lib; {
    homepage = "http://michaelcmartin.github.io/Ophis/";