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

Commits on Oct 28, 2019

  1. ocamlPackages.ke: init at 0.4

    @vbgl
    vbgl committed Oct 28, 2019
    Copy the full SHA
    9f26063 View commit details

  2. ocamlPackages.encore: init at 0.3

    @vbgl
    vbgl committed Oct 28, 2019

    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
    ea5684b View commit details

  3. ocamlPackages.decompress: 0.6 → 0.9.0 

    ocamlPackages.git: 1.11.5 → 2.1.0

ocamlPackages.imagelib: 20171028 → 20191011

ocamlPackages.imagelib-unix: init
    @vbgl
    vbgl committed Oct 28, 2019

    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
    8dc2173 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/checkseum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {

inherit (dune) installPhase;

passthru = { inherit hasC; };

meta = {
homepage = "https://github.com/mirage/checkseum";
description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
37 changes: 17 additions & 20 deletions pkgs/development/ocaml-modules/decompress/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
{ lib, fetchurl, buildDunePackage
, checkseum, cmdliner
, alcotest, bos, camlzip, mmap, re
}:

if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "decompress is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec {
version = "0.9.0";
pname = "decompress";

stdenv.mkDerivation rec {
version = "0.6";
name = "ocaml${ocaml.version}-decompress-${version}";

src = fetchFromGitHub {
owner = "mirage";
repo = "decompress";
rev = "v${version}";
sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08";
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
};

buildInputs = [ ocaml findlib ocamlbuild topkg ];

inherit (topkg) buildPhase installPhase;
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ checkseum ];
checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
doCheck = true;

meta = {
description = "Pure OCaml implementation of Zlib";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress";
broken = !checkseum.hasC;
};
}
20 changes: 20 additions & 0 deletions pkgs/development/ocaml-modules/encore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }:

buildDunePackage rec {
pname = "encore";
version = "0.3";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl";
};
propagatedBuildInputs = [ angstrom ke ];
checkInputs = lib.optional doCheck alcotest;
doCheck = lib.versions.majorMinor ocaml.version != "4.07";

meta = {
homepage = "https://github.com/mirage/encore";
description = "Library to generate encoder/decoder which ensure isomorphism";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}
19 changes: 10 additions & 9 deletions pkgs/development/ocaml-modules/git/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, buildDunePackage
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri
, alcotest, mtime, nocrypto
{ lib, fetchFromGitHub, buildDunePackage
, alcotest, git, mtime, nocrypto
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult
}:

buildDunePackage rec {
pname = "git";
version = "1.11.5";
version = "2.1.0";

src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-git";
rev = version;
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
sha256 = "0v55zkwgml6i5hp0kzynbi58z6j15k3qgzg06b3h8pdbv5fwd1jp";
};

buildInputs = [ alcotest mtime nocrypto ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ];
propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ];
checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ];
doCheck = true;

meta = {
description = "Git format and protocol in pure OCaml";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
25 changes: 13 additions & 12 deletions pkgs/development/ocaml-modules/imagelib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }:
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }:

stdenv.mkDerivation rec {
version = "20171028";
name = "ocaml${ocaml.version}-imagelib-${version}";
buildDunePackage rec {
minimumOCamlVersion = "4.07";
version = "20191011";
pname = "imagelib";
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-imagelib";
rev = "ocaml-imagelib_${version}";
sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf";
rev = "03fed7733825cef7e0465163f398f6af810e2e75";
sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463";
};

buildInputs = [ which ocaml findlib ocamlbuild ];
patches = [ (fetchpatch {
url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch";
sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9";
}) ];

propagatedBuildInputs = [ decompress ];

createFindlibDestdir = true;

meta = {
description = "Image formats such as PNG and PPM in OCaml";
license = stdenv.lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}
8 changes: 8 additions & 0 deletions pkgs/development/ocaml-modules/imagelib/unix.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{ buildDunePackage, imagelib }:

buildDunePackage {
pname = "imagelib-unix";
inherit (imagelib) version src meta;

propagatedBuildInputs = [ imagelib ];
}
28 changes: 28 additions & 0 deletions pkgs/development/ocaml-modules/ke/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ lib, buildDunePackage, fetchurl
, bigarray-compat, fmt
, alcotest, bigstringaf
}:

buildDunePackage rec {
pname = "ke";
version = "0.4";

src = fetchurl {
url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz";
sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx";
};

propagatedBuildInputs = [ bigarray-compat fmt ];

checkInputs = lib.optionals doCheck [ alcotest bigstringaf ];
doCheck = true;

minimumOCamlVersion = "4.03";

meta = {
description = "Fast implementation of queue in OCaml";
homepage = "https://github.com/mirage/ke";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}
8 changes: 7 additions & 1 deletion pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -233,6 +233,8 @@ let

elpi = callPackage ../development/ocaml-modules/elpi { };

encore = callPackage ../development/ocaml-modules/encore { };

enumerate = callPackage ../development/ocaml-modules/enumerate { };

eqaf = callPackage ../development/ocaml-modules/eqaf { };
@@ -287,6 +289,8 @@ let

imagelib = callPackage ../development/ocaml-modules/imagelib { };

imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };

inotify = callPackage ../development/ocaml-modules/inotify { };

integers = callPackage ../development/ocaml-modules/integers { };
@@ -314,7 +318,7 @@ let

gg = callPackage ../development/ocaml-modules/gg { };

git = callPackage ../development/ocaml-modules/git { };
git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; };

git-http = callPackage ../development/ocaml-modules/git-http { };

@@ -362,6 +366,8 @@ let

jsonm = callPackage ../development/ocaml-modules/jsonm { };

ke = callPackage ../development/ocaml-modules/ke { };

lablgl = callPackage ../development/ocaml-modules/lablgl { };

lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };