diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 95dead0ed8..890aab3479 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -114,10 +114,12 @@ jobs: timeout-minutes: 120 run: nix build .#checks.x86_64-linux.ghc-elf-comdat-functions --no-link -L --max-jobs 1 --timeout "$NIX_BUILD_TIMEOUT" - - name: Check Intel Setup failure selection + - name: Check Intel Darwin build policies if: ${{ matrix.system == 'x86_64-darwin' && matrix.target == 'all' }} timeout-minutes: 1 - run: python3 -B scripts/nix/test-select-intel-setup.py + run: | + python3 -B scripts/nix/test-select-intel-setup.py + nix eval --json --file scripts/nix/check-darwin-bitvec-runtime.nix - name: Check native Linux GHC ELF section alignment if: ${{ matrix.system == 'x86_64-linux' && matrix.target == 'native' }} diff --git a/scripts/nix/README.md b/scripts/nix/README.md index 69fad2b5a3..b75f825360 100644 --- a/scripts/nix/README.md +++ b/scripts/nix/README.md @@ -52,6 +52,9 @@ nix eval --impure --json --file scripts/nix/check-darwin-bitvec-resolver.nix \ --apply 'test: let f = builtins.getFlake (toString ./.); in test { lib = f.inputs.haskellNix.inputs.nixpkgs.lib; haskellNix = f.inputs.haskellNix; }' ``` +CI checks this platform scope before the Intel builds with +`nix eval --json --file scripts/nix/check-darwin-bitvec-runtime.nix`. + Cross projects add `ghc-internal` to the Cabal dependencies of the pinned `composition-1.0.2.2` source. This preserves its deliberate avoidance of `base` while making GHC 9.14's wired-in types available in isolated target package