From 0f9de1bcbd71afeda6bee1f52865907411698b91 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Apr 2022 19:44:27 +0200 Subject: [PATCH] haskellPackages.generic-arbitrary: apply patch for negative resizes See https://github.com/typeable/generic-arbitrary/issues/14 for the problem. --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ .../configuration-hackage2nix/broken.yaml | 4 ---- pkgs/development/haskell-modules/hackage-packages.nix | 11 +---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 95271c1fc64d..8393d02a3164 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1163,6 +1163,16 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; + # Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites + # https://github.com/typeable/generic-arbitrary/issues/14 + generic-arbitrary = appendPatches [ + (pkgs.fetchpatch { + name = "generic-arbitrary-no-negative-resize.patch"; + url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch"; + sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi"; + }) + ] super.generic-arbitrary; + # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b942853b0bc5..ea2033fcbc74 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -357,7 +357,6 @@ broken-packages: - binary-communicator - binary-derive - binary-ext - - binary-generic-combinators - binary-indexed-tree - binary-protocol - binary-tree @@ -3334,7 +3333,6 @@ broken-packages: - msgpack - msgpack-binary - msgpack-persist - - msgpack-types - msh - msi-kb-backlit - MTGBuilder @@ -3600,7 +3598,6 @@ broken-packages: - open-signals - opensoundcontrol-ht - openssh-protocol - - opentelemetry-extra - opentelemetry-http-client - opentheory-char - opentok @@ -4337,7 +4334,6 @@ broken-packages: - robin - robots-txt - roc-cluster - - roc-id - roku-api - rollbar-client - rollbar-hs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b672d5d58349..dce76c780e77 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -41730,8 +41730,6 @@ self: { ]; description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "binary-ieee754" = callPackage @@ -70393,7 +70391,7 @@ self: { ]; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; + }) {pocketsphinx = null; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -188342,8 +188340,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "msh" = callPackage @@ -200265,8 +200261,6 @@ self: { testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "opentelemetry-extra_0_8_0" = callPackage @@ -200304,7 +200298,6 @@ self: { benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "opentelemetry-http-client" = callPackage @@ -235070,8 +235063,6 @@ self: { ]; description = "Implementation of the ROC National ID standard"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "rock" = callPackage