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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2020-12-02 12:31:00 +00:00
committed by GitHub
parent 81b2a9c9d4 89e8bf0f2a
commit 4fad6f2d66
139 changed files with 1979 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/angstrom-async/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "angstrom-async";
inherit (angstrom) version src;
inherit (angstrom) version useDune2 src;
minimumOCamlVersion = "4.04.1";
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "angstrom-lwt-unix";
inherit (angstrom) version src;
inherit (angstrom) version useDune2 src;
minimumOCamlVersion = "4.03";
pkgs/development/ocaml-modules/angstrom-unix/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildDunePackage rec {
pname = "angstrom-unix";
inherit (angstrom) version src;
inherit (angstrom) version useDune2 src;
minimumOCamlVersion = "4.03";
pkgs/development/ocaml-modules/angstrom/default.nix
+3 -1
View File
@@ -1,8 +1,9 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf, ppx_let }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let }:
buildDunePackage rec {
pname = "angstrom";
version = "0.15.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
@@ -14,6 +15,7 @@ buildDunePackage rec {
};
checkInputs = [ alcotest ppx_let ];
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ bigstringaf result ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
pkgs/development/ocaml-modules/bigstringaf/default.nix
+4 -2
View File
@@ -2,7 +2,9 @@
buildDunePackage rec {
pname = "bigstringaf";
version = "0.6.0";
version = "0.7.0";
useDune2 = true;
minimumOCamlVersion = "4.03";
@@ -10,7 +12,7 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc";
sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj";
};
checkInputs = [ alcotest ];
pkgs/development/ocaml-modules/ctypes/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ctypes-${version}";
version = "0.16.0";
version = "0.17.1";
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
sha256 = "0qh2gfx5682wkk2nm1ybspzz9c2xvlnnf6iv08a89kbwa1hvdqrg";
sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/development/ocaml-modules/earlybird/default.nix
+2
View File
@@ -10,6 +10,8 @@ buildDunePackage rec {
pname = "earlybird";
version = "0.1.5";
useDune2 = true;
minimumOCamlVersion = "4.04";
src = fetchurl {
pkgs/development/ocaml-modules/integers/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "integers";
version = "0.3.0";
version = "0.4.0";
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
sha256 = "1yhif5zh4srh63mhimfx3p5ljpb3lixjdd3i9pjnbj2qgpzlqj8p";
sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
};
meta = {
pkgs/development/ocaml-modules/ke/default.nix
+3 -1
View File
@@ -7,6 +7,8 @@ buildDunePackage rec {
pname = "ke";
version = "0.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz";
sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx";
@@ -14,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ bigarray-compat fmt ];
checkInputs = lib.optionals doCheck [ alcotest bigstringaf ];
checkInputs = [ alcotest bigstringaf ];
doCheck = true;
minimumOCamlVersion = "4.03";
pkgs/development/ocaml-modules/stdlib-shims/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
buildDunePackage rec {
pname = "stdlib-shims";
version = "0.1.0";
version = "0.2.0";
src = fetchurl {
url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk";
sha256 = "0nb5flrczpqla1jy2pcsxm06w4jhc7lgbpik11amwhfzdriz0n9c";
};
minimumOCamlVersion = "4.02";
doCheck = true;