public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-16 12:25:48 +00:00
committed by GitHub
parent f72d4dfbe1 f0b078ef9d
commit 974e83db9a
50 changed files with 317 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/carton/default.nix
View File

@@ -2,19 +2,19 @@
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
}:
buildDunePackage rec {
pname = "carton";
version = "0.2.0";
version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
};
# remove changelogs for mimic and the git* packages
@@ -30,6 +30,7 @@ buildDunePackage rec {
rresult
fpath
bos
hxd
];
propagatedBuildInputs = [
ke

28
pkgs/development/ocaml-modules/decompress/1.2.nix Normal file
View File

@@ -0,0 +1,28 @@
{ lib, fetchurl, buildDunePackage
, checkseum, bigarray-compat, optint
}:
buildDunePackage rec {
version = "1.2.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
};
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
# required hxd version is not available in nixpkgs
doCheck = false;
meta = {
description = "Pure OCaml implementation of Zlib";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress";
};
}

11
pkgs/development/ocaml-modules/decompress/default.nix
View File

@@ -1,10 +1,10 @@
{ lib, fetchurl, buildDunePackage
, checkseum, bigarray-compat, optint
, bigstringaf, alcotest, hxd, camlzip, base64
, checkseum, bigarray-compat, optint, cmdliner
, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}:
buildDunePackage rec {
version = "1.2.0";
version = "1.3.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
@@ -13,11 +13,12 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
};
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true;
meta = {

6
pkgs/development/ocaml-modules/duff/default.nix
View File

@@ -1,17 +1,17 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, fetchpatch
, stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf
}:
buildDunePackage rec {
pname = "duff";
version = "0.3";
version = "0.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
};
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];

4
pkgs/development/ocaml-modules/git/default.nix
View File

@@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
version = "3.3.0";
version = "3.3.2";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
};
buildInputs = [

10
pkgs/development/ocaml-modules/git/unix.nix
View File

@@ -1,4 +1,4 @@
{ buildDunePackage, fetchpatch, git
{ buildDunePackage, git
, mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@@ -15,14 +15,6 @@ buildDunePackage {
useDune2 = true;
patches = [
# https://github.com/mirage/ocaml-git/pull/472
(fetchpatch {
url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
})
];
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip

23
pkgs/development/ocaml-modules/hxd/default.nix
View File

@@ -1,11 +1,11 @@
{ lib, buildDunePackage, fetchurl
, dune-configurator, cmdliner, angstrom
, rresult, stdlib-shims, fmt, fpath
, ocaml, dune-configurator, cmdliner
, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
}:
buildDunePackage rec {
pname = "hxd";
version = "0.2.0";
version = "0.3.1";
useDune2 = true;
@@ -13,24 +13,25 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
};
# ignore yes stderr output due to trapped SIGPIPE
postPatch = ''
sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
'';
nativeBuildInputs = [
dune-configurator
];
propagatedBuildInputs = lib.optional withLwt lwt;
buildInputs = [
cmdliner
angstrom
rresult
fmt
fpath
];
propagatedBuildInputs = [
stdlib-shims
];
doCheck = true;
meta = with lib; {
description = "Hexdump in OCaml";

3
pkgs/development/ocaml-modules/janestreet/0.14.nix
View File

@@ -222,7 +222,8 @@ rec {
core = janePackage {
pname = "core";
hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3";
version = "0.14.1";
hash = "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ core_kernel spawn timezone ];

4
pkgs/development/ocaml-modules/owl-base/default.nix
View File

@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "owl-base";
version = "1.0.0";
version = "1.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
sha256 = "72ca9f6edd302fdfa16c7559cedac7ac2c885466a367e17ea1ea8807b2dd13ef";
};
minimumOCamlVersion = "4.10";