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

Commits on Mar 31, 2018

  1. ocamlPackages.ocp-ocamlres: 0.3 -> 0.4

    @vbgl
    vbgl committed Mar 31, 2018
    Copy the full SHA
    f8acdb0 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
12 changes: 8 additions & 4 deletions pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, pprint }:
{ stdenv, fetchFromGitHub, ocaml, findlib, astring, pprint }:

if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-ocamlres";
rev = "v${version}";
sha256 = "0pm1g38f6pmch1x4pcc09ky587x5g7p7n9dfbbif8zkjqr603ixg";
sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
};

buildInputs = [ ocaml findlib pprint ];
buildInputs = [ ocaml findlib astring pprint ];
createFindlibDestdir = true;

installFlags = [ "BINDIR=$(out)/bin" ];