public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haskell-updates,

Browse Source
This commit is contained in:
Peter Simons
2020-10-15 19:39:16 +02:00
parent b18f75c8a3 7ce8117238
commit 56bc587444
583 changed files with 16784 additions and 12546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -782,6 +782,11 @@ self: super: builtins.intersectAttrs super {
testToolDepends = [ pkgs.git pkgs.mercurial ];
});
nix-output-monitor = overrideCabal super.nix-output-monitor {
# Can't ran the golden-tests with nix, because they call nix
testTarget = "unit-tests";
};
haskell-language-server = overrideCabal super.haskell-language-server (drv: {
postInstall = let
inherit (pkgs.lib) concatStringsSep take splitString;

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@@ -25,6 +25,8 @@ self: super: {
hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
# cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git