commit f09f7f1778d7113651967e53bfbc2b0e92976d2e · pyrox.dev/nixpkgs

+2 -2

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

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "atdgen-codec-runtime";

     

       5
       -
         version = "2.9.1";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
       -
           sha256 = "sha256-OdwaUR0Ix0Oz8NDm36nIyvIRzF+r/pKgiej1fhcOmuQ=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = {

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "atdgen-codec-runtime";

     

       5
       +
         version = "2.10.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

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

     

       9
       +
           sha256 = "sha256-d9J0CaTp2sQbnKLp6mCDbGwYAIsioVer7ftaLSSFCZg=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         meta = {

+2 -2

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

···

       1
       -
       { buildDunePackage, atdgen-codec-runtime, biniou, camlp-streams, yojson }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "atdgen-runtime";

     
···

       6
        
       

     

       7
        
         minimalOCamlVersion = "4.08";

     

       8
        
       

     

       9
       -
         propagatedBuildInputs = [ biniou camlp-streams yojson ];

     

       10
        
       

     

       11
        
         meta = atdgen-codec-runtime.meta // {

     

       12
        
           description = "Runtime library for code generated by atdgen";

···

       1
       +
       { buildDunePackage, atdgen-codec-runtime, biniou, yojson }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "atdgen-runtime";

     
···

       6
        
       

     

       7
        
         minimalOCamlVersion = "4.08";

     

       8
        
       

     

       9
       +
         propagatedBuildInputs = [ biniou yojson ];

     

       10
        
       

     

       11
        
         meta = atdgen-codec-runtime.meta // {

     

       12
        
           description = "Runtime library for code generated by atdgen";

+13

pkgs/development/ocaml-modules/elpi/atd_2_10.patch

···

       1
       +
       diff --git a/src/elpi_trace_elaborator.ml b/src/elpi_trace_elaborator.ml

     

       2
       +
       index ca13114d..093e7593 100644

     

       3
       +
       --- a/src/elpi_trace_elaborator.ml

     

       4
       +
       +++ b/src/elpi_trace_elaborator.ml

     

       5
       +
       @@ -664,6 +664,6 @@ let main =

     

       6
       +
        

     

       7
       +
          let cards = Trace.cards steps ~stack_frames ~aggregated_goal_success ~goal_text ~goal_attempts in

     

       8
       +
        

     

       9
       +
       -  let ob = Bi_outbuf.create_channel_writer stdout in

     

       10
       +
       +  let ob = Buffer.create 17 in

     

       11
       +
          write_trace ob cards;

     

       12
       +
       -  Bi_outbuf.flush_channel_writer ob

     

       13
       +
       +  Buffer.output_buffer stdout ob

+3

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

···

       31
        
         pname = "elpi";

     

       32
        
         inherit (fetched) version src;

     

       33
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
         minimalOCamlVersion = "4.04";

     

       35
        
       

     

       36
        
         buildInputs = [ perl ncurses ]

···

       31
        
         pname = "elpi";

     

       32
        
         inherit (fetched) version src;

     

       33
        
       

     

       34
       +
         patches = lib.optional (versionAtLeast version "1.16" || version == "dev")

     

       35
       +
           ./atd_2_10.patch;

     

       36
       +
       

     

       37
        
         minimalOCamlVersion = "4.04";

     

       38
        
       

     

       39
        
         buildInputs = [ perl ncurses ]

+4 -5

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

