Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b324675a1533
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 227cfc24fef1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 9, 2021

  1. haskellPackages.strict-writer: disable doctests on aarch64 

    fail due to GHC bug
    @sternenseemann
    sternenseemann committed May 9, 2021
    Copy the full SHA
    15052e0 View commit details

  2. haskellPackages.HTF: attempt to fix test suite on darwin 

    A script used at test time in HTF assumes that you have GNU coreutils
installed in a manner where all executables are prefixed with a `g`.
Since we use GNU coreutils in the stdenv anyways, this is not necessary
and needs to be patched out.
    @sternenseemann
    sternenseemann committed May 9, 2021
    Copy the full SHA
    227cfc2 View commit details
Showing with 8 additions and 0 deletions.
  1. +1 −0 pkgs/development/haskell-modules/configuration-arm.nix
  2. +7 −0 pkgs/development/haskell-modules/configuration-darwin.nix
1 change: 1 addition & 0 deletions pkgs/development/haskell-modules/configuration-arm.nix
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,7 @@ self: super: {
hsakamai = dontCheck super.hsakamai;
hsemail-ns = dontCheck super.hsemail-ns;
openapi3 = dontCheck super.openapi3;
strict-writer = dontCheck super.strict-writer;

# https://github.com/ekmett/half/issues/35
half = dontCheck super.half;
7 changes: 7 additions & 0 deletions pkgs/development/haskell-modules/configuration-darwin.nix
View file
Original file line number Diff line number Diff line change
@@ -161,4 +161,11 @@ self: super: {
] ++ (drv.librarySystemDepends or []);
});

HTF = overrideCabal super.HTF (drv: {
# GNU find is not prefixed in stdenv
postPatch = ''
substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
'' + (drv.postPatch or "");
});

}