diff --git a/flake.lock b/flake.lock index f377d31..0e7c236 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1665081174, - "narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=", + "lastModified": 1686020360, + "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "598f83ebeb2235435189cf84d844b8b73e858e0f", + "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0705b28..0834012 100644 --- a/flake.nix +++ b/flake.nix @@ -5,25 +5,30 @@ let pkgs = import nixpkgs { system = "x86_64-linux"; - overlays = [ self.overlay ]; - config = { allowBroken = true; }; + overlays = [ self.overlays.default ]; }; in with pkgs; { - overlay = self: super: + overlays.default = final: prev: let - hpkgs = super.haskellPackages.override{ - overrides = hself: hsuper:{ - arch-web = with super.haskell.lib; disableLibraryProfiling (dontCheck hsuper.arch-web); + hpkgs = prev.haskellPackages.override { + overrides = hself: hsuper: { + arch-web = prev.haskell.lib.dontCheck + (hself.callCabal2nix "arch-web" (builtins.fetchTarball { + url = + "https://hackage.haskell.org/package/arch-web-0.2/arch-web-0.2.tar.gz"; + sha256 = + "0306ky9a4rfc4lz838kykl91br6s7sm9dkp446425g3yjh6x26zl"; + }) { }); }; }; arch-hs = hpkgs.callCabal2nix "arch-hs" ./. { }; - in with super; + in with final; with haskell.lib; { inherit arch-hs; arch-hs-dev = addBuildTools arch-hs [ cabal-install haskell-language-server ]; }; - defaultPackage.x86_64-linux = arch-hs; - devShell.x86_64-linux = arch-hs-dev.envFunc { }; + packages.x86_64-linux.default = arch-hs; + devShells.x86_64-linux.default = arch-hs-dev.envFunc { }; }; }