From 6e36b3ac40fce322ee0c442a74a59450ca6b7f29 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 21:09:37 +0300 Subject: [PATCH 1/7] xmobar: update patch description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1976d3307c5..d827c7cb88a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1120,8 +1120,8 @@ self: super: { # }); libnix = dontCheck super.libnix; - # Jailbreak: https://github.com/jaor/xmobar/issues/463 - # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. + # 2020-06-23: NOTE: > 0.33 => rm 464.patch: https://github.com/jaor/xmobar/issues/466 + # dontCheck: The test suite tries to mess with ALSA, which doesn't work in the build sandbox. xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { url = "https://github.com/jaor/xmobar/pull/464.patch"; sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; From e9d03e9e94a9b45140d0152a66a0903df3ed40b7 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:39:11 +0300 Subject: [PATCH 2/7] statistics: clean-up M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d827c7cb88a..d01ca2c6330 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -51,10 +51,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # Tests are failing - # https://github.com/bos/statistics/issues/123 - statistics = dontCheck super.statistics; - # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; ghc-datasize = disableLibraryProfiling super.ghc-datasize; From 535d4d895e4d6ebfcfa201b224644b8ebf636ba2 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 21:05:33 +0300 Subject: [PATCH 3/7] rib: update override description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d01ca2c6330..ddd4b01cfa7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1474,7 +1474,7 @@ self: super: { # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 constraints-extras = doJailbreak super.constraints-extras; - # Requested version bump on upstream https://github.com/srid/rib/issues/160 + # 2020-06-22: NOTE: > 0.10.0.0 => rm dhall override: https://github.com/srid/rib/issues/161 rib = doJailbreak (super.rib.override { dhall = self.dhall_1_30_0; }); From a03288a37cd95a2cd9860f46f8a634319c669a9e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:50:05 +0300 Subject: [PATCH 4/7] binary-instances: update override description Previously mentioned issue closed as duplicate of an older one. Issue waits upon QuickCheck release that includes a patch. M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ddd4b01cfa7..5b8d14b7f47 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,7 +1393,7 @@ self: super: { # https://github.com/serokell/nixfmt/pull/62 nixfmt = doJailbreak super.nixfmt; - # https://github.com/phadej/binary-orphans/issues/45 + # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; # Disabling the test suite lets the build succeed on older CPUs From 55df075fcba2adc8fe29c3685d84e86b9e626c5e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:55:24 +0300 Subject: [PATCH 5/7] nixfmt: update override description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b8d14b7f47..2dff208ae07 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1390,7 +1390,7 @@ self: super: { }) ]; - # https://github.com/serokell/nixfmt/pull/62 + # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 From 61fe6c9969d2ab16663db60b0d47e3f426d00b14 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 23 Jun 2020 14:00:50 +0300 Subject: [PATCH 6/7] pantry: free from override and upstreamed patch M pkgs/development/haskell-modules/configuration-common.nix --- .../haskell-modules/configuration-common.nix | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2dff208ae07..ed49ac59cfc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1366,30 +1366,6 @@ self: super: { # https://github.com/bergmark/feed/issues/43 feed = dontCheck super.feed; - pantry_0_2_0_0 = appendPatches (dontCheck super.pantry_0_2_0_0) [ - # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support. - # https://github.com/commercialhaskell/pantry/pull/6 - # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of - # stack is released, it will probably use the newer pantry version, so we - # can completely get rid of pantry-0.2.0.0. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; - sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; - excludes = [ - ".azure/azure-linux-template.yml" - ".azure/azure-osx-template.yml" - ".azure/azure-windows-template.yml" - "package.yaml" - "pantry.cabal" - "stack-lts-11.yaml" - "stack-lts-12.yaml" - "stack-nightly.yaml" - "stack-windows.yaml" - "stack.yaml" - ]; - }) - ]; - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; From ed96ed88acf3bca4bfdbcdb8c6df941bf37e7f84 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 23 Jun 2020 14:01:20 +0300 Subject: [PATCH 7/7] feed: free from override M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ed49ac59cfc..c078fe99a06 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1363,9 +1363,6 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # https://github.com/bergmark/feed/issues/43 - feed = dontCheck super.feed; - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt;