From 01f1a23c96e3bbed601013265957c637cb8245da Mon Sep 17 00:00:00 2001 From: Thomas Pani Date: Wed, 24 May 2023 08:25:24 +0000 Subject: [PATCH] Update flake.lock and pin old ocaml-mdx --- flake.lock | 30 ++++++++++++++++++++++++------ flake.nix | 8 +++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 722e88613b..64a1db1331 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1635295995, - "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", + "lastModified": 1684879512, + "narHash": "sha256-BoAOf19Dshtfu6BDPznrKO97oeCkXlYfa1Hyt0Qv8VU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", + "rev": "e6e049b7a24decd1f0caee8b035913795697c699", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2f40b8c3b7..7d1b22ca54 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,12 @@ eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; + # FIXME(#2565): pin old nixpkgs, to pull in mdx 2.1.0, need to workaround this regression: + # https://github.com/realworldocaml/mdx/issues/428 + pkgsOldMdx = import (builtins.fetchTarball { + url = https://github.com/NixOS/nixpkgs/archive/76be8d2d04a00e5e2df6fa147dfc4797874edc97.tar.gz; + sha256="Nw1lgrAQG++uzYQc1SilzGdeoy9RZ/HwcKlbaAp1rTE="; + }) { inherit system; }; in { # Nix Build @@ -66,7 +72,7 @@ metals # Testing - ocamlPackages.mdx + pkgsOldMdx.ocamlPackages.mdx python39Full ]; };