commit cfe014a5a2a8d65d85036e7216a28371454616b9 · pyrox.dev/nixpkgs

+137

pkgs/development/ocaml-modules/dolmen/linol-common-migration.patch

···

       1
       1
       +
       diff --git i/src/lsp/diagnostic.ml w/src/lsp/diagnostic.ml

     

       2
       2
       +
       index 149cde11..bd93298a 100644

     

       3
       3
       +
       --- i/src/lsp/diagnostic.ml

     

       4
       4
       +
       +++ w/src/lsp/diagnostic.ml

     

       5
       5
       +
       @@ -1,13 +1,12 @@

     

       6
       6
       +
       -

     

       7
       7
       +
        (* This file is free software, part of dolmen. See file "LICENSE" for more information *)

     

       8
       8
       +
        

     

       9
       9
       +
       -type t = Lsp.Types.Diagnostic.t

     

       10
       10
       +
       +type t = Linol__.Common_.Lsp.Types.Diagnostic.t

     

       11
       11
       +
        

     

       12
       12
       +
        let lsp_pos line character =

     

       13
       13
       +
       -  Lsp.Types.Position.create ~line ~character

     

       14
       14
       +
       +  Linol__.Common_.Lsp.Types.Position.create ~line ~character

     

       15
       15
       +
        

     

       16
       16
       +
        let lsp_range start end_ =

     

       17
       17
       +
       -  Lsp.Types.Range.create ~start ~end_

     

       18
       18
       +
       +  Linol__.Common_.Lsp.Types.Range.create ~start ~end_

     

       19
       19
       +
        

     

       20
       20
       +
        let start_pos = lsp_pos 1 1

     

       21
       21
       +
        let start_range = lsp_range start_pos start_pos

     

       22
       22
       +
       @@ -23,17 +22,15 @@ let range_of_loc = function

     

       23
       23
       +
                (lsp_pos (l.stop_line - 1) l.stop_column)

     

       24
       24
       +
        

     

       25
       25
       +
        let warn ?loc message =

     

       26
       26
       +
       -  Lsp.Types.Diagnostic.create ()

     

       27
       27
       +
       +  Linol__.Common_.Lsp.Types.Diagnostic.create ()

     

       28
       28
       +
            ~range:(range_of_loc loc)

     

       29
       29
       +
            ~severity:Warning

     

       30
       30
       +
            ~source:"dolmenls"

     

       31
       31
       +
            ~message

     

       32
       32
       +
        

     

       33
       33
       +
        let error ?loc message =

     

       34
       34
       +
       -  Lsp.Types.Diagnostic.create ()

     

       35
       35
       +
       +  Linol__.Common_.Lsp.Types.Diagnostic.create ()

     

       36
       36
       +
            ~range:(range_of_loc loc)

     

       37
       37
       +
            ~severity:Error

     

       38
       38
       +
            ~source:"dolmenls"

     

       39
       39
       +
            ~message

     

       40
       40
       +
       -

     

       41
       41
       +
       -

     

       42
       42
       +
       diff --git i/src/lsp/main.ml w/src/lsp/main.ml

     

       43
       43
       +
       index 8d6fc760..b52dd25c 100644

     

       44
       44
       +
       --- i/src/lsp/main.ml

     

       45
       45
       +
       +++ w/src/lsp/main.ml

     

       46
       46
       +
       @@ -3,7 +3,7 @@

     

       47
       47
       +
        

     

       48
       48
       +
        let run () =

     

       49
       49
       +
          let s = new Server.dolmen_lsp_server in

     

       50
       50
       +
       -  let server = Linol_lwt.Jsonrpc2.create_stdio s in

     

       51
       51
       +
       +  let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() s in

     

       52
       52
       +
          let task = Linol_lwt.Jsonrpc2.run server in

     

       53
       53
       +
          match Linol_lwt.run task with

     

       54
       54
       +
          | () -> ()

     

       55
       55
       +
       diff --git i/src/lsp/server.ml w/src/lsp/server.ml

     

       56
       56
       +
       index e895cc6a..a01ed9fb 100644

     

       57
       57
       +
       --- i/src/lsp/server.ml

     

       58
       58
       +
       +++ w/src/lsp/server.ml

     

       59
       59
       +
       @@ -44,25 +44,28 @@ class dolmen_lsp_server =

     

       60
       60
       +
          object(self)

     

       61
       61
       +
            inherit Linol_lwt.Jsonrpc2.server

     

       62
       62
       +
        

     

       63
       63
       +
       +    method spawn_query_handler f = Linol_lwt.spawn f

     

       64
       64
       +
       +

     

       65
       65
       +
            (* one env per document *)

     

       66
       66
       +
       -    val buffers: (Lsp.Types.DocumentUri.t, State.t) Hashtbl.t = Hashtbl.create 32

     

       67
       67
       +
       +    val buffers: (Linol__.Common_.Lsp.Types.DocumentUri.t, State.t) Hashtbl.t = Hashtbl.create 32

     

       68
       68
       +
        

     

       69
       69
       +
            (* A list of include statements of the prelude files *)

     

       70
       70
       +
            val mutable prelude = []

     

       71
       71
       +
        

     

       72
       72
       +
            method! config_sync_opts =

     

       73
       73
       +
              (* configure how sync happens *)

     

       74
       74
       +
       -      let change = Lsp.Types.TextDocumentSyncKind.Incremental in

     

       75
       75
       +
       -      (* Lsp.Types.TextDocumentSyncKind.Full *)

     

       76
       76
       +
       -      Lsp.Types.TextDocumentSyncOptions.create ~openClose:true ~change

     

       77
       77
       +
       -        ~save:(Lsp.Types.SaveOptions.create ~includeText:false ())

     

       78
       78
       +
       +      let change = Linol__.Common_.Lsp.Types.TextDocumentSyncKind.Incremental in

     

       79
       79
       +
       +      (* Linol__.Common_.Lsp.Types.TextDocumentSyncKind.Full *)

     

       80
       80
       +
       +      Linol__.Common_.Lsp.Types.TextDocumentSyncOptions.create ~openClose:true ~change

     

       81
       81
       +
       +        ~save:(`SaveOptions (Linol__.Common_.Lsp.Types.SaveOptions.create ~includeText:false ()))

     

       82
       82
       +
                ()

     

       83
       83
       +
        

     

       84
       84
       +
            method private _on_doc

     

       85
       85
       +
                ~(notify_back:Linol_lwt.Jsonrpc2.notify_back)

     

       86
       86
       +
       -        (uri:Lsp.Types.DocumentUri.t) (contents:string) =

     

       87
       87
       +
       +        (uri:Linol__.Common_.Lsp.Types.DocumentUri.t) (contents:string) =

     

       88
       88
       +
              (* TODO: unescape uri/translate it to a correct path ? *)

     

       89
       89
       +
       -      match Loop.process prelude (preprocess_uri uri) (Some contents) with

     

       90
       90
       +
       +      let uri_path = Linol__.Common_.Lsp.Uri.to_path uri in

     

       91
       91
       +
       +      match Loop.process prelude (preprocess_uri uri_path) (Some contents) with

     

       92
       92
       +
              | Ok state ->

     

       93
       93
       +
                let diags = State.get State.diagnostics state in

     

       94
       94
       +
                Hashtbl.replace buffers uri state;

     

       95
       95
       +
       @@ -79,9 +82,9 @@ class dolmen_lsp_server =

     

       96
       96
       +
              self#_on_doc ~notify_back d.uri new_content

     

       97
       97
       +
        

     

       98
       98
       +
            method! on_notification_unhandled

     

       99
       99
       +
       -        ~notify_back:_ (n:Lsp.Client_notification.t) =

     

       100
       100
       +
       +        ~notify_back:_ (n:Linol__.Common_.Lsp.Client_notification.t) =

     

       101
       101
       +
              match n with

     

       102
       102
       +
       -      | Lsp.Client_notification.ChangeConfiguration { settings; } ->

     

       103
       103
       +
       +      | Linol__.Common_.Lsp.Client_notification.ChangeConfiguration { settings; } ->

     

       104
       104
       +
                begin try

     

       105
       105
       +
                    prelude <- mk_prelude (parse_settings settings);

     

       106
       106
       +
                    Linol_lwt.Jsonrpc2.IO.return ()

     

       107
       107
       +
       @@ -89,7 +92,7 @@ class dolmen_lsp_server =

     

       108
       108
       +
                    Linol_lwt.Jsonrpc2.IO.failwith s

     

       109
       109
       +
                end

     

       110
       110
       +
              | _ ->

     

       111
       111
       +
       -        Lwt.return ()

     

       112
       112
       +
       +        Linol_lwt.Jsonrpc2.IO.return ()

     

       113
       113
       +
        

     

       114
       114
       +
            method on_notif_doc_did_close ~notify_back d =

     

       115
       115
       +
              Hashtbl.remove buffers d.uri;

     

       116
       116
       +
       diff --git i/src/lsp/state.ml w/src/lsp/state.ml

     

       117
       117
       +
       index f3e89640..3f8a36ab 100644

     

       118
       118
       +
       --- i/src/lsp/state.ml

     

       119
       119
       +
       +++ w/src/lsp/state.ml

     

       120
       120
       +
       @@ -45,7 +45,7 @@ let warn ?file:_ ?loc t warn payload =

     

       121
       121
       +
          in

     

       122
       122
       +
          Format.kfprintf (fun _ ->

     

       123
       123
       +
              let msg = Format.flush_str_formatter () in

     

       124
       124
       +
       -      let d = Diagnostic.warn ~loc msg in

     

       125
       125
       +
       +      let d = Diagnostic.warn ~loc (`String msg) in

     

       126
       126
       +
              add_diag d t) Format.str_formatter "%a"

     

       127
       127
       +
            Dolmen_loop.Report.Warning.print (warn, payload)

     

       128
       128
       +
        

     

       129
       129
       +
       @@ -67,7 +67,7 @@ let error ?file:_ ?loc t err payload =

     

       130
       130
       +
          (* Print the error message *)

     

       131
       131
       +
          Format.kfprintf (fun _ ->

     

       132
       132
       +
              let msg = Format.flush_str_formatter () in

     

       133
       133
       +
       -      let d = Diagnostic.error ~loc msg in

     

       134
       134
       +
       +      let d = Diagnostic.error ~loc (`String msg) in

     

       135
       135
       +
              add_diag d t) Format.str_formatter "%a"

     

       136
       136
       +
            Dolmen_loop.Report.Error.print (err, payload)

     

       137
       137
       +

-43

pkgs/development/ocaml-modules/dolmen/linol-lwt-6.patch

···

       1
       1
       -
       diff --git a/src/lsp/main.ml b/src/lsp/main.ml

     

       2
       2
       -
       index 8d6fc760..b52dd25c 100644

     

       3
       3
       -
       --- a/src/lsp/main.ml

     

       4
       4
       -
       +++ b/src/lsp/main.ml

     

       5
       5
       -
       @@ -3,7 +3,7 @@

     

       6
       6
       -
        

     

       7
       7
       -
        let run () =

     

       8
       8
       -
          let s = new Server.dolmen_lsp_server in

     

       9
       9
       -
       -  let server = Linol_lwt.Jsonrpc2.create_stdio s in

     

       10
       10
       -
       +  let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() s in

     

       11
       11
       -
          let task = Linol_lwt.Jsonrpc2.run server in

     

       12
       12
       -
          match Linol_lwt.run task with

     

       13
       13
       -
          | () -> ()

     

       14
       14
       -
       diff --git a/src/lsp/server.ml b/src/lsp/server.ml

     

       15
       15
       -
       index e895cc6a..c9a3f237 100644

     

       16
       16
       -
       --- a/src/lsp/server.ml

     

       17
       17
       -
       +++ b/src/lsp/server.ml

     

       18
       18
       -
       @@ -44,6 +44,8 @@ class dolmen_lsp_server =

     

       19
       19
       -
          object(self)

     

       20
       20
       -
            inherit Linol_lwt.Jsonrpc2.server

     

       21
       21
       -
        

     

       22
       22
       -
       +    method spawn_query_handler _ = ()

     

       23
       23
       -
       +

     

       24
       24
       -
            (* one env per document *)

     

       25
       25
       -
            val buffers: (Lsp.Types.DocumentUri.t, State.t) Hashtbl.t = Hashtbl.create 32

     

       26
       26
       -
        

     

       27
       27
       -
       @@ -55,14 +57,14 @@ class dolmen_lsp_server =

     

       28
       28
       -
              let change = Lsp.Types.TextDocumentSyncKind.Incremental in

     

       29
       29
       -
              (* Lsp.Types.TextDocumentSyncKind.Full *)

     

       30
       30
       -
              Lsp.Types.TextDocumentSyncOptions.create ~openClose:true ~change

     

       31
       31
       -
       -        ~save:(Lsp.Types.SaveOptions.create ~includeText:false ())

     

       32
       32
       -
       +        ~save:(`SaveOptions (Lsp.Types.SaveOptions.create ~includeText:false ()))

     

       33
       33
       -
                ()

     

       34
       34
       -
        

     

       35
       35
       -
            method private _on_doc

     

       36
       36
       -
                ~(notify_back:Linol_lwt.Jsonrpc2.notify_back)

     

       37
       37
       -
                (uri:Lsp.Types.DocumentUri.t) (contents:string) =

     

       38
       38
       -
              (* TODO: unescape uri/translate it to a correct path ? *)

     

       39
       39
       -
       -      match Loop.process prelude (preprocess_uri uri) (Some contents) with

     

       40
       40
       -
       +      match Loop.process prelude (preprocess_uri (Lsp.Types.DocumentUri.to_string uri)) (Some contents) with

     

       41
       41
       -
              | Ok state ->

     

       42
       42
       -
                let diags = State.get State.diagnostics state in

     

       43
       43
       -
                Hashtbl.replace buffers uri state;

+3 -3

pkgs/development/ocaml-modules/dolmen/lsp.nix

···

       7
       7
        
         linol,

     

       8
       8
        
         linol-lwt,

     

       9
       9
        
         logs,

     

       10
       10
       -
       # lsp, # transitive dependency from linol

     

       10
       10
       +
         lsp,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       buildDunePackage {

     

       14
       14
        
         pname = "dolmen_lsp";

     

       15
       15
        
         inherit (dolmen) src version;

     

       16
       16
        
       

     

       17
       17
       -
         patches = [ ./linol-lwt-6.patch ];

     

       17
       17
       +
         patches = [ ./linol-common-migration.patch ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           dolmen

     
···

       23
       23
        
           linol

     

       24
       24
        
           linol-lwt

     

       25
       25
        
           logs

     

       26
       26
       -
           # lsp # transitive dependency from linol

     

       26
       26
       +
           lsp

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         meta = dolmen.meta // {

+18 -12

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         fetchurl,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
        
         buildDunePackage,

     

       5
       5
       -
         yojson,

     

       6
       5
        
         logs,

     

       7
       7
       -
         lsp,

     

       8
       6
        
         ppx_yojson_conv_lib,

     

       9
       7
        
         trace,

     

       8
       8
       +
         uutf,

     

       9
       9
       +
         yojson,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       buildDunePackage rec {

     

       13
       13
        
         pname = "linol";

     

       14
       14
       -
         version = "0.6";

     

       14
       14
       +
         version = "0.10";

     

       15
       15
        
       

     

       16
       16
        
         minimalOCamlVersion = "4.14";

     

       17
       17
        
       

     

       18
       18
       -
         src = fetchurl {

     

       19
       19
       -
           url = "https://github.com/c-cube/linol/releases/download/v${version}/linol-${version}.tbz";

     

       20
       20
       -
           hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo=";

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "c-cube";

     

       20
       20
       +
           repo = "linol";

     

       21
       21
       +
           tag = "v${version}";

     

       22
       22
       +
           hash = "sha256-G/5nTJd+MxPgNObKW2Hmmwn4HejQ81c3f4oVXjpNSZg=";

     

       21
       23
        
         };

     

       22
       24
        
       

     

       23
       25
        
         propagatedBuildInputs = [

     

       24
       24
       -
           yojson

     

       25
       26
        
           logs

     

       26
       26
       -
           (lsp.override { version = "1.18.0"; })

     

       27
       27
        
           ppx_yojson_conv_lib

     

       28
       28
        
           trace

     

       29
       29
       +
           uutf

     

       30
       30
       +
           yojson

     

       29
       31
        
         ];

     

       30
       32
        
       

     

       31
       31
       -
         meta = with lib; {

     

       33
       33
       +
         meta = {

     

       32
       34
        
           description = "LSP server library";

     

       33
       33
       -
           license = licenses.mit;

     

       34
       34
       -
           maintainers = [ maintainers.ulrikstrid ];

     

       35
       35
        
           homepage = "https://github.com/c-cube/linol";

     

       36
       36
       +
           changelog = "https://raw.githubusercontent.com/c-cube/linol/refs/tags/v${version}/CHANGES.md";

     

       37
       37
       +
           license = lib.licenses.mit;

     

       38
       38
       +
           maintainers = with lib.maintainers; [

     

       39
       39
       +
             stepbrobd

     

       40
       40
       +
             ulrikstrid

     

       41
       41
       +
           ];

     

       36
       42
        
         };

     

       37
       43
        
       }

+21

pkgs/development/ocaml-modules/linol/eio.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildDunePackage,

     

       3
       3
       +
         eio,

     

       4
       4
       +
         linol,

     

       5
       5
       +
         yojson,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildDunePackage {

     

       9
       9
       +
         pname = "linol-eio";

     

       10
       10
       +
         inherit (linol) version src;

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = [

     

       13
       13
       +
           eio

     

       14
       14
       +
           linol

     

       15
       15
       +
           yojson

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = linol.meta // {

     

       19
       19
       +
           description = "LSP server library (with Eio for concurrency)";

     

       20
       20
       +
         };

     

       21
       21
       +
       }

-2

pkgs/development/ocaml-modules/linol/lwt.nix

···

       1
       1
        
       {

     

       2
       2
        
         buildDunePackage,

     

       3
       3
        
         linol,

     

       4
       4
       -
         jsonrpc,

     

       5
       4
        
         lwt,

     

       6
       5
        
         yojson,

     

       7
       6
        
       }:

     
···

       12
       11
        
       

     

       13
       12
        
         propagatedBuildInputs = [

     

       14
       13
        
           linol

     

       15
       15
       -
           jsonrpc

     

       16
       14
        
           lwt

     

       17
       15
        
           yojson

     

       18
       16
        
         ];

pkgs/top-level/ocaml-packages.nix

···

       1042
       1042
        
       

     

       1043
       1043
        
               linol = callPackage ../development/ocaml-modules/linol { };

     

       1044
       1044
        
       

     

       1045
       1045
       +
               linol-eio = callPackage ../development/ocaml-modules/linol/eio.nix { };

     

       1046
       1046
       +
       

     

       1045
       1047
        
               linol-lwt = callPackage ../development/ocaml-modules/linol/lwt.nix { };

     

       1046
       1048
        
       

     

       1047
       1049
        
               llvm = callPackage ../development/ocaml-modules/llvm {