From e6078ca68424ccbd43ecf0a04e999070aed08c18 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 14 Sep 2023 11:35:56 +0200 Subject: [PATCH] haskellPackages: Fix eval errors by bumping overrides --- .../haskell-modules/configuration-common.nix | 12 +++++------ .../configuration-ghc-9.6.x.nix | 2 +- .../transitive-broken.yaml | 21 +++++++------------ .../haskell-modules/hackage-packages.nix | 19 ++++++----------- 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5aef8b2b13..4f9b48e8b9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -316,7 +316,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; }; + patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -1923,10 +1923,10 @@ self: super: { inherit (let pandoc-cli-overlay = self: super: { # pandoc-cli requires pandoc >= 3.1 - pandoc = self.pandoc_3_1_6_1; + pandoc = self.pandoc_3_1_8; # pandoc depends on crypton-connection, which requires tls >= 1.7 - tls = self.tls_1_7_1; + tls = self.tls_1_9_0; crypton-connection = unmarkBroken super.crypton-connection; # pandoc depends on http-client-tls, which only starts depending @@ -1935,11 +1935,11 @@ self: super: { }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; - pandoc_3_1_6_1 = doDistribute (super.pandoc_3_1_6_1.overrideScope pandoc-cli-overlay); + pandoc_3_1_8 = doDistribute (super.pandoc_3_1_8.overrideScope pandoc-cli-overlay); pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay; }) pandoc-cli - pandoc_3_1_6_1 + pandoc_3_1_8 pandoc-lua-engine ; @@ -2765,7 +2765,7 @@ self: super: { # Tests fail due to the newly-build fourmolu not being in PATH # https://github.com/fourmolu/fourmolu/issues/231 - fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0; + fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0; # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. # https://github.com/vincenthz/hs-gauge/pull/106 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 182a259df31..721ff06f172 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -175,7 +175,7 @@ self: super: { hls-floskell-plugin = null; }; - fourmolu = super.fourmolu_0_13_1_0; + fourmolu = super.fourmolu_0_14_0_0; ormolu = super.ormolu_0_7_1_0; stylish-haskell = super.stylish-haskell_0_14_5_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 92800986c97..60a9b747acf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1121,7 +1121,6 @@ dont-distribute-packages: - dfinity-radix-tree - dhall-secret - dia-functions - - diagrams-reflex - diagrams-wx - dialog - diff @@ -1468,6 +1467,7 @@ dont-distribute-packages: - gargoyle-postgresql - gargoyle-postgresql-connect - gargoyle-postgresql-nix + - gbs-downloader - gbu - gdax - gdiff-ig @@ -2210,6 +2210,8 @@ dont-distribute-packages: - http-client-rustls - http-client-tls_0_3_6_3 - http-enumerator + - http-exchange + - http-exchange-instantiations - http-io-streams - http-response-decoder - http2-client-exe @@ -2391,7 +2393,6 @@ dont-distribute-packages: - json-query - json-rpc-client - json-schema - - json-spec - json-spec-openapi - json-togo - json-tokens @@ -2833,7 +2834,7 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt_0_8_5_0 + - net-mqtt_0_8_6_0 - net-spider - net-spider-cli - net-spider-pangraph @@ -2865,6 +2866,7 @@ dont-distribute-packages: - neuron - newsletter-mailgun - newsynth + - ngx-export-distribution - ngx-export-tools-extra - nikepub - nirum @@ -3168,9 +3170,6 @@ dont-distribute-packages: - proton - psc-ide - psql - - ptera - - ptera-core - - ptera-th - puffytools - pugs-compat - pugs-hsregex @@ -3267,6 +3266,7 @@ dont-distribute-packages: - rbr - rc - rdioh + - react - react-flux-servant - reactive - reactive-banana-sdl @@ -3292,14 +3292,12 @@ dont-distribute-packages: - refh - reflex-animation - reflex-backend-wai - - reflex-dom-colonnade - reflex-dynamic-containers - reflex-gadt-api - reflex-ghci - reflex-gloss-scene - reflex-libtelnet - reflex-localize - - reflex-localize-dom - reflex-monad-auth - reflex-potatoes - reflex-process @@ -3847,6 +3845,7 @@ dont-distribute-packages: - tagsoup-navigate - tagstew - tahoe-chk + - tahoe-directory - tahoe-great-black-swamp - tahoe-ssk - tak-ai @@ -3918,11 +3917,6 @@ dont-distribute-packages: - tip-haskell-frontend - tip-lib - titan - - tlex - - tlex-core - - tlex-debug - - tlex-encoding - - tlex-th - tls-extra - tmpl - tn @@ -3960,7 +3954,6 @@ dont-distribute-packages: - trasa-client - trasa-extra - trasa-form - - trasa-reflex - trasa-server - trasa-th - traversal-template diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 30ead3d4c7f..4d8aa72971f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -86125,7 +86125,6 @@ self: { ]; description = "reflex backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-rubiks-cube" = callPackage @@ -112527,6 +112526,7 @@ self: { ]; description = "A library for downloading data from a Great Black Swamp server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "gbu" = callPackage @@ -160585,6 +160585,7 @@ self: { doHaddock = false; description = "Perform HTTP Requests"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "http-exchange-instantiations" = callPackage @@ -160610,6 +160611,7 @@ self: { doHaddock = false; description = "Instantiations of http-exchange"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "http-grammar" = callPackage @@ -174748,7 +174750,6 @@ self: { ]; description = "Type-level JSON specification"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-spec-elm" = callPackage @@ -212270,6 +212271,7 @@ self: { ]; description = "Build custom libraries for Nginx haskell module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "nhm-tool"; }) {}; @@ -241446,7 +241448,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "ptera-core" = callPackage @@ -241470,7 +241471,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "ptera-th" = callPackage @@ -241495,7 +241495,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "pthread" = callPackage @@ -247423,6 +247422,7 @@ self: { ]; description = "Create React components in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "react-flux" = callPackage @@ -249638,7 +249638,6 @@ self: { ]; description = "Use colonnade with reflex-dom"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflex-dom-contrib" = callPackage @@ -250088,7 +250087,6 @@ self: { description = "Helper widgets for reflex-localize"; license = lib.licenses.mit; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "reflex-monad-auth" = callPackage @@ -290442,6 +290440,7 @@ self: { ]; description = "Tahoe-LAFS directory-like abstraction for collections of data objects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "tahoe-great-black-swamp" = callPackage @@ -299775,7 +299774,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A lexer generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-core" = callPackage @@ -299799,7 +299797,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A lexer generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-debug" = callPackage @@ -299822,7 +299819,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Debug utilities for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-encoding" = callPackage @@ -299845,7 +299841,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Encoding plugin for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-th" = callPackage @@ -299869,7 +299864,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "TemplateHaskell plugin for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tls" = callPackage @@ -302490,7 +302484,6 @@ self: { ]; description = "Reactive Type Safe Routing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "trasa-server" = callPackage