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

Commits on Nov 22, 2016

  1. ocamlPackages.ssl: 0.5.2 -> 0.5.3

    @vbgl
    vbgl committed Nov 22, 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
    5267f37 View commit details

  2. ocamlPackages.lwt: 2.5.2 -> 2.6.0

    @vbgl
    vbgl committed Nov 22, 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
    bfe0f29 View commit details

Commits on Nov 30, 2016

  1. Merge pull request #20615 from vbgl/lwt-2.6.0 

    ocamlPackages.lwt: 2.5.2 → 2.6.0
    @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
    014a1b4 View commit details
Showing with 20 additions and 18 deletions.
  1. +14 −11 pkgs/development/ocaml-modules/lwt/default.nix
  2. +6 −7 pkgs/development/ocaml-modules/ssl/default.nix
25 changes: 14 additions & 11 deletions pkgs/development/ocaml-modules/lwt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:

let
inherit (stdenv.lib) optional getVersion versionAtLeast;
in
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
, ppx_tools, result
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
}:

stdenv.mkDerivation rec {
name = "ocaml-lwt-${version}";
version = "2.5.2";
version = "2.6.0";

src = fetchzip {
url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl";
sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
};

buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ];
buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ]
++ stdenv.lib.optional ppxSupport ppx_tools;

propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ];

configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ];
configureScript = "ocaml setup.ml -configure";
prefixKey = "--prefix ";
configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4" ]
++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];

createFindlibDestdir = true;

13 changes: 6 additions & 7 deletions pkgs/development/ocaml-modules/ssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{stdenv, fetchurl, which, openssl, ocaml, findlib}:
{ stdenv, fetchzip, which, openssl, ocaml, findlib }:

stdenv.mkDerivation rec {
name = "ocaml-ssl-${version}";
version = "0.5.2";
name = "ocaml${ocaml.version}-ssl-${version}";
version = "0.5.3";

src = fetchurl {
url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";

sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
src = fetchzip {
url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz";
sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm";
};

buildInputs = [which ocaml findlib];