diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix deleted file mode 100644 index 5c6f364d1343..000000000000 --- a/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - fetchurl, - buildDunePackage, - lwt, - parse-argv, -}: - -buildDunePackage (finalAttrs: { - pname = "mirage-bootvar-unix"; - version = "0.1.0"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${finalAttrs.version}/mirage-bootvar-unix-${finalAttrs.version}.tbz"; - hash = "sha256-buVLmVBElmoZELZHDXAMxUUSIwT3KDBGZOB1e7zRImU="; - }; - - propagatedBuildInputs = [ - lwt - parse-argv - ]; - - meta = { - description = "Unix implementation of MirageOS Bootvar interface"; - homepage = "https://github.com/mirage/mirage-bootvar-unix"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -}) diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix deleted file mode 100644 index a43062fe1fea..000000000000 --- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildDunePackage, - fetchurl, - mirage-xen, - parse-argv, - lwt, -}: - -buildDunePackage (finalAttrs: { - pname = "mirage-bootvar-xen"; - version = "0.8.0"; - - minimalOCamlVersion = "4.08"; - - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${finalAttrs.version}/mirage-bootvar-xen-v${finalAttrs.version}.tbz"; - hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; - }; - - propagatedBuildInputs = [ - mirage-xen - lwt - parse-argv - ]; - - meta = { - description = "Handle boot-time arguments for Xen platform"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.sternenseemann ]; - homepage = "https://github.com/mirage/mirage-bootvar-xen"; - }; -}) diff --git a/pkgs/development/ocaml-modules/mirage-bootvar/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar/default.nix new file mode 100644 index 000000000000..1e41546c2f5d --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-bootvar/default.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchurl, + buildDunePackage, + ounit2, +}: + +buildDunePackage (finalAttrs: { + pname = "mirage-bootvar"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-bootvar/releases/download/v${finalAttrs.version}/mirage-bootvar-${finalAttrs.version}.tbz"; + hash = "sha256-EuXvtt2nap3B7jY7nYMenOqamLTQruyFJ8K2tRZ4Bq0="; + }; + + doCheck = true; + checkInputs = [ ounit2 ]; + + meta = { + description = "Boot time arguments for MirageOS"; + homepage = "https://github.com/mirage/mirage-bootvar"; + changelog = "https://raw.githubusercontent.com/mirage/mirage-bootvar/v${finalAttrs.version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.stepbrobd ]; + teams = [ lib.teams.ngi ]; + }; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a2eb5f0efbd4..90099320e7ae 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1316,9 +1316,7 @@ let mirage-block-unix = callPackage ../development/ocaml-modules/mirage-block-unix { }; - mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; - - mirage-bootvar-xen = callPackage ../development/ocaml-modules/mirage-bootvar-xen { }; + mirage-bootvar = callPackage ../development/ocaml-modules/mirage-bootvar { }; mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; @@ -2377,6 +2375,8 @@ let gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; hol_light = pkgs.hol_light; # Added 2026-06-02 lablgtk-extras = throw "lablgtk-extras has been removed as it depends on sourceview2, which has been removed from nixpkgs"; # Added 2026-08-11 + mirage-bootvar-unix = throw "ocamlPackages.mirage-bootvar-unix has been removed, superseded by ocamlPackages.mirage-bootvar"; # Added 2026-08-18 + mirage-bootvar-xen = throw "ocamlPackages.mirage-bootvar-xen has been removed, superseded by ocamlPackages.mirage-bootvar"; # Added 2026-08-18 notty = throw "2026-05-05: notty is no longer maintained, use notty-community instead"; ocaml-freestanding = throw "ocamlPackages.ocaml-freestanding has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";