Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5617886b16cc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69d5465431f5
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 18, 2019

  1. ocamlPackages.faraday: disable tests with OCaml 4.07

    @vbgl
    vbgl committed Oct 18, 2019
    Copy the full SHA
    33f003e View commit details

  2. ocamlPackages.httpaf: disable tests with OCaml 4.07

    @vbgl
    vbgl committed Oct 18, 2019
    Copy the full SHA
    734119c View commit details

  3. ocamlPackages.bigstringaf: 0.3.0 → 0.6.0

    @vbgl
    vbgl committed Oct 18, 2019
    Copy the full SHA
    69d5465 View commit details
11 changes: 6 additions & 5 deletions pkgs/development/ocaml-modules/bigstringaf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }:
{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigarray-compat }:

buildDunePackage rec {
pname = "bigstringaf";
version = "0.3.0";
version = "0.6.0";

minimumOCamlVersion = "4.03";

src = fetchFromGitHub {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs";
sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc";
};

buildInputs = [ alcotest ];
propagatedBuildInputs = [ bigarray-compat ];
doCheck = true;

meta = {
description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/faraday/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigstringaf }:

buildDunePackage rec {
pname = "faraday";
@@ -13,9 +13,9 @@ buildDunePackage rec {
sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2";
};

buildInputs = [ alcotest ];
checkInputs = lib.optional doCheck alcotest;
propagatedBuildInputs = [ bigstringaf ];
doCheck = true;
doCheck = lib.versions.majorMinor ocaml.version != "4.07";

meta = {
description = "Serialization library built for speed and memory efficiency";
10 changes: 5 additions & 5 deletions pkgs/development/ocaml-modules/httpaf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, faraday, alcotest }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, angstrom, faraday, alcotest }:

buildDunePackage rec {
pname = "httpaf";
@@ -11,14 +11,14 @@ buildDunePackage rec {
sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
};

buildInputs = [ alcotest ];
checkInputs = lib.optional doCheck alcotest;
propagatedBuildInputs = [ angstrom faraday ];
doCheck = true;
doCheck = lib.versions.majorMinor ocaml.version != "4.07";

meta = {
description = "A high-performance, memory-efficient, and scalable web server for OCaml";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}