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

Commits on Nov 1, 2020

  1. ocamlPackages.imagelib: use Dune 2

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 1, 2020
    Copy the full SHA
    73c60d6 View commit details

  2. ocamlPackages.decompress: use Dune 2

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 1, 2020
    Copy the full SHA
    371dce3 View commit details

  3. ocamlPackages.checkseum: 0.1.1 → 0.2.1

    @vbgl @ehmry
    vbgl authored and ehmry committed Nov 1, 2020
    Copy the full SHA
    99ebf5b View commit details
12 changes: 7 additions & 5 deletions pkgs/development/ocaml-modules/checkseum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, dune-configurator
, bigarray-compat, optint
, cmdliner, fmt, rresult
, fmt, rresult
, alcotest
}:

buildDunePackage rec {
version = "0.1.1";
version = "0.2.1";
pname = "checkseum";

useDune2 = true;

src = fetchurl {
url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz";
sha256 = "0aa2r1l65a5hcgciw6n8r5ij4gpgg0cf9k24isybxiaiz63k94d3";
sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5";
};

buildInputs = [ cmdliner fmt rresult ];
buildInputs = [ dune-configurator fmt rresult ];
propagatedBuildInputs = [ bigarray-compat optint ];
checkInputs = lib.optionals doCheck [ alcotest ];

2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/decompress/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ buildDunePackage rec {
version = "0.9.0";
pname = "decompress";

useDune2 = true;

src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
3 changes: 3 additions & 0 deletions pkgs/development/ocaml-modules/imagelib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,9 @@ buildDunePackage rec {
minimumOCamlVersion = "4.07";
version = "20191011";
pname = "imagelib";

useDune2 = true;

src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-imagelib";
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/imagelib/unix.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

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

propagatedBuildInputs = [ imagelib ];
}