diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-06-28 10:59:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 10:59:51 +0200 |
| commit | d2676c949823e3792e9390c06256cdbd8ebe2854 (patch) | |
| tree | f60855431a78d0d19616eb7ec12a54e062726785 /pkgs/development/ocaml-modules | |
| parent | dfbb9b35bc7057b684a96adfeebcf5fd19302345 (diff) | |
| parent | e4ba29c31d6a15fc51e6d64a957edb00e9ca655d (diff) | |
| download | nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar.gz nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar.bz2 nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar.lz nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar.xz nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.tar.zst nixlib-d2676c949823e3792e9390c06256cdbd8ebe2854.zip | |
Merge pull request #239315 from vbgl/ocaml-awa-0.3.0
ocamlPackages.awa: 0.2.0 → 0.3.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/awa/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/awa/lwt.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/carton/lwt.nix | 4 |
3 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 6b52ddf01f1a..4c92b58bdbc6 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -8,14 +8,13 @@ buildDunePackage rec { pname = "awa"; - version = "0.2.0"; + version = "0.3.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; + minimalOCamlVersion = "4.10"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-hsmTuoubBdsEyGe8zmfG7JihY0LFM4lErpPKUVobIX8="; + hash = "sha256-BtbReSnnAN+u1Vy63afO1yheoDqsIRU2rig0y1QDtuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix deleted file mode 100644 index 241df784ad59..000000000000 --- a/pkgs/development/ocaml-modules/awa/lwt.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildDunePackage, awa -, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng -}: - -buildDunePackage { - pname = "awa-lwt"; - - inherit (awa) version src; - - duneVersion = "3"; - - propagatedBuildInputs = [ - awa cstruct mtime lwt mirage-crypto-rng - ]; - - doCheck = true; - nativeCheckInputs = [ awa ]; - checkInputs = [ cstruct-unix ]; - - meta = awa.meta // { mainProgram = "awa_lwt_server"; }; -} diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 03333deff67a..cf07eca552ba 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -21,7 +21,9 @@ buildDunePackage { bigstringaf ]; - doCheck = true; + # Tests fail with git 2.41 + # see https://github.com/mirage/ocaml-git/issues/617 + doCheck = false; nativeCheckInputs = [ git-binary ]; |