diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix index 36831d946132..158aa3b27b26 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,16 +1,21 @@ -{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: - -if !lib.versionAtLeast cohttp.version "0.99" -then cohttp -else if !lib.versionAtLeast ppx_sexp_conv.version "0.13" -then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" -else +{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }: buildDunePackage { pname = "cohttp-lwt"; - inherit (cohttp) version src useDune2 meta; + inherit (cohttp) + version + src + useDune2 + minimumOCamlVersion + ; + + buildInputs = [ ppx_sexp_conv ]; - buildInputs = [ uri ppx_sexp_conv ]; + propagatedBuildInputs = [ + cohttp ocaml_lwt logs sexplib0 uri + ]; - propagatedBuildInputs = [ cohttp ocaml_lwt logs ]; + meta = cohttp.meta // { + description = "CoHTTP implementation using the Lwt concurrency library"; + }; } |