From b1a848eceb7d643e57f1d56409d4cf0885982a76 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:32:42 -0500 Subject: [PATCH 1/5] Update ghc810.nix --- nix/ghc810.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/ghc810.nix b/nix/ghc810.nix index d7e8775..002f14a 100644 --- a/nix/ghc810.nix +++ b/nix/ghc810.nix @@ -7,6 +7,7 @@ perSystem = { pkgs, lib, config, ... }: { haskellProjects.ghc810 = { projectFlakeName = "nammayatri:common"; + projectRoot = ../; # This is not a local project, so disable those options. defaults.packages = { }; From 72f4a118300f1a27c6555cb6c17eb1424ece7824 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:33:57 -0500 Subject: [PATCH 2/5] Update flake-module.nix --- flake-module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake-module.nix b/flake-module.nix index 513bc56..97bf069 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -8,7 +8,7 @@ common: common.inputs.haskell-flake.flakeModule (import ./nix/treefmt.nix common) ./nix/haskell - # ./nix/ghc810.nix + ./nix/ghc810.nix ./nix/ghc927.nix ./nix/pre-commit.nix ./nix/arion.nix From ad1d7fb672a8cb461a32bd506fe5ea0524c3ce38 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:34:50 -0500 Subject: [PATCH 3/5] Update flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c4c229f..0739a6a 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ outputs = inputs: { flakeModules = { default = import ./flake-module.nix { inherit inputs; }; - # ghc810 = ./nix/ghc810.nix; + ghc810 = ./nix/ghc810.nix; ghc927 = ./nix/ghc927.nix; }; From 3825f41e3f4989100b253542c869cea264cbc2eb Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:35:17 -0500 Subject: [PATCH 4/5] Update ghc810.nix --- nix/ghc810.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/ghc810.nix b/nix/ghc810.nix index 002f14a..56fc79a 100644 --- a/nix/ghc810.nix +++ b/nix/ghc810.nix @@ -7,7 +7,7 @@ perSystem = { pkgs, lib, config, ... }: { haskellProjects.ghc810 = { projectFlakeName = "nammayatri:common"; - projectRoot = ../; + projectRoot = ../.; # This is not a local project, so disable those options. defaults.packages = { }; From 77f947a0a94e16504680fbb81ee0c3a9989d367b Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:04:43 -0500 Subject: [PATCH 5/5] Update flake-module.nix --- flake-module.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake-module.nix b/flake-module.nix index 97bf069..056b0de 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -8,7 +8,6 @@ common: common.inputs.haskell-flake.flakeModule (import ./nix/treefmt.nix common) ./nix/haskell - ./nix/ghc810.nix ./nix/ghc927.nix ./nix/pre-commit.nix ./nix/arion.nix