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

Commits on Jul 10, 2017

  1. ocamlPackages.topkg: requires OCaml ≥ 4.01

    @vbgl
    vbgl committed Jul 10, 2017
    Copy the full SHA
    79ddb5d View commit details

  2. ocamlPackages.ocaml-migrate-parsetree: requires OCaml ≥ 4.02

    @vbgl
    vbgl committed Jul 10, 2017
    Copy the full SHA
    c9468ac View commit details
Showing with 8 additions and 0 deletions.
  1. +4 −0 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
  2. +4 −0 pkgs/development/ocaml-modules/topkg/default.nix
4 changes: 4 additions & 0 deletions pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }:

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

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
version = "0.7";
4 changes: 4 additions & 0 deletions pkgs/development/ocaml-modules/topkg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:

if !stdenv.lib.versionAtLeast ocaml.version "4.01"
then throw "topkg is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-topkg-${version}";
version = "0.8.1";