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

Commits on Oct 25, 2019

  1. ocamlPackages.camlp4: fix evaluation for OCaml ≥ 4.09

    @vbgl
    vbgl committed Oct 25, 2019
    Copy the full SHA
    0361ae2 View commit details

  2. ocamlPackages.ppx_tools: enable at 5.3+4.08.0 for OCaml 4.09

    @vbgl
    vbgl committed Oct 25, 2019
    Copy the full SHA
    0c2aa9d View commit details
Showing with 7 additions and 0 deletions.
  1. +3 −0 pkgs/development/ocaml-modules/ppx_tools/default.nix
  2. +4 −0 pkgs/development/tools/ocaml/camlp4/default.nix
3 changes: 3 additions & 0 deletions pkgs/development/ocaml-modules/ppx_tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,9 @@ let param = {
"4.08" = {
version = "5.3+4.08.0";
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
"4.09" = {
version = "5.3+4.08.0";
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
}.${ocaml.meta.branch};
in
stdenv.mkDerivation {
4 changes: 4 additions & 0 deletions pkgs/development/tools/ocaml/camlp4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ stdenv, fetchzip, which, ocaml, ocamlbuild }:

if stdenv.lib.versionAtLeast ocaml.version "4.09"
then throw "camlp4 is not available for OCaml ${ocaml.version}"
else

let param = {
"4.02" = {
version = "4.02+6";