WIP: test commit for merge

Author: Gustavo2622

flake.nix

@@ -111,7 +111,8 @@
 		extraEmacsPackages = epkgs: [ epkgs.proof-general ];
 	      })
 	      bashInteractive
-	      
+	      git 
+	      difftastic
 	    ])
 	    ++
 	    pkgs.lib.optionals (!pkgs.stdenv.isDarwin) [ pkgs.pperf-tools ]
@@ -127,7 +128,12 @@
 
           provers = pkgs.symlinkJoin {
             name = "provers";
-            paths = [ altErgo z3 cvc4 cvc5 ];
+            paths = [ 
+	    #  altErgo 
+	      z3 
+	    #  cvc4 
+	      cvc5 
+	    ];
           };
 
           with_provers = pkgs.symlinkJoin {
@@ -151,7 +157,6 @@
 	  buildInputs = 
 	     devPackages
 	  ++ devTools
-	  ++ (with pkgs; [ git difftastic ])
 	  ++ [ scope'.why3 ]
 	  ++ (with pkgs.python3Packages; [ pyyaml ]);
 	  SHELL = ''${pkgs.bashInteractive + "/bin/bash"}'';
@@ -166,7 +171,6 @@
 	  buildInputs = 
 	     devPackages
  	  ++ devTools
-	  ++ (with pkgs; [ git ]) 
 	  ++ [ scope'.why3 packages.provers ]
 	  ++ (with pkgs.python3Packages; [ pyyaml ]);
 	  SHELL = ''${pkgs.bashInteractive + "/bin/bash"}'';

src/ecScope.ml

@@ -2479,7 +2479,8 @@ module Circuit = struct
                 |> List.map (fun name -> (name, (Some (loced (Ptry (loced (Pby None)))), `Alias, false)))
                 |> Msym.of_list;
             ev_global  = 
-              [ (None, None)
+              (* FIXME PR: get this to work *)
+              [ (Some (loced (Pby None)), Some [`Include, "bydone"])
               ; (None, None) ]; } } in
 
     let npath = EcPath.pqname (EcEnv.root env) clone.name in