···

       1
       -
       { lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "yojson";

     

       5
       -
         version = "1.7.0";

     

       6
       -
         useDune2 = true;

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
        
           url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";

     

       10
       -
           sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5";

     

       11
        
         };

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ cppo ];

     

       14
       -
         propagatedBuildInputs = [ easy-format biniou ];

     

       15
        
       

     

       16
        
         meta = with lib; {

     

       17
        
           description = "An optimized parsing and printing library for the JSON format";

···

       1
       +
       { lib, fetchurl, buildDunePackage, cppo, seq }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "yojson";

     

       5
       +
         version = "2.0.2";

     

       0
        
       
     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";

     

       9
       +
           sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         nativeBuildInputs = [ cppo ];

     

       13
       +
         propagatedBuildInputs = [ seq ];

     

       14
        
       

     

       15
        
         meta = with lib; {

     

       16
        
           description = "An optimized parsing and printing library for the JSON format";

+9 -14

pkgs/development/tools/ocaml/merlin/4.x.nix

···

       6
        
       , buildDunePackage

     

       7
        
       , yojson

     

       8
        
       , csexp

     

       9
       -
       , result

     

       10
        
       , dot-merlin-reader

     

       11
        
       , jq

     

       12
        
       , menhir

     
···

       15
        
       }:

     

       16
        
       

     

       17
        
       let

     

       18
       -
         merlinVersion = "4.5";

     

       19
        
       

     

       20
        
         hashes = {

     

       21
       -
           "4.5-411" = "sha256:05nz6y7r91rh0lj8b6xdv3s3yknmvjc7y60v17kszgqnr887bvpn";

     

       22
       -
           "4.5-412" = "sha256:0i5c3rfzinmwdjya7gv94zyknsm32qx9dlg472xpfqivwvnnhf1z";

     

       23
       -
           "4.5-413" = "sha256:1sphq9anfg1qzrvj7hdcqflj6cmc1qiyfkljhng9fxnnr0i7550s";

     

       24
       -
           "4.5-414" = "sha256:13h588kwih05zd9p3p7q528q4zc0d1l983kkvbmkxgay5d17nn1i";

     

       25
        
         };

     

       26
        
       

     

       27
        
         ocamlVersionShorthand = lib.concatStrings

     
···

       49
        
             dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";

     

       50
        
             dune = "${dune_2}/bin/dune";

     

       51
        
           })

     

       52
       -
         ] ++ lib.optional (lib.versionOlder ocaml.version "4.12")

     

       53
       -
           # This fixes the test-suite on macOS

     

       54
       -
           # See https://github.com/ocaml/merlin/pull/1399

     

       55
       -
           # Fixed in 4.4 for OCaml ≥ 4.12

     

       56
       -
           ./test.patch

     

       57
       -
         ;

     

       58
        
       

     

       59
        
         strictDeps = true;

     

       60
        
       

     
···

       65
        
         buildInputs = [

     

       66
        
           dot-merlin-reader

     

       67
        
           yojson

     

       68
       -
           csexp

     

       69
       -
           result

     

       0
        
       
     

       70
        
           menhirSdk

     

       71
        
           menhirLib

     

       72
        
         ];

···

       6
        
       , buildDunePackage

     

       7
        
       , yojson

     

       8
        
       , csexp

     

       9
       +
       , merlin-lib

     

       10
        
       , dot-merlin-reader

     

       11
        
       , jq

     

       12
        
       , menhir

     
···

       15
        
       }:

     

       16
        
       

     

       17
        
       let

     

       18
       +
         merlinVersion = "4.6";

     

       19
        
       

     

       20
        
         hashes = {

     

       21
       +
           "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c=";

     

       22
       +
           "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4=";

     

       23
       +
           "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84=";

     

       0
        
       
     

       24
        
         };

     

       25
        
       

     

       26
        
         ocamlVersionShorthand = lib.concatStrings

     
···

       48
        
             dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";

     

       49
        
             dune = "${dune_2}/bin/dune";

     

       50
        
           })

     

       51
       +
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       52
        
       

     

       53
        
         strictDeps = true;

     

       54
        
       

     
···

       59
        
         buildInputs = [

     

       60
        
           dot-merlin-reader

     

       61
        
           yojson

     

       62
       +
           (if lib.versionAtLeast version "4.6-414"

     

       63
       +
            then merlin-lib

     

       64
       +
            else csexp)

     

       65
        
           menhirSdk

     

       66
        
           menhirLib

     

       67
        
         ];

+4 -6

pkgs/development/tools/ocaml/merlin/default.nix

