From 20c5abba2f762e917503e3d613729f12607baf88 Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Fri, 12 Jan 2024 08:01:25 -0600 Subject: Implement support for dates --- flake.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 5801f07..24abbb7 100644 --- a/flake.nix +++ b/flake.nix @@ -9,29 +9,28 @@ let package = "fixgen"; in flake-utils.lib.eachDefaultSystem (system: let + sourceRoot = "."; pkgs = nixpkgs.legacyPackages.${system}; on = opam-nix.lib.${system}; devPackagesQuery = { - # You can add "development" packages here. They will get added to the devShell automatically. ocaml-lsp-server = "*"; ocamlformat = "*"; ocamlfind = "1.9.5"; utop = "*"; }; query = devPackagesQuery // { - ## You can force versions of certain packages here, e.g: - ## - force the ocaml compiler to be taken from opam-repository: ocaml-base-compiler = "*"; - ## - or force the compiler to be taken from nixpkgs and be a certain version: - # ocaml-system = "4.14.0"; - ## - or force ocamlfind to be a certain version: }; scope = on.buildOpamProject' { } ./. query; overlay = final: prev: { # You can add overrides here + # Handles unpacker produced multiple directories error + timedesc-tzdb = prev.timedesc-tzdb.overrideAttrs (_: { sourceRoot = "."; }); + timedesc-tzlocal = prev.timedesc-tzdb.overrideAttrs (_: { sourceRoot = "."; }); + timedesc = prev.timedesc-tzdb.overrideAttrs (_: { sourceRoot = "."; }); + timedesc-sexp = prev.timedesc-tzdb.overrideAttrs (_: { sourceRoot = "."; }); + timere = prev.timedesc-tzdb.overrideAttrs (_: { sourceRoot = "."; }); ${package} = prev.${package}.overrideAttrs (_: { - # Prevent the ocaml dependencies from leaking into dependent environments - doNixSupport = false; }); }; scope' = scope.overrideScope' overlay; -- cgit v1.2.3