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

Commits on Nov 6, 2020

  1. ocamlPackages.email_message: remove at 0.11.0

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 6, 2020
    Copy the full SHA
    d050e5e View commit details

  2. ocamlPackages.cryptokit: 1.14 → 1.16.1

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 6, 2020
    Copy the full SHA
    2e2aae2 View commit details
40 changes: 13 additions & 27 deletions pkgs/development/ocaml-modules/cryptokit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,29 @@
{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }:
{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }:

assert stdenv.lib.versionAtLeast ocaml.version "3.12";

let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
version = "1.14";
url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz";
sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05";
inherit zarith;
} else {
version = "1.10";
url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz";
sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
zarith = null;
};
in

stdenv.mkDerivation {
buildDunePackage {
pname = "cryptokit";
inherit (param) version;
version = "1.16.1";

useDune2 = true;

src = fetchurl {
inherit (param) url sha256;
url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz";
sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c";
};

buildInputs = [ ocaml findlib ocamlbuild ncurses ];
propagatedBuildInputs = [ param.zarith zlib ];
dontConfigure = true;

buildFlags = [ "setup.data" "build" ];
buildInputs = [ dune-configurator ncurses ];
propagatedBuildInputs = [ zarith zlib ];

preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
doCheck = true;

meta = {
homepage = "http://pauillac.inria.fr/~xleroy/software.html";
description = "A library of cryptographic primitives for OCaml";
platforms = ocaml.meta.platforms or [];
license = lib.licenses.lgpl2Only;
maintainers = [
stdenv.lib.maintainers.maggesi
lib.maintainers.maggesi
];
};
}
8 changes: 0 additions & 8 deletions pkgs/development/ocaml-modules/janestreet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -529,14 +529,6 @@ rec {
meta.description = "Writing Emacs plugin in OCaml";
};

email_message = janePackage {
pname = "email_message";
hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg";
propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ];
patches = [ ./email-message-angstrom-0.14.patch ];
meta.description = "E-mail message parser";
};

incremental_kernel = janePackage {
version = "0.11.1";
pname = "incremental_kernel";
22 changes: 0 additions & 22 deletions pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch
View file

This file was deleted.