build: upgrade yuujinchou (#54)

* build: upgrade yuujinchou * build: make Nix happy
ToposInstitute · Sep 3, 2023 · af20e23 · af20e23
1 parent 8f9b0aa
commit af20e23
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,10 +1,15 @@
 {
   inputs = {
+    opam-repository = {
+      url = "github:ocaml/opam-repository";
+      flake = false;
+    };
     opam-nix.url = "github:tweag/opam-nix";
+    opam-nix.inputs.opam-repository.follows = "opam-repository";
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.follows = "opam-nix/nixpkgs";
   };
-  outputs = { self, flake-utils, opam-nix, nixpkgs }@inputs:
+  outputs = { self, flake-utils, opam-nix, opam-repository, nixpkgs }@inputs:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};

diff --git a/lib/vernacular/Eff.ml b/lib/vernacular/Eff.ml
@@ -17,8 +17,7 @@ struct
   type hook = empty
   type context = empty
 end
-module Modifier = Yuujinchou.Modifier.Make(Param)
-module Scope = Yuujinchou.Scope.Make(Param)(Modifier)
+module Scope = Yuujinchou.Scope.Make(Param)
 
 let load path =
   let env = Eff.read () in

diff --git a/polytt.opam b/polytt.opam
@@ -19,7 +19,7 @@ depends: [
   "bantorra"
   "bwd" {>= "1.1"}
   "cmdliner" {>= "1.1"}
-  "yuujinchou" {>= "4.0" & < "5.0"}
+  "yuujinchou" {>= "5.0"}
   "containers"
 ]
 build: [