From 86c920a7c2dd64f76195519c8fed239209025262 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Wed, 24 Jun 2026 23:32:57 +0100 Subject: [PATCH] refactor(nix): drop odoc/odoc-parser overrides `ocaml-overlays` now ships `odoc 3.2.1` and `odoc-parser 3.2.1` directly (rev 141b591b), matching what our overrides were yanking from vanilla nixpkgs. The override (plus the `nixpkgsOcaml` let-binding it relied on) is dead. Shell hashes that touch odoc drift because the src derivation now comes via nix-overlays' fetcher rather than nixpkgs', but the resulting `odoc` is the same upstream 3.2.1. Signed-off-by: Ali Caglayan --- flake.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flake.nix b/flake.nix index 925599fe4a3..2f60afe08f3 100644 --- a/flake.nix +++ b/flake.nix @@ -37,9 +37,6 @@ nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed ( system: let - # Vanilla nixpkgs scope used to source packages we want to take - # ahead of what `ocaml-overlays` ships (e.g. odoc 3.2.1). - nixpkgsOcaml = nixpkgs.legacyPackages.${system}.ocaml-ng.ocamlPackages_5_4; pkgs = nixpkgs.legacyPackages.${system}.appendOverlays [ ocaml-overlays.overlays.default (self: super: { @@ -52,14 +49,6 @@ utop = osuper.utop.overrideAttrs { dontGzipMan = true; }; - odoc-parser = osuper.odoc-parser.overrideAttrs (old: { - inherit (nixpkgsOcaml.odoc-parser) version src; - doCheck = false; - }); - odoc = osuper.odoc.overrideAttrs (old: { - inherit (nixpkgsOcaml.odoc) version src; - doCheck = false; - }); } ); })