From 2d3c13d6cf9d17106c13bf7675740bc38a9bc00b Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Wed, 18 Oct 2023 17:26:00 -0700 Subject: [PATCH] Update sources (#1117) * Update sources * wip --------- Co-authored-by: UpdateBot --- ci/filter.nix | 5 ++++- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/filter.nix b/ci/filter.nix index 4c8a6be8b..247d97cef 100644 --- a/ci/filter.nix +++ b/ci/filter.nix @@ -39,7 +39,7 @@ let "hol_light" "ppx_tools_versioned" - # Broken since OCaml 4.14 + # Conflicts with cohttp v6 because of the HTTP module "eliom" "ocsigen-start" "ocsigen-toolkit" @@ -101,6 +101,9 @@ let "linol" "linol-lwt" + + # Doesn't build on 4.14. Re-enable when we remove 4.14 + "asai" ]; ocaml5Ignores = [ diff --git a/flake.lock b/flake.lock index fb1b52197..d6d8aa06d 100644 --- a/flake.lock +++ b/flake.lock @@ -20,17 +20,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697343899, - "narHash": "sha256-66Dosy7YYVhkesbHXB4xxZZ+2NOi9CmFDyHOI1ZTAbQ=", + "lastModified": 1697538484, + "narHash": "sha256-Snkk4LL4L3nqRiAJ6/BO9vTnuxbWZhR8jGlfAB5ohPY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "982b24c40e743793c966b47b3bb3699881489ae0", + "rev": "2cb9af4323c64c93e8df3cae5988a53b8687ef3f", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "982b24c40e743793c966b47b3bb3699881489ae0", + "rev": "2cb9af4323c64c93e8df3cae5988a53b8687ef3f", "type": "github" } }, diff --git a/flake.nix b/flake.nix index c01dcf079..4e36f0246 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?rev=982b24c40e743793c966b47b3bb3699881489ae0"; + nixpkgs.url = "github:NixOS/nixpkgs?rev=2cb9af4323c64c93e8df3cae5988a53b8687ef3f"; flake-utils.url = "github:numtide/flake-utils"; };