From 5d9058122f7e2b0e1f0ae6d641810085ebd8a247 Mon Sep 17 00:00:00 2001 From: atagen Date: Thu, 5 Dec 2024 18:17:53 +1100 Subject: [PATCH] ok --- flake.lock | 36 ++++++------------------------------ flake.nix | 7 +------ 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 2f283d8..9ab6df6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,47 +20,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733132332, - "narHash": "sha256-8DTh3irBPko0ooHaeGJ5kPwBD8mOwiMX4eBjFuicLsA=", - "owner": "NixOS", + "lastModified": 1733380312, + "narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", + "owner": "nixOS", "repo": "nixpkgs", - "rev": "b9ffe0d2ef589f4d75a62f908f00dfd6344b6b6e", + "rev": "a772498086eac57d97065a980a21fc0f304e3192", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixOS", "repo": "nixpkgs", - "rev": "b9ffe0d2ef589f4d75a62f908f00dfd6344b6b6e", - "type": "github" - } - }, - "ocaml-overlay": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1733178998, - "narHash": "sha256-VfkaWyw578enSEYmPK+eocxTX0jSyr62EZucHMipcS0=", - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "274761cacd971c2570516141e854ccd9184fab24", - "type": "github" - }, - "original": { - "owner": "nix-ocaml", - "repo": "nix-overlays", - "rev": "274761cacd971c2570516141e854ccd9184fab24", "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "ocaml-overlay", - "nixpkgs" - ], - "ocaml-overlay": "ocaml-overlay" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index 215444d..1e2f7dd 100644 --- a/flake.nix +++ b/flake.nix @@ -15,13 +15,8 @@ system: let pkgs = import nixpkgs { inherit system; - overlays = [ - ocaml-overlay.overlays.default - ]; - extra-substituters = "https://anmonteiro.nix-cache.workers.dev"; - extra-trusted-public-keys = "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="; }; - inherit (pkgs) mkShell ocamlPackages ocaml-ng; + inherit (pkgs) mkShell ocamlPackages; inherit (ocamlPackages) dune_3