From f99be37b62fbc322f8bb7e04f9a53f2ce26cd342 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 12 Mar 2021 15:32:01 +0100 Subject: [PATCH] haskellPackages.shake-bench: Fix build --- .../haskell-modules/configuration-common.nix | 13 +++++++- .../configuration-hackage2nix.yaml | 16 ---------- .../haskell-modules/hackage-packages.nix | 32 ------------------- 3 files changed, 12 insertions(+), 49 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2d3789970bf..cba2e5c452c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -727,8 +727,19 @@ self: super: { # The tests spuriously fail libmpd = dontCheck super.libmpd; + # 2021-03-12: All of this libraries have to restrictive upper bounds + # https://github.com/diagrams/diagrams-core/issues/112 + active = doJailbreak super.active; + statestack = doJailbreak super.statestack; + force-layout = doJailbreak super.force-layout; + size-based = doJailbreak super.size-based; + dual-tree = doJailbreak super.dual-tree; + diagrams-core = doJailbreak super.diagrams-core; + diagrams-postscript = doJailbreak super.diagrams-postscript; + diagrams-svg = doJailbreak super.diagrams-svg; + diagrams-contrib = doJailbreak super.diagrams-contrib; # https://github.com/diagrams/diagrams-lib/issues/288 - diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); + diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; })); # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a35fdc61aaf..e6ff51780d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3089,7 +3089,6 @@ broken-packages: - acme-zero - acousticbrainz-client - ActionKid - - active - activehs - activehs-base - activitypub @@ -4006,7 +4005,6 @@ broken-packages: - character-cases - charade - chart-cli - - Chart-diagrams - Chart-fltkhs - chart-histogram - Chart-simple @@ -4697,27 +4695,21 @@ broken-packages: - dhrun - dia-base - dia-functions - - diagrams - diagrams-boolean - diagrams-braille - diagrams-builder - diagrams-cairo - diagrams-canvas - - diagrams-contrib - - diagrams-core - diagrams-graphviz - diagrams-gtk - diagrams-haddock - diagrams-html5 - - diagrams-lib - diagrams-pandoc - diagrams-pdf - diagrams-pgf - - diagrams-postscript - diagrams-qrcode - diagrams-rasterific - diagrams-rubiks-cube - - diagrams-svg - diagrams-tikz - diagrams-wx - dib @@ -4887,7 +4879,6 @@ broken-packages: - dtd - dtd-text - dtw - - dual-tree - dualizer - duet - dumb-cas @@ -5359,7 +5350,6 @@ broken-packages: - foo - for-free - forbidden-fruit - - force-layout - fordo - forecast-io - foreign-var @@ -8179,7 +8169,6 @@ broken-packages: - Monocle - monoid - monoid-absorbing - - monoid-extras - monoid-owns - monoidplus - monoids @@ -10129,7 +10118,6 @@ broken-packages: - sirkel - sitepipe - sixfiguregroup - - size-based - sized-grid - sized-types - sized-vector @@ -10409,7 +10397,6 @@ broken-packages: - state-plus - state-record - stateful-mtl - - statestack - static-canvas - static-closure - static-tensor @@ -10555,12 +10542,10 @@ broken-packages: - sv-svfactor - SVD2HS - svfactor - - svg-builder - svg-builder-fork - SVG2Q - svg2q - svgcairo - - SVGFonts - svgone - svgutils - svm-light-utils @@ -10759,7 +10744,6 @@ broken-packages: - testbench - testCom - testcontainers - - testing-feat - testloop - testpack - testpattern diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8d725181003..c9b4789ea7d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3042,8 +3042,6 @@ self: { ]; description = "Diagrams backend for Charts"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Chart-fltkhs" = callPackage @@ -17882,8 +17880,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "SVGPath" = callPackage @@ -23883,8 +23879,6 @@ self: { ]; description = "Abstractions for animation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "activehs" = callPackage @@ -74301,8 +74295,6 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-boolean" = callPackage @@ -74447,8 +74439,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-core" = callPackage @@ -74468,8 +74458,6 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-graphviz" = callPackage @@ -74606,8 +74594,6 @@ self: { benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-pandoc" = callPackage @@ -74695,8 +74681,6 @@ self: { ]; description = "Postscript backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-qrcode" = callPackage @@ -74809,8 +74793,6 @@ self: { ]; description = "SVG backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-tikz" = callPackage @@ -79985,8 +79967,6 @@ self: { ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dualizer" = callPackage @@ -93907,8 +93887,6 @@ self: { ]; description = "Simple force-directed layout"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fordo" = callPackage @@ -177766,8 +177744,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "monoid-owns" = callPackage @@ -237643,8 +237619,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sized" = callPackage @@ -245278,8 +245252,6 @@ self: { ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "statethread" = callPackage @@ -250174,8 +250146,6 @@ self: { ]; description = "DSL for building SVG"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "svg-builder-fork" = callPackage @@ -256906,8 +256876,6 @@ self: { ]; description = "Functional Enumeration of Algebraic Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "testing-type-modifiers" = callPackage