From 1f6e6d43164e152b2b389421f33e4560b235667c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 28 Jun 2020 19:50:15 +0200 Subject: [PATCH] Install more Haskell software --- overlays/10-previews.nix | 2 +- overlays/30-ghc.nix | 4 ++-- overlays/pkgSets.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix index 6897f085..9c9424b0 100644 --- a/overlays/10-previews.nix +++ b/overlays/10-previews.nix @@ -7,5 +7,5 @@ in { inherit (unstable.gnome3) gnome-keyring seahorse gdm; }; inherit (unstable) - neovim vimPlugins syncthing nerdfonts ormolu go-neb; # riot-desktop; + neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; # riot-desktop; } diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix index 6c88a73f..5549906e 100644 --- a/overlays/30-ghc.nix +++ b/overlays/30-ghc.nix @@ -10,9 +10,9 @@ let makeHaskellPackages = p: { inherit (p) - brittany ormolu releaser cabal-fmt stack ghcide cabal-install dhall + brittany ormolu releaser cabal-fmt stack ghcid ghcide cabal-install dhall aeson unordered-containers these neuron taskwarrior pandoc hlint - cabal2nix weeder; + cabal2nix weeder reflex-dom password optics-th; } // makeHaskellScriptPackages p; in { myHaskellPackages = makeHaskellPackages master.haskellPackages; diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index ec6be474..fb831577 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -37,7 +37,7 @@ self: super: { inherit (self.pythonPackages) yapf jsbeautifier; inherit (self) go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole - nixfmt rnix-lsp tmate rustup kitty nix-top ghc ormolu; + nixfmt rnix-lsp tmate rustup kitty nix-top ghc ghcid ormolu; obelisk = (import self.sources.obelisk { }).command; }; accounting-pkgs = {