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: c1e60d958402
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 597e7748d1fa
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2020

  1. ocamlPackages.dispatch: 0.4.1 → 0.5.0 

    ocamlPackages.webmachine: 0.6.2 → 0.7.0
    @vbgl
    vbgl committed Nov 18, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    597e774 View commit details
Showing with 10 additions and 8 deletions.
  1. +7 −5 pkgs/development/ocaml-modules/dispatch/default.nix
  2. +3 −3 pkgs/development/ocaml-modules/webmachine/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/ocaml-modules/dispatch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{ lib, buildDunePackage, fetchFromGitHub, alcotest, result }:
{ lib, buildDunePackage, fetchFromGitHub, ocaml, alcotest, result }:

buildDunePackage rec {
pname = "dispatch";
version = "0.4.1";
version = "0.5.0";

useDune2 = true;

src = fetchFromGitHub {
owner = "inhabitedtype";
repo = "ocaml-dispatch";
rev = version;
sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr";
sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4";
};

propagatedBuildInputs = [ result ];

checkInputs = lib.optional doCheck alcotest;
checkInputs = [ alcotest ];

doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.05";

meta = {
inherit (src.meta) homepage;
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/webmachine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

buildDunePackage rec {
pname = "webmachine";
version = "0.6.2";
version = "0.7.0";
useDune2 = true;

minimumOCamlVersion = "4.04";
@@ -14,12 +14,12 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = "ocaml-webmachine";
rev = version;
sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk";
sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx";
};

propagatedBuildInputs = [ cohttp dispatch ptime ];

checkInputs = lib.optional doCheck ounit;
checkInputs = [ ounit ];

doCheck = true;