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

Commits on Jun 26, 2017

  1. ocamlPackages.twt: don’t strip

    @vbgl
    vbgl committed Jun 26, 2017
    Copy the full SHA
    f0dbe18 View commit details

  2. ocamlPackages.reason: 1.13.4 -> 2.0.0

    @vbgl
    vbgl committed Jun 26, 2017
    Copy the full SHA
    7829eb7 View commit details

  3. ocamlPackages.uri_p4: disable for OCaml ≥ 4.03

    @vbgl
    vbgl committed Jun 26, 2017
    Copy the full SHA
    459f17a View commit details
Showing with 8 additions and 4 deletions.
  1. +2 −2 pkgs/development/compilers/reason/default.nix
  2. +3 −1 pkgs/development/ocaml-modules/twt/default.nix
  3. +3 −1 pkgs/development/ocaml-modules/uri/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/reason/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@
ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }:

let
version = "1.13.4";
version = "2.0.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = version;
sha256 = "03r2ciikgwaq1dkzgzc8n7h7y0q95ajh6n9bb2n5bpgfhwkr1wqi";
sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy";
};
meta = with stdenv.lib; {
homepage = https://facebook.github.io/reason/;
4 changes: 3 additions & 1 deletion pkgs/development/ocaml-modules/twt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, ocaml, findlib }:

stdenv.mkDerivation {
name = "ocaml-twt-0.94.0";
name = "ocaml${ocaml.version}-twt-0.94.0";

src = fetchzip {
url = https://github.com/mlin/twt/archive/v0.94.0.tar.gz;
@@ -20,6 +20,8 @@ stdenv.mkDerivation {

installFlags = "PREFIX=$(out)";

dontStrip = true;

meta = with stdenv.lib; {
homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
description = "“The Whitespace Thing” for OCaml";
4 changes: 3 additions & 1 deletion pkgs/development/ocaml-modules/uri/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,9 @@
, sexplib_p4
}:

assert stdenv.lib.versionAtLeast ocaml.version "4";
if !stdenv.lib.versionAtLeast ocaml.version "4"
|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else

with
if legacyVersion