From d774a84aa65d643baa4aa510e41281cca8eaac59 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 9 Feb 2025 14:44:54 +0000 Subject: [PATCH] chore(nix): update to 5.2 (#11458) Signed-off-by: Rudi Grinberg --- flake.lock | 21 +++++++++------------ flake.nix | 5 ++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b1cc0973ea2..ef075dea32e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727524699, - "narHash": "sha256-k6YxGj08voz9NvuKExojiGXAVd69M8COtqWSKr6sQS4=", + "lastModified": 1739019272, + "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b5b2fecd0cadd82ef107c9583018f381ae70f222", + "rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec", "type": "github" }, "original": { @@ -103,19 +103,16 @@ }, "ocaml-overlays": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1717813629, - "narHash": "sha256-CyM8f1XZ3OaJH2Z4qSHwMTi1S40uzRzUD4Lh+eQLNFk=", + "lastModified": 1738777743, + "narHash": "sha256-l2eEAvqeBcpIRf75GyTasMZdSpP1wcJzGDdHZuUpa3U=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "7fdbb404f573cc6ac77926cbd6de475accff5cf5", + "rev": "578dae4718747c751e5f39fa7d155f35d9e0775c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7574514c3f8..48c26b6f06d 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ ocaml-overlays = { url = "github:nix-ocaml/nix-overlays"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; }; outputs = @@ -24,7 +23,7 @@ let pkgs = nixpkgs.legacyPackages.${system}.appendOverlays [ (self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope (oself: osuper: { + ocamlPackages = super.ocaml-ng.ocamlPackages_5_2.overrideScope (oself: osuper: { mdx = osuper.mdx.override { logs = oself.logs; }; @@ -41,7 +40,7 @@ }) ]; dune-static-overlay = self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope (oself: osuper: { + ocamlPackages = super.ocaml-ng.ocamlPackages_5_2.overrideScope (oself: osuper: { dune_3 = osuper.dune_3.overrideAttrs (a: { src = ./.; preBuild = "ocaml boot/bootstrap.ml --static";