Skip to content

Commit

Permalink
test flake: clean up, use coreutils instead of busybox for macOS support
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom McLaughlin committed Dec 4, 2024
1 parent c64b7f1 commit f4e3d71
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions tests/flake.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";

inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";

outputs = { self, nixpkgs, flake-utils }@inputs:
# flake-utils.lib.eachDefaultSystem (system:
outputs = { self, flake-utils, nixpkgs }:
flake-utils.lib.eachSystem ["x86_64-linux" "x86_64-darwin" "aarch64-darwin"] (system:
let
pkgs = import nixpkgs { inherit system; };
tests = pkgs.haskell.packages.ghc965.callPackage ./tests.nix {};
in
rec {
packages = rec {
packages = {
inherit tests;
inherit (pkgs) cabal2nix;

Expand All @@ -20,7 +18,7 @@
# Print a trivial PATH that we can use to run kernel and LSP tests, to ensure
# they aren't depending on anything on the test machine's PATH.
print-basic-path = pkgs.writeShellScriptBin "codedown-artifact-sizes.sh" ''
echo ${pkgs.lib.makeBinPath (with pkgs; [busybox bash])}
echo ${pkgs.lib.makeBinPath (with pkgs; [coreutils bash])}
'';
};

Expand Down

0 comments on commit f4e3d71

Please sign in to comment.