Merge pull request #70936 from erictapen/hakyll-4.13.0.1-release-19.09

haskellPackages.hakyll: fix build on release-19.09

pkgs/development/haskell-modules/configuration-common.nix

@@ -146,16 +146,11 @@ self: super: {
     else super.halive;
 
   # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
-  hakyll = appendPatch
-    (if pkgs.stdenv.isDarwin
+  hakyll = if pkgs.stdenv.isDarwin
     then dontCheck (overrideCabal super.hakyll (drv: {
       testToolDepends = [];
     }))
-    else super.hakyll)
-    (pkgs.fetchpatch {
-      url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch;
-      sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ=";
-    });
+    else super.hakyll;
 
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -5372,7 +5372,6 @@ broken-packages:
   - hakismet
   - hakka
   - hako
-  - hakyll
   - hakyll-agda
   - hakyll-blaze-templates
   - hakyll-contrib

pkgs/development/haskell-modules/hackage-packages.nix

@@ -104474,8 +104474,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.13.0.0";
-       sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b";
+       version = "4.13.0.1";
+       sha256 = "0728947np74z8dn1p55bqsv1bgx0ipaiajankwnnmp5mk0lkixd6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104496,8 +104496,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage