From 37a3e4ed31de88036929030ef910b2db861b4719 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 10 Oct 2021 16:23:30 +0200 Subject: [PATCH] haskellPackages: fix evaluation Some version upgrades caused attributes to disappear. The upgrade from language-docker 10.1.2 to 10.2.0 introduces a test failure which is caused by missing files in the release tarball, so we need to fix this up manually. --- .../haskell-modules/configuration-common.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 209391aaf5df..1d6f3a292822 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1996,9 +1996,16 @@ EOT # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; + # https://github.com/hadolint/language-docker/issues/72 + language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: { + testFlags = (drv.testFlags or []) ++ [ + "--skip=/Language.Docker.Integration/parse" + ]; + }); + # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_2; + language-docker = self.language-docker_10_2_0; }; # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) @@ -2025,11 +2032,11 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_3; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super