diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-12-15 08:02:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 08:02:17 +0100 |
| commit | bc2ae87f8d5335654b215235e31776f45eb6d8b2 (patch) | |
| tree | f4832089e9cd81721f7b12d6a0c6d2929fea49c5 | |
| parent | 9a9178ba2a5021cb4e08aaabf70ac198e66eda1d (diff) | |
| parent | 9ed75988e2848ed09b23c56bf151b055e32a5ab4 (diff) | |
| download | nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar.gz nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar.bz2 nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar.lz nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar.xz nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.tar.zst nixlib-bc2ae87f8d5335654b215235e31776f45eb6d8b2.zip | |
Merge pull request #274372 from vbgl/ocaml-angstrom-0.16.0
ocamlPackages.angstrom: 0.15.0 → 0.16.0
5 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index ff390c1598bf..c603d1b21e57 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -5,7 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; minimalOCamlVersion = "4.04.1"; propagatedBuildInputs = [ angstrom async ]; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 063f4c1f80c7..2742b8515de7 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 752b6a48ced4..04c380320199 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4f5f98e4791..a96848fba08f 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,9 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }: buildDunePackage rec { pname = "angstrom"; - version = "0.15.0"; - duneVersion = "3"; + version = "0.16.0"; minimalOCamlVersion = "4.04"; @@ -11,12 +10,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; + hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ="; }; checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index f262d51ee7dc..6dce28fb2020 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,12 +1,11 @@ { lib, fetchFromGitHub, fetchpatch, buildDunePackage -, angstrom, faraday, alcotest +, angstrom, faraday, result, alcotest }: buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { @@ -17,7 +16,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ angstrom faraday ]; + propagatedBuildInputs = [ angstrom faraday result ]; doCheck = true; meta = { |