diff --git a/flake.nix b/flake.nix index fe29cf2..54ec089 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,6 @@ { inputs = { - nixpkgs.follows = "ocaml-overlay/nixpkgs"; - - ocaml-overlay = { - url = "github:nix-ocaml/nix-overlays"; - }; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -22,16 +18,10 @@ }; }; - nixConfig = { - extra-substituters = "https://anmonteiro.nix-cache.workers.dev"; - extra-trusted-public-keys = "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="; - }; - outputs = inputs @ { self, nixpkgs, flake-utils, - ocaml-overlay, ... }: let inherit (inputs) nixpkgs; @@ -45,7 +35,6 @@ pkgs = import nixpkgs { inherit system; overlays = [ - ocaml-overlay.overlays.default lix-overlay nh-overlay ]; @@ -54,9 +43,8 @@ extra-trusted-public-keys = "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="; }; minimal = let - inherit (pkgs) ocaml-ng; inherit - (ocaml-ng.ocamlPackages_5_2) + (pkgs.ocamlPackages) dune_3 ocaml ; @@ -65,9 +53,8 @@ ocaml ]; dev = let - inherit (pkgs) ocaml-ng; inherit - (ocaml-ng.ocamlPackages_5_2) + (pkgs.ocamlPackages) utop ocaml-lsp ocamlformat @@ -101,16 +88,14 @@ meatOverlays = [ self.overlays.meat nh-overlay - ocaml-overlay.overlays.default ]; lixModule = lix-module; }; - overlays.meat = final: _prev: let + overlays.meat = final: prev: let ocaml-deps = let - inherit (final) ocaml-ng; inherit - (ocaml-ng.ocamlPackages_5_2) + (prev.ocamlPackages) dune_3 ocaml ;