···

       3
        
       

     

       4
        
       buildDunePackage rec {

     

       5
        
         pname = "merlin";

     

       6
       -
         version = "3.4.2";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
       -
           url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";

     

       10
       -
           sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81";

     

       11
        
         };

     

       12
        
       

     

       13
       -
         useDune2 = true;

     

       14
       -
       

     

       15
       -
         minimumOCamlVersion = "4.02.3";

     

       16
        
       

     

       17
        
         patches = [

     

       18
        
           (substituteAll {

···

       3
        
       

     

       4
        
       buildDunePackage rec {

     

       5
        
         pname = "merlin";

     

       6
       +
         version = "3.8.0";

     

       7
        
       

     

       8
        
         src = fetchurl {

     

       9
       +
           url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz";

     

       10
       +
           sha256 = "sha256-wmBGNwXL3BduF4o1sUXtAOUHJ4xmMvsWAxl/QdNj/28=";

     

       11
        
         };

     

       12
        
       

     

       13
       +
         minimalOCamlVersion = "4.02.3";

     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
        
         patches = [

     

       16
        
           (substituteAll {

+6 -10

pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix

···

       1
       -
       { lib, fetchurl, yojson, csexp, result, buildDunePackage }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "dot-merlin-reader";

     

       5
       -
         version = "4.1";

     

       6
        
       

     

       7
       -
         useDune2 = true;

     

       8
       -
       

     

       9
       -
         minimumOCamlVersion = "4.06";

     

       10
        
       

     

       11
       -
         src = fetchurl {

     

       12
       -
           url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz";

     

       13
       -
           sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd";

     

       14
       -
         };

     

       15
        
       

     

       16
       -
         buildInputs = [ yojson csexp result ];

     

       0
        
       
     

       0
        
       
     

       17
        
       

     

       18
        
         meta = with lib; {

     

       19
        
           description = "Reads config files for merlin";

···

       1
       +
       { lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "dot-merlin-reader";

     

       0
        
       
     

       5
        
       

     

       6
       +
         inherit (merlin) version src;

     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
       +
         minimalOCamlVersion = "4.06";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
       +
         buildInputs = if lib.versionAtLeast version "4.6-414"

     

       11
       +
         then [ merlin-lib ]

     

       12
       +
         else [ yojson csexp ];

     

       13
        
       

     

       14
        
         meta = with lib; {

     

       15
        
           description = "Reads config files for merlin";

+14

pkgs/development/tools/ocaml/merlin/lib.nix

···

       1
       +
       { lib, buildDunePackage, merlin, csexp }:

     

       2
       +
       

     

       3
       +
       buildDunePackage {

     

       4
       +
         pname = "merlin-lib";

     

       5
       +
         inherit (merlin) version src;

     

       6
       +
       

     

       7
       +
         minimalOCamlVersion = "4.14";

     

       8
       +
       

     

       9
       +
         propagatedBuildInputs = [ csexp ];

     

       10
       +
       

     

       11
       +
         meta = merlin.meta // {

     

       12
       +
           description = "Merlin’s libraries";

     

       13
       +
         };

     

       14
       +
       }

-19

pkgs/development/tools/ocaml/merlin/test.patch

···

       1
       -
       commit 282eed37f39ff216add8d53766fd59f3737eb87f

     

       2
       -
       Author: Vincent Laporte <Vincent.Laporte@gmail.com>

     

       3
       -
       Date:   Thu Nov 4 06:24:07 2021 +0100

     

       4
       -
       

     

       5
       -
           Ignore dune stderr in tests

     

       6
       -
       

     

       7
       -
       diff --git a/tests/test-dirs/document/src-documentation.t/run.t b/tests/test-dirs/document/src-documentation.t/run.t

     

       8
       -
       index 2c9e1419..4f4c4327 100644

     

       9
       -
       --- a/tests/test-dirs/document/src-documentation.t/run.t

     

       10
       -
       +++ b/tests/test-dirs/document/src-documentation.t/run.t

     

       11
       -
       @@ -42,7 +42,7 @@ documentation for the non-last defined value (in the same file) is show

     

       12
       -
          > jq '.value'

     

       13
       -
          " List reversal. "

     

       14
       -
        

     

       15
       -
       -  $ dune build --root=. ./doc.exe

     

       16
       -
       +  $ dune build --root=. ./doc.exe 2> /dev/null

     

       17
       -
          $ cat >.merlin <<EOF

     

       18
       -
          > B _build/default/.doc.eobjs/byte

     

       19
       -
          > S .

+3 -1

pkgs/top-level/ocaml-packages.nix

···

       787
        
           menhirSdk = callPackage ../development/ocaml-modules/menhir/sdk.nix { };

     

       788
        
       

     

       789
        
           merlin =

     

       790
       -
             if lib.versionAtLeast ocaml.version "4.11"

     

       791
        
             then callPackage ../development/tools/ocaml/merlin/4.x.nix { }

     

       792
        
             else callPackage ../development/tools/ocaml/merlin { };

     

       793
        
       

     

       794
        
           merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };

     

       0
        
       
     

       0
        
       
     

       795
        
       

     

       796
        
           dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { };

     

       797

···

       787
        
           menhirSdk = callPackage ../development/ocaml-modules/menhir/sdk.nix { };

     

       788
        
       

     

       789
        
           merlin =

     

       790
       +
             if lib.versionAtLeast ocaml.version "4.12"

     

       791
        
             then callPackage ../development/tools/ocaml/merlin/4.x.nix { }

     

       792
        
             else callPackage ../development/tools/ocaml/merlin { };

     

       793
        
       

     

       794
        
           merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };

     

       795
       +
       

     

       796
       +
           merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { };

     

       797
        
       

     

       798
        
           dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { };

     

       799