maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(users/gs/owothia): remove unnecessary overrides, simplify

Browse source 
* 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>
This commit is contained in:
sterni 2021-03-26 01:51:35 +01:00
parent 3a49e4f4bf
commit a040c55d35
4 changed files with 18 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

21
users/glittershark/owothia/shell.nix
View file

@ -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
];
}