From caad0ba0b3b27f18ffcfb766ffd6e67e3b23b19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Christiansen=20S=C3=B8rby?= Date: Thu, 6 May 2021 17:57:02 +0200 Subject: [PATCH] Update .gitignore --- .gitignore | 1 + flake.nix | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 2e61e9b0..54d36c60 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ grin/.end-to-end-test/ .ghc.environment.* hie.yaml *.lock +result diff --git a/flake.nix b/flake.nix index 5d82e02e..f62d388f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,21 +9,21 @@ outputs = { self, nixpkgs, flake-utils, haskellNix }: flake-utils.lib.eachDefaultSystem (system: - let - overlays = [ haskellNix.overlay - (final: prev: { - # This overlay adds our project to pkgs - grinProject = - final.haskell-nix.project' { - src = ./.; - compiler-nix-name = "ghc8104"; - }; - }) - ]; - pkgs = import nixpkgs { inherit system overlays; }; - flake = pkgs.grinProject.flake {}; - packageName = "grin"; - in flake // { + let + overlays = [ haskellNix.overlay + (final: prev: { + # This overlay adds our project to pkgs + grinProject = + final.haskell-nix.project' { + src = ./.; + compiler-nix-name = "ghc8104"; + }; + }) + ]; + pkgs = import nixpkgs { inherit system overlays; }; + flake = pkgs.grinProject.flake {}; + packageName = "grin"; + in flake // { # Built by `nix build .` defaultPackage = flake.packages."grin:exe:grin"; @@ -36,5 +36,6 @@ haskell-language-server = "latest"; }; }; - }); + } + ); }