Skip to content

Commit

Permalink
Skip dstat on darwin (#1839)
Browse files Browse the repository at this point in the history
dstat doesn't seem supported on apple, yet it is used by our tests.

Let's just not include it in the shell, and pray that the apple people
don't try and run these tests locally!

![image](https://github.com/user-attachments/assets/114e350f-4bbe-4c88-b6a6-65608e2d8314)
  • Loading branch information
noonio authored Feb 10, 2025
2 parents 1f36d48 + 87e37a8 commit 1291e6a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
} // lib.attrsets.mergeAttrsList (map (x: componentsToWerrors x hsPkgs.${x}) hydraPackageNames);

devShells = import ./nix/hydra/shell.nix {
inherit pkgs hsPkgs hydraPackages;
inherit pkgs hsPkgs hydraPackages system;
ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler};
};
};
Expand Down
7 changes: 5 additions & 2 deletions nix/hydra/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, pkgs
, ghc
, hydraPackages
, system
}:
let

Expand Down Expand Up @@ -50,8 +51,10 @@ let
pkgs.weeder
pkgs.yarn
pkgs.yq
pkgs.dstat
];
] ++
# `dstat` is required by the benchmark tests; but it's not supported on
# darwin; so we just don't include it.
(pkgs.lib.optionals pkgs.hostPlatform.isLinux [ pkgs.dstat ]);

libs = [
pkgs.glibcLocales
Expand Down

0 comments on commit 1291e6a

Please sign in to comment.