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

2020-10-15 19:39:16 +02:00
parent b18f75c8a3 7ce8117238
commit 56bc587444
583 changed files with 16784 additions and 12546 deletions
@@ -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;