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: a6a08dee680f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0787c45bd6e0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 22, 2020

  1. haskellPackages.hakyll: relax upper bound on warp

    @vaibhavsagar
    vaibhavsagar committed Apr 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3aa001c View commit details

Commits on Apr 23, 2020

  1. Merge pull request #85753 from vaibhavsagar/hakyll-upper-warp 

    haskellPackages.hakyll: relax upper bound on warp
    @cdepillabout
    cdepillabout authored Apr 23, 2020
    Copy the full SHA
    0787c45 View commit details
Showing with 12 additions and 3 deletions.
  1. +12 −3 pkgs/development/haskell-modules/configuration-common.nix
15 changes: 12 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -153,11 +153,20 @@ self: super: {
barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;

# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
hakyll = if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal super.hakyll (drv: {
hakyll = let
# Hakyll needs a relaxed upper bound on `warp` so that the preview server will build
patched-hakyll = overrideCabal super.hakyll (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace hakyll.cabal --replace \
"warp >= 3.2 && < 3.3" \
"warp >= 3.2 && < 3.4"
'';
});
in if pkgs.stdenv.isDarwin
then dontCheck (overrideCabal patched-hakyll (drv: {
testToolDepends = [];
}))
else super.hakyll;
else patched-hakyll;

double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion