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

Commits on May 20, 2020

  1. ocamlPackages.batteries: fix for OCaml 4.10

    @vbgl
    vbgl committed May 20, 2020
    Copy the full SHA
    0900872 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/development/ocaml-modules/batteries/default.nix
8 changes: 7 additions & 1 deletion pkgs/development/ocaml-modules/batteries/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }:

let version = "3.0.0"; in

@@ -10,6 +10,12 @@ stdenv.mkDerivation {
sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi";
};

# Fixes tests with OCaml 4.10
patches = [(fetchpatch {
url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch";
sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4";
})];

buildInputs = [ ocaml findlib ocamlbuild qtest ];
propagatedBuildInputs = [ num ];