mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
Merge pull request #239315 from vbgl/ocaml-awa-0.3.0
ocamlPackages.awa: 0.2.0 → 0.3.0
This commit is contained in:
commit
d2676c9498
@ -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 = [
|
||||
|
@ -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"; };
|
||||
}
|
@ -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
|
||||
];
|
||||
|
@ -56,8 +56,6 @@ let
|
||||
|
||||
awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; };
|
||||
|
||||
awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { mtime = mtime_1; };
|
||||
|
||||
awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; };
|
||||
|
||||
### B ###
|
||||
|
Loading…
Reference in New Issue
Block a user