lol

ocamlPackages.menhir: 20190626 → 20210419

ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419

authored by

Vincent Laporte and committed by
Vincent Laporte
5ca9831c c3d87595

+97 -80
+1 -1
pkgs/applications/science/logic/acgtk/default.nix
··· 11 11 }; 12 12 13 13 buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ 14 - ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson 14 + ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime yojson 15 15 ]); 16 16 17 17 buildPhase = "dune build --profile=release";
+1 -1
pkgs/applications/science/logic/why3/default.nix
··· 11 11 }; 12 12 13 13 buildInputs = with ocamlPackages; [ 14 - ocaml findlib ocamlgraph zarith menhir 14 + ocaml findlib ocamlgraph zarith menhir menhirLib 15 15 # Compressed Sessions 16 16 # Emacs compilation of why3.el 17 17 emacs
+1 -1
pkgs/development/compilers/compcert/default.nix
··· 5 5 }: 6 6 7 7 let 8 - ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; 8 + ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir menhirLib ]; 9 9 ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; 10 10 inherit (coqPackages) coq flocq; 11 11 inherit (lib) optional optionalString;
+1 -1
pkgs/development/compilers/fstar/default.nix
··· 14 14 nativeBuildInputs = [ makeWrapper installShellFiles ]; 15 15 16 16 buildInputs = with ocamlPackages; [ 17 - z3 ocaml findlib batteries menhir stdint 17 + z3 ocaml findlib batteries menhir menhirLib stdint 18 18 zarith camlp4 yojson pprint 19 19 ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild 20 20 ];
+2 -2
pkgs/development/compilers/mezzo/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: 1 + { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, menhirLib, yojson, ulex, pprint, fix, functory }: 2 2 3 3 if lib.versionAtLeast ocaml.version "4.06" 4 4 then throw "mezzo is not available for OCaml ${ocaml.version}" ··· 21 21 sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; 22 22 }; 23 23 24 - buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ]; 24 + buildInputs = [ ocaml findlib ocamlbuild yojson menhir menhirLib ulex pprint fix functory ]; 25 25 26 26 # Sets warning 3 as non-fatal 27 27 prePatch = lib.optionalString (check-ocaml-version "4.02") ''
+4 -4
pkgs/development/compilers/reason/default.nix
··· 1 1 { lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 2 - , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo 2 + , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppx_tools_versioned, utop, cppo 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 13 13 sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; 14 14 }; 15 15 16 - nativeBuildInputs = [ makeWrapper ]; 16 + nativeBuildInputs = [ makeWrapper menhir ]; 17 17 18 - propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; 18 + propagatedBuildInputs = [ menhirLib merlin-extend ppx_tools_versioned ]; 19 19 20 - buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir ]; 20 + buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir menhirSdk ]; 21 21 22 22 buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed 23 23
+3 -3
pkgs/development/ocaml-modules/dolmen/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: 1 + { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, menhirLib }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "ocaml${ocaml.version}-dolmen-${version}"; ··· 10 10 sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; 11 11 }; 12 12 13 - buildInputs = [ ocaml findlib ocamlbuild ]; 14 - propagatedBuildInputs = [ menhir ]; 13 + buildInputs = [ ocaml findlib ocamlbuild menhir ]; 14 + propagatedBuildInputs = [ menhirLib ]; 15 15 16 16 makeFlags = [ "-C" "src" ]; 17 17
+2 -2
pkgs/development/ocaml-modules/earlybird/default.nix
··· 1 1 { lib, fetchurl, ocaml, buildDunePackage 2 - , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, path_glob, ppx_deriving_yojson 2 + , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson 3 3 }: 4 4 5 5 if lib.versionAtLeast ocaml.version "4.13" ··· 19 19 sha256 = "1pwzhcr3pw24ra4j4d23vz71h0psz4xkyp7b12l2wl1slxzjbrxa"; 20 20 }; 21 21 22 - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir path_glob ppx_deriving_yojson ]; 22 + buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ]; 23 23 24 24 meta = { 25 25 homepage = "https://github.com/hackwaly/ocamlearlybird";
+13 -13
pkgs/development/ocaml-modules/menhir/default.nix
··· 1 - { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild 2 - , version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422" 3 - }@args: 1 + { lib, fetchFromGitLab, buildDunePackage 2 + , menhirLib, menhirSdk 3 + }: 4 4 5 - let 6 - src = fetchurl ( 7 - if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; } 8 - else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; } 9 - else if version == "20181113" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181113/archive.tar.gz"; sha256 = "0hl611l0gyl7b2bm7m0sk7vjz14m0i7znrnjq3gw58pylj934dx4"; } 10 - else if version == "20190626" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20190626/archive.tar.gz"; sha256 = "0nigjnskg89knyi2zj1w211mb1pvkrwfqpz9a0qbw80k3hm8gg0h"; } 11 - else throw ("menhir: unknown version " ++ version) 12 - ); 13 - in 5 + buildDunePackage rec { 6 + pname = "menhir"; 7 + 8 + inherit (menhirLib) version src useDune2; 9 + 10 + buildInputs = [ menhirLib menhirSdk ]; 14 11 15 - import ./generic.nix (args // { inherit version src; }) 12 + meta = menhirSdk.meta // { 13 + description = "A LR(1) parser generator for OCaml"; 14 + }; 15 + }
-43
pkgs/development/ocaml-modules/menhir/generic.nix
··· 1 - { version, src, lib, stdenv, ocaml, findlib, ocamlbuild, ... }: 2 - 3 - stdenv.mkDerivation { 4 - pname = "menhir"; 5 - inherit version; 6 - 7 - inherit src; 8 - 9 - buildInputs = [ ocaml findlib ocamlbuild ]; 10 - 11 - createFindlibDestdir = true; 12 - 13 - preBuild = '' 14 - # fix makefiles. 15 - RM=$(type -p rm) 16 - CHMOD=$(type -p chmod) 17 - for f in src/Makefile demos/OMakefile* demos/Makefile* 18 - do 19 - substituteInPlace $f \ 20 - --replace /bin/rm $RM \ 21 - --replace /bin/chmod $CHMOD 22 - done 23 - 24 - export PREFIX=$out 25 - ''; 26 - 27 - meta = with lib; { 28 - homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; 29 - description = "A LR(1) parser generator for OCaml"; 30 - longDescription = '' 31 - Menhir is a LR(1) parser generator for the Objective Caml programming 32 - language. That is, Menhir compiles LR(1) grammar specifications down 33 - to OCaml code. Menhir was designed and implemented by François Pottier 34 - and Yann Régis-Gianas. 35 - ''; 36 - license = with licenses; [ 37 - (if versionAtLeast version "20170418" then gpl2 else qpl) /* generator */ 38 - lgpl2 /* library */ 39 - ]; 40 - platforms = ocaml.meta.platforms or []; 41 - maintainers = with maintainers; [ maggesi ]; 42 - }; 43 - }
+29
pkgs/development/ocaml-modules/menhir/lib.nix
··· 1 + { lib, fetchFromGitLab, buildDunePackage }: 2 + 3 + buildDunePackage rec { 4 + pname = "menhirLib"; 5 + version = "20210419"; 6 + 7 + src = fetchFromGitLab { 8 + domain = "gitlab.inria.fr"; 9 + owner = "fpottier"; 10 + repo = "menhir"; 11 + rev = version; 12 + sha256 = "0jcbr7s3iwfr7xxfybs3h407g76yfp5yq5r9i0wg2ahvvbqh03ky"; 13 + }; 14 + 15 + useDune2 = true; 16 + 17 + meta = with lib; { 18 + homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; 19 + description = "Runtime support library for parsers generated by Menhir"; 20 + longDescription = '' 21 + Menhir is a LR(1) parser generator for the Objective Caml programming 22 + language. That is, Menhir compiles LR(1) grammar specifications down 23 + to OCaml code. Menhir was designed and implemented by François Pottier 24 + and Yann Régis-Gianas. 25 + ''; 26 + license = with licenses; [ lgpl2Only ]; 27 + maintainers = with maintainers; [ vbgl ]; 28 + }; 29 + }
+15
pkgs/development/ocaml-modules/menhir/sdk.nix
··· 1 + { lib, fetchFromGitLab, buildDunePackage 2 + , menhirLib 3 + }: 4 + 5 + buildDunePackage rec { 6 + pname = "menhirSdk"; 7 + 8 + inherit (menhirLib) version src useDune2; 9 + 10 + meta = menhirLib.meta // { 11 + description = "Compile-time library for auxiliary tools related to Menhir"; 12 + license = with lib.licenses; [ gpl2Only ]; 13 + }; 14 + } 15 +
+3 -3
pkgs/development/ocaml-modules/mustache/default.nix
··· 1 - { lib, buildDunePackage, fetchFromGitHub, ezjsonm, menhir, ounit }: 1 + { lib, buildDunePackage, fetchFromGitHub, ezjsonm, menhir, menhirLib, ounit }: 2 2 3 3 buildDunePackage rec { 4 4 pname = "mustache"; ··· 11 11 sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py"; 12 12 }; 13 13 14 - buildInputs = [ ezjsonm ]; 15 - propagatedBuildInputs = [ menhir ]; 14 + buildInputs = [ ezjsonm menhir ]; 15 + propagatedBuildInputs = [ menhirLib ]; 16 16 17 17 doCheck = true; 18 18 checkInputs = [ ounit ];
+2 -2
pkgs/development/tools/analysis/frama-c/default.nix
··· 11 11 biniou 12 12 camlzip 13 13 easy-format 14 - menhir 14 + menhirLib 15 15 mlgmpidl 16 16 num 17 17 ocamlgraph ··· 37 37 nativeBuildInputs = [ autoconf wrapGAppsHook ]; 38 38 39 39 buildInputs = with ocamlPackages; [ 40 - ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip 40 + ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip 41 41 lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen 42 42 gdk-pixbuf 43 43 ];
+2 -2
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
··· 1 1 { lib, fetchurl, buildDunePackage 2 2 , ocaml, cmdliner, cppo, yojson, ppxlib 3 - , menhir 3 + , menhir, menhirLib 4 4 }: 5 5 6 6 buildDunePackage rec { ··· 14 14 }; 15 15 16 16 nativeBuildInputs = [ cppo menhir ]; 17 - buildInputs = [ cmdliner ]; 17 + buildInputs = [ cmdliner menhirLib ]; 18 18 19 19 configurePlatforms = []; 20 20 propagatedBuildInputs = [ yojson ppxlib ];
+4
pkgs/development/tools/ocaml/merlin/4.x.nix
··· 10 10 , dot-merlin-reader 11 11 , jq 12 12 , menhir 13 + , menhirLib 14 + , menhirSdk 13 15 }: 14 16 15 17 let ··· 66 68 checkInputs = [ 67 69 jq 68 70 menhir 71 + menhirLib 72 + menhirSdk 69 73 ]; 70 74 71 75 meta = with lib; {
+8
pkgs/development/tools/ocaml/ocamlformat/generic.nix
··· 58 58 uutf 59 59 fix 60 60 menhir 61 + menhirLib 62 + menhirSdk 61 63 dune-build-info 62 64 ocaml-version 63 65 # Changed since 0.16.0: ··· 75 77 uutf 76 78 fix 77 79 menhir 80 + menhirLib 81 + menhirSdk 78 82 dune-build-info 79 83 ocaml-version 80 84 # Changed since 0.16.0: ··· 93 97 uutf 94 98 fix 95 99 menhir 100 + menhirLib 101 + menhirSdk 96 102 (ppxlib.override { version = "0.18.0"; }) 97 103 dune-build-info # lib.versionAtLeast version "0.16.0" 98 104 ocaml-version # lib.versionAtLeast version "0.16.0" ··· 110 116 uutf 111 117 fix 112 118 menhir 119 + menhirLib 120 + menhirSdk 113 121 ] else [ 114 122 base 115 123 cmdliner
+1 -1
pkgs/tools/audio/liquidsoap/full.nix
··· 59 59 ocamlPackages.xmlm ocamlPackages.ocaml_pcre 60 60 ocamlPackages.camomile 61 61 ocamlPackages.fdkaac 62 - ocamlPackages.srt ocamlPackages.sedlex_2 ocamlPackages.menhir 62 + ocamlPackages.srt ocamlPackages.sedlex_2 ocamlPackages.menhir ocamlPackages.menhirLib 63 63 ]; 64 64 65 65 hardeningDisable = [ "format" "fortify" ];
+1 -1
pkgs/tools/typesetting/satysfi/default.nix
··· 53 53 nativeBuildInputs = [ ruby dune_2 ]; 54 54 55 55 buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ 56 - ocaml findlib menhir 56 + ocaml findlib menhir menhirLib 57 57 batteries camlimages core_kernel ppx_deriving uutf omd cppo re 58 58 ]); 59 59
+4
pkgs/top-level/ocaml-packages.nix
··· 643 643 644 644 menhir = callPackage ../development/ocaml-modules/menhir { }; 645 645 646 + menhirLib = callPackage ../development/ocaml-modules/menhir/lib.nix { }; 647 + 648 + menhirSdk = callPackage ../development/ocaml-modules/menhir/sdk.nix { }; 649 + 646 650 merlin = 647 651 if lib.versionAtLeast ocaml.version "4.11" 648 652 then callPackage ../development/tools/ocaml/merlin/4.x.nix { }