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

Commits on Nov 28, 2016

  1. ocamlPackages.ocp-index: 1.1.4 -> 1.1.5

    @vbgl
    vbgl committed Nov 28, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    33d49bb View commit details

Commits on Nov 30, 2016

  1. Merge pull request #20756 from vbgl/ocp-index-1.1.5 

    ocamlPackages.ocp-index: 1.1.4 -> 1.1.5
    @pSub
    pSub authored Nov 30, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ab2185a View commit details
Showing with 14 additions and 23 deletions.
  1. +14 −23 pkgs/development/tools/ocaml/ocp-index/default.nix
37 changes: 14 additions & 23 deletions pkgs/development/tools/ocaml/ocp-index/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,30 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:

let inherit (stdenv.lib) getVersion versionAtLeast optional; in

assert versionAtLeast (getVersion ocaml) "4";
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta";
assert versionAtLeast (getVersion ocpIndent) "1.4.2";

let
version = "1.1.4";
srcs = {
"4.03.0" = {
rev = "${version}-4.03";
sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv";
};
"4.02.3" = {
rev = "${version}-4.02";
sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8";
};
"4.01.0" = {
rev = "${version}";
sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d";
};
};

src = fetchFromGitHub ({
owner = "OCamlPro";
repo = "ocp-index";
} // srcs."${ocaml.version}");
version = "1.1.5";
in

stdenv.mkDerivation {

name = "ocp-index-${version}";

inherit src;
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-index";
rev = version;
sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd";
};

patches = [ (fetchpatch {
url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff;
sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z";
}) ];

buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;