diff options
| author | sterni <sternenseemann@systemli.org> | 2021-03-26T00·51+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-03-26T01·46+0000 |
| commit | a040c55d35e41e99c4d6ed95483a7697e14ebdf5 (patch) | |
| tree | 32d0c984bce73eb372a30b76a25976a9fab7c3f3 /users/glittershark/owothia/shell.nix | |
| parent | 3a49e4f4bf23ab2c2bc59a7574cb8dfe2f07067d (diff) | |
chore(users/gs/owothia): remove unnecessary overrides, simplify r/2331
* chatter and its dependencies have been fixed in upstream haskellPackages, so we can get rid of the packageSet.nix expression: https://github.com/NixOS/nixpkgs/pull/116803 * Merged default.nix and pkg.nix into one expression and use callCabal2nix instead of emulating it with nested imports. * Minor refactor of shell.nix and remove haskell-language-server until we've redone it or replaced it with the upstream one as now the GHC versions are out of sync: hls is built with 8.8.4, but haskellPackages uses 8.10.4 Change-Id: Ie75eaa93ba8bd79e749e2442fb28c855b8a15a1d Reviewed-on: https://cl.tvl.fyi/c/depot/+/2661 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/owothia/shell.nix')
| -rw-r--r-- | users/glittershark/owothia/shell.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/users/glittershark/owothia/shell.nix b/users/glittershark/owothia/shell.nix index 53971c97bd36..4a89fa0a5d7e 100644 --- a/users/glittershark/owothia/shell.nix +++ b/users/glittershark/owothia/shell.nix @@ -1,14 +1,23 @@ -args@{ pkgs ? (import ../../../. {}).third_party, ... }: +{ pkgs ? (import ../../../. {}).third_party, ... }: -((import ./packageSet.nix args).extend (pkgs.haskell.lib.packageSourceOverrides { - owothia = pkgs.gitignoreSource ./.; +let + inherit (pkgs) + haskellPackages + haskell + gitignoreSource + ; +in + +(haskellPackages.extend (haskell.lib.packageSourceOverrides { + owothia = gitignoreSource ./.; })).shellFor { - packages = p: [p.owothia]; + packages = p: [ p.owothia ]; withHoogle = true; doBenchmark = true; - buildInputs = with pkgs.haskellPackages; [ + buildInputs = with haskellPackages; [ cabal-install hlint - pkgs.haskell-language-server.ghc884 + # TODO(sterni): versions out of sync + # pkgs.haskell-language-server.ghc884 ]; } |