From fe7c68777ede714c93dabbad27ddf620910081a3 Mon Sep 17 00:00:00 2001 From: Martin Fredin Date: Tue, 17 Jan 2023 15:32:30 +0100 Subject: [PATCH 1/3] Add shell.nix --- shell.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..cc84b62 --- /dev/null +++ b/shell.nix @@ -0,0 +1,14 @@ +let + pkgs = import { }; # pin the channel to ensure reproducibility! +in +pkgs.haskellPackages.developPackage { + root = ./.; + withHoogle = true; + modifier = drv: + pkgs.haskell.lib.addBuildTools drv ( + (with pkgs; [ hlint haskell-language-server ghc ]) + ++ + (with pkgs.haskellPackages; [ cabal-install stylish-haskell ]) + ); +} + From 157ee636e81743708cb4a30e97a04ca2b2a1f7b3 Mon Sep 17 00:00:00 2001 From: Martin Fredin Date: Tue, 17 Jan 2023 15:33:52 +0100 Subject: [PATCH 2/3] Change base to version which is compatible with ghc.9.2.4 --- language.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.cabal b/language.cabal index 7ecaefc..0c68f81 100644 --- a/language.cabal +++ b/language.cabal @@ -68,7 +68,7 @@ executable language -- other-extensions: -- Other library packages from which modules are imported. - build-depends: base ^>=4.17.0.0 + build-depends: base ^>=4.16.3.0 -- Directories containing source files. hs-source-dirs: app From 7caadcbeb9219d382bbedbca834ff32109176696 Mon Sep 17 00:00:00 2001 From: Martin Fredin Date: Tue, 17 Jan 2023 15:34:32 +0100 Subject: [PATCH 3/3] Use src instead of app --- language.cabal | 2 +- {app => src}/Main.hs | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {app => src}/Main.hs (100%) diff --git a/language.cabal b/language.cabal index 0c68f81..6fc24c9 100644 --- a/language.cabal +++ b/language.cabal @@ -71,7 +71,7 @@ executable language build-depends: base ^>=4.16.3.0 -- Directories containing source files. - hs-source-dirs: app + hs-source-dirs: src -- Base language which the package is written in. default-language: GHC2021 diff --git a/app/Main.hs b/src/Main.hs similarity index 100% rename from app/Main.hs rename to src/Main.hs