From 3fee26e5b6c8d84b2a9870614059b5ba57fe7fed Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 13 Dec 2024 21:15:20 -0800 Subject: [PATCH] fix it --- .github/workflows/nix.yml | 2 +- flake.lock | 5 ++--- flake.nix | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 3a4df1ac0..03ea1b1a1 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -15,4 +15,4 @@ jobs: extra_nix_config: | extra-substituters = https://anmonteiro.nix-cache.workers.dev extra-trusted-public-keys = ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY= - - run: nix develop -c dune build @runtest @check + - run: nix develop -L .# -c dune build @runtest @check diff --git a/flake.lock b/flake.lock index 8fb339fb4..c5a6bd70c 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,15 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1734152790, + "lastModified": 1734153276, "narHash": "sha256-/cvtpMFp0HArEpFi0PrPMsheauc3IJ7qWpSHnw8so2M=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "52bb4fb7ff184ac569eb0b8ad040a2557c491d0d", + "rev": "4247b28ce426ccdea09a1ec014fa52785bc7ba1d", "type": "github" }, "original": { "owner": "nix-ocaml", - "ref": "anmonteiro/ocurl-stuff", "repo": "nix-overlays", "type": "github" } diff --git a/flake.nix b/flake.nix index 112398602..da89e0e1b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Cohttp Nix Flake"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays/anmonteiro/ocurl-stuff"; + inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays"; outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: @@ -11,7 +11,6 @@ inherit system; overlays = [ (final: prev: { - openssl-oc = prev.openssl_3_0; ocamlPackages = prev.ocamlPackages.overrideScope' (oself: osuper: { ctypes-foreign = osuper.ctypes-foreign.overrideAttrs (_: { doCheck = false; }); ctypes = osuper.ctypes.overrideAttrs (_: { doCheck = false; });