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