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

Commits on Nov 14, 2020

  1. ocamlPackages.mirage-unix: use Dune 2

    @vbgl
    vbgl committed Nov 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e6f020 View commit details

  2. ocamlPackages.mirage-runtime: use Dune 2

    @vbgl
    vbgl committed Nov 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7fb0a75 View commit details

  3. ocamlPackages.mirage: init at 3.9.0

    @vbgl
    vbgl committed Nov 14, 2020
    Copy the full SHA
    9ca92f0 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/mirage-unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mirage-unix";
version = "4.0.0";

useDune2 = true;

src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj";
25 changes: 25 additions & 0 deletions pkgs/development/ocaml-modules/mirage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib, buildDunePackage, ocaml
, functoria, mirage-runtime
}:

buildDunePackage rec {
pname = "mirage";
inherit (mirage-runtime) version src;

useDune2 = true;

outputs = [ "out" "dev" ];

propagatedBuildInputs = [ functoria mirage-runtime ];

installPhase = ''
runHook preInstall
dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname}
runHook postInstall
'';

meta = mirage-runtime.meta // {
description = "The MirageOS library operating system";
};

}
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/mirage/runtime.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@ buildDunePackage rec {
pname = "mirage-runtime";
version = "3.9.0";

useDune2 = true;

minimumOCamlVersion = "4.08";

src = fetchurl {
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -539,6 +539,8 @@ let

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

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

mirage-block = callPackage ../development/ocaml-modules/mirage-block { };

mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };