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]
2020-12-08 18:15:38 +00:00
committed by GitHub
parent 4549c836e7 0081f50505
commit e729ab0408
51 changed files with 611 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/alcotest/default.nix
+9 -5
View File
@@ -1,17 +1,21 @@
{ lib, buildDunePackage, fetchurl
, astring, cmdliner, fmt, uuidm, re, stdlib-shims
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf
}:
buildDunePackage rec {
pname = "alcotest";
version = "1.0.1";
version = "1.2.3";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
sha256 = "1xlklxb83gamqbg8j5dzm5jk4mvcwkspxajh93p6vpw9ia1li1qc";
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz";
sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08";
};
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims ];
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/mirage/alcotest";
pkgs/development/ocaml-modules/alcotest/lwt.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage {
pname = "alcotest-lwt";
inherit (alcotest) version src;
inherit (alcotest) version src useDune2;
propagatedBuildInputs = [ alcotest logs ocaml_lwt ];
pkgs/development/ocaml-modules/domain-name/default.nix
+3 -1
View File
@@ -7,6 +7,8 @@ buildDunePackage rec {
pname = "domain-name";
version = "0.3.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz";
sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad";
@@ -14,7 +16,7 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
buildInputs = [ alcotest ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ astring fmt ];
pkgs/development/ocaml-modules/duration/default.nix
+5 -3
View File
@@ -1,16 +1,18 @@
{ lib, buildDunePackage, fetchurl, alcotest }:
{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
buildDunePackage rec {
pname = "duration";
version = "0.1.3";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz";
sha256 = "0m9r0ayhpl98g9vdxrbjdcllns274jilic5v8xj1x7dphw21p95h";
};
doCheck = true;
checkInputs = lib.optional doCheck alcotest;
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/hannesm/duration";
pkgs/development/ocaml-modules/gmap/default.nix
+5 -3
View File
@@ -1,9 +1,11 @@
{ lib, buildDunePackage, fetchurl, alcotest }:
{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
buildDunePackage rec {
pname = "gmap";
version = "0.3.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
@@ -11,9 +13,9 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
buildInputs = [ alcotest ];
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.05";
meta = {
description = "Heterogenous maps over a GADT";
pkgs/development/ocaml-modules/graphql/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ lib, buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
{ buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
buildDunePackage rec {
pname = "graphql";
inherit (graphql_parser) version src;
inherit (graphql_parser) version useDune2 src;
propagatedBuildInputs = [ graphql_parser rresult yojson ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;
pkgs/development/ocaml-modules/graphql/lwt.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ lib, buildDunePackage, alcotest, graphql, ocaml_lwt }:
{ buildDunePackage, alcotest, graphql, ocaml_lwt }:
buildDunePackage rec {
pname = "graphql-lwt";
inherit (graphql) version src;
inherit (graphql) version useDune2 src;
propagatedBuildInputs = [ graphql ocaml_lwt ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;
pkgs/development/ocaml-modules/graphql/parser.nix
+3 -1
View File
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "graphql_parser";
version = "0.13.0";
useDune2 = true;
minimumOCamlVersion = "4.03";
src = fetchurl {
@@ -14,7 +16,7 @@ buildDunePackage rec {
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ fmt re ];
checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];
doCheck = true;
pkgs/development/ocaml-modules/mirage-time/default.nix
+2
View File
@@ -6,6 +6,8 @@ buildDunePackage rec {
pname = "mirage-time";
version = "2.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0";
pkgs/development/ocaml-modules/mirage-time/unix.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage {
pname = "mirage-time-unix";
inherit (mirage-time) src version minimumOCamlVersion;
inherit (mirage-time) src useDune2 version minimumOCamlVersion;
propagatedBuildInputs = [ mirage-time ocaml_lwt duration ];
pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
+1 -1
View File
@@ -2,7 +2,7 @@
buildDunePackage {
pname = "ocplib-json-typed-bson";
inherit (ocplib-json-typed) version src;
inherit (ocplib-json-typed) version useDune2 src;
propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];
pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+1
View File
@@ -3,6 +3,7 @@
buildDunePackage rec {
pname = "ocplib-json-typed";
version = "0.7.1";
useDune2 = true;
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-json-typed";
pkgs/development/ocaml-modules/tls/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildDunePackage rec {
minimumOCamlVersion = "4.08";
version = "0.12.7";
version = "0.12.8";
pname = "tls";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc";
sha256 = "0sgppvfnamfnsglw1cl801i1xqkxbs33g40kwmmqj2vqjcarm26a";
};
useDune2 = true;
pkgs/development/ocaml-modules/uri/default.nix
+7 -5
View File
@@ -1,19 +1,21 @@
{ lib, fetchurl, buildDunePackage, ounit
, re, stringext
, angstrom, stringext
}:
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "uri";
version = "3.1.0";
version = "4.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4";
sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380";
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ re stringext ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ angstrom stringext ];
doCheck = true;
meta = {
pkgs/development/ocaml-modules/uri/sexp.nix
+3 -2
View File
@@ -6,8 +6,9 @@ else
buildDunePackage {
pname = "uri-sexp";
inherit (uri) version src doCheck meta;
inherit (uri) version useDune2 src meta;
buildInputs = [ ounit ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
}