Unverified Commit 8ba33711 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

ocamlPackages.atd: 2.15.0 → 2.16.0 (#381337)

parents 4a2be1f7 158f4614

pkgs/development/ocaml-modules/atdgen/codec-runtime.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


buildDunePackage rec {

  pname = "atdgen-codec-runtime";

  version = "2.15.0";

  version = "2.16.0";



  src = fetchurl {

    url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz";

    hash = "sha256-ukJ5vtVNE9zz9nA6SzF0TbgV3yLAUC2ZZdbGdM4IOTM=";

    hash = "sha256-Wea0RWICQcvWkBqEKzNmg6+w6xJbOtv+4ovZTNVODe8=";

  };



  meta = {

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

+2 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  atd,

  atdgen-codec-runtime,

  atdgen-runtime,

  biniou,

  re,

  python3,

}:
@@ -12,8 +13,6 @@ buildDunePackage { 
  pname = "atdgen";

  inherit (atdgen-codec-runtime) version src;



  duneVersion = "3";



  buildInputs = [

    atd

    re
@@ -24,6 +23,7 @@ buildDunePackage { 
  doCheck = true;

  nativeCheckInputs = [

    atd

    biniou

    (python3.withPackages (ps: [ ps.jsonschema ]))

  ];

  checkInputs = [

pkgs/development/ocaml-modules/atdgen/runtime.nix

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ buildDunePackage rec { 
  inherit (atdgen-codec-runtime) version src;



  minimalOCamlVersion = "4.08";

  duneVersion = "3";



  propagatedBuildInputs = [

    biniou

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

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, ocaml

, menhir, menhirLib

, atdgen

, atdgen-runtime

, stdlib-shims

, re, perl, ncurses

, ppxlib, ppx_deriving
@@ -47,12 +48,11 @@ in buildDunePackage { 


  minimalOCamlVersion = "4.07";



  # atdgen is both a library and executable

  nativeBuildInputs = [ perl ]

  ++ [ (if lib.versionAtLeast version "1.15" || version == "dev" then menhir else camlp5) ]

  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;

  buildInputs = [ ncurses ]

  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;

  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;



  propagatedBuildInputs = [ re stdlib-shims ]

  ++ (if lib.versionAtLeast version "1.15" || version == "dev"
@@ -73,5 +73,7 @@ in buildDunePackage { 


  postPatch = ''

    substituteInPlace elpi_REPL.ml --replace-warn "tput cols" "${ncurses}/bin/tput cols"

  '' + lib.optionalString (lib.versionAtLeast version "1.16" || version == "dev") ''

    substituteInPlace src/dune --replace-warn ' atdgen re' ' atdgen-runtime re'

  '';

}

pkgs/development/ocaml-modules/github/data.nix

+5 −2
Original line number Diff line number Diff line
@@ -3,13 +3,16 @@ 
  github,

  yojson,

  atdgen,

  atdgen-runtime,

}:



buildDunePackage {

  pname = "github-data";

  inherit (github) version src;



  duneVersion = "3";

  postPatch = ''

    substituteInPlace lib_data/dune --replace-warn 'atdgen)' 'atdgen-runtime)'

  '';



  nativeBuildInputs = [

    atdgen
@@ -17,7 +20,7 @@ buildDunePackage { 


  propagatedBuildInputs = [

    yojson

    atdgen

    atdgen-runtime

  ];



  meta = github.meta // {