From 72f247439bc5ef5834760e9b71235c7e103f25d1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 19 Mar 2021 16:19:52 +0100 Subject: [PATCH 1/2] haskellPackages.hedgehog-classes: unbreak hedgehog 0.2.5.2 fixed this. vector-circular also builds again. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe51ebadbd3..ebdfce6d13e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6352,7 +6352,6 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens - - hedgehog-classes - hedgehog-fakedata - hedgehog-gen-json - hedgehog-generic @@ -11263,7 +11262,6 @@ broken-packages: - vect-floating-accelerate - vect-opengl - vector-bytestring - - vector-circular - vector-clock - vector-conduit - vector-endian From 07e100d638c803d88c93c5067b68d67deca085c0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 19 Mar 2021 18:26:14 +0100 Subject: [PATCH 2/2] haskellPackages.hgeometry{,-combinatorial}: unbreak hegdehog-classes allows us to build these now, hgeometry-combinatorial needs disabling of test suite since doctests cause some kind of run time linking issue. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0bfe615c31b..78da06f2249 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1672,4 +1672,8 @@ self: super: { # https://github.com/jgm/pandoc/issues/7163 pandoc = dontCheck super.pandoc; + # test suite triggers some kind of linking bug at runtime + # https://github.com/noinia/hgeometry/issues/132 + hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ebdfce6d13e..28d25d77314 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6439,8 +6439,6 @@ broken-packages: - hGelf - hgen - hgeometric - - hgeometry - - hgeometry-combinatorial - hgeometry-ipe - hgeometry-svg - hgeos