Merge pull request #222345 from vbgl/ocaml-gen-1.1

ocamlPackages.gen: 1.0 → 1.1

pkgs/applications/science/logic/acgtk/default.nix

···
-{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }:
+{ lib, stdenv, fetchFromGitLab, dune_3, ocamlPackages }:
 
 stdenv.mkDerivation {
 
···
 
   strictDeps = true;
 
-  nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ];
+  nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ];
 
   buildInputs = with ocamlPackages; [
     ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson

pkgs/development/ocaml-modules/gen/default.nix

···
 { lib, buildDunePackage, fetchFromGitHub, ocaml
-, dune-configurator
 , seq
 , qcheck, ounit2
 }:
 
 buildDunePackage rec {
-  version = "1.0";
+  version = "1.1";
   pname = "gen";
   minimalOCamlVersion = "4.03";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
     rev = "v${version}";
-    hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw=";
+    hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk=";
   };
 
-  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ seq ];
   checkInputs = [ qcheck ounit2 ];
 

pkgs/development/ocaml-modules/higlo/default.nix

···
 buildDunePackage rec {
   pname = "higlo";
   version = "0.8";
-  useDune2 = true;
+  duneVersion = "3";
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";

pkgs/development/ocaml-modules/iri/default.nix

···
 buildDunePackage rec {
   pname = "iri";
   version = "0.6.0";
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchFromGitLab {
     domain = "framagit.org";

pkgs/development/ocaml-modules/sedlex/default.nix

···
   inherit (param) version;
 
   minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "ocaml-community";

pkgs/development/ocaml-modules/xtmpl/default.nix

···
 buildDunePackage rec {
   pname = "xtmpl";
   version = "0.19.0";
-  useDune2 = true;
+  duneVersion = "3";
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";

pkgs/development/ocaml-modules/xtmpl/ppx.nix

···
 buildDunePackage {
   pname = "xtmpl_ppx";
   minimalOCamlVersion = "4.11";
+  duneVersion = "3";
 
-  inherit (xtmpl) src version useDune2;
+  inherit (xtmpl) src version;
 
   buildInputs = [ ppxlib xtmpl ];