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: 72c36db003aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3539d0dbcbf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 22, 2017

  1. ocamlPackages.core_bench: init at 113.33.03

    @pmahoney
    pmahoney committed May 22, 2017
    Copy the full SHA
    b6534c6 View commit details

Commits on Jun 15, 2017

  1. Merge pull request #26126 from pmahoney/ocaml-core_bench 

    ocamlPackages.core_bench: init at 113.33.03
    @Mic92
    Mic92 authored Jun 15, 2017
    Copy the full SHA
    a3539d0 View commit details
Showing with 23 additions and 0 deletions.
  1. +20 −0 pkgs/development/ocaml-modules/janestreet/core_bench.nix
  2. +3 −0 pkgs/top-level/ocaml-packages.nix
20 changes: 20 additions & 0 deletions pkgs/development/ocaml-modules/janestreet/core_bench.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv
, buildOcamlJane
, core
, core_extended
, textutils
}:

buildOcamlJane rec {
name = "core_bench";
hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
propagatedBuildInputs =
[ core core_extended textutils ];

meta = with stdenv.lib; {
homepage = https://github.com/janestreet/core_bench;
description = "Micro-benchmarking library for OCaml";
license = licenses.asl20;
maintainers = [ maintainers.pmahoney ];
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -753,6 +753,9 @@ let
then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
else bin_prot_p4;

core_bench =
callPackage ../development/ocaml-modules/janestreet/core_bench.nix {};

core_kernel =
if lib.versionOlder "4.03" ocaml.version
then janeStreet.core_kernel