3
0
Fork 0
forked from mirrors/nixpkgs

haskellPackages: fixes

This commit is contained in:
Naïm Favier 2022-11-20 15:50:17 +01:00
parent 216efb0d9c
commit ea84ce7593
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
8 changed files with 72 additions and 394 deletions

View file

@ -1031,15 +1031,6 @@ self: super: {
(super.stack.overrideScope (self: super: {
# Needs Cabal-3.6
Cabal = self.Cabal_3_6_3_0;
# Official stack ships with hpack-0.35.0. Nixpkgs uses the same
# version of hpack so that users who get stack from Nixpkgs
# generate the same .cabal files as users who download official binaries
# of stack.
#
# dontCheck is used because one of the hpack tests appears to be
# incorrectly(?) failing:
# https://github.com/sol/hpack/issues/528
hpack = dontCheck self.hpack_0_35_0;
})));
# Too strict version bound on hashable-time.
@ -1435,12 +1426,6 @@ self: super: {
# https://github.com/nikita-volkov/stm-containers/issues/29
stm-containers = doJailbreak super.stm-containers;
# https://github.com/agrafix/Spock/issues/180
# Ignore Stackage LTS bound so we can compile Spock-core again. All other
# reverse dependencies of reroute are marked as broken in nixpkgs, so
# upgrading reroute is probably unproblematic.
reroute = doDistribute self.reroute_0_7_0_0;
# Test suite fails to compile https://github.com/agrafix/Spock/issues/177
Spock = dontCheck super.Spock;
@ -1572,11 +1557,7 @@ self: super: {
dontCheck
(disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
]).overrideScope (lself: lsuper: {
ormolu = doJailbreak lself.ormolu_0_5_0_1;
fourmolu = doJailbreak lself.fourmolu_0_9_0_0;
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
hlint = enableCabalFlag "ghc-lib" lsuper.hlint;
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
# because some packages, like ormolu, need a newer Cabal version.
# ghc-paths is special because it depends on Cabal for building
@ -1589,21 +1570,13 @@ self: super: {
ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
});
hledger_1_27_1 = doDistribute (super.hledger_1_27_1.override {
hledger-lib = self.hledger-lib_1_27_1;
});
hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
hlint = enableCabalFlag "ghc-lib" lsuper.hlint;
});
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
});
ghc-lib-parser-ex = disableCabalFlag "auto" super.ghc-lib-parser-ex;
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
hls-eval-plugin = dontCheck super.hls-eval-plugin;
@ -1840,9 +1813,9 @@ self: super: {
# https://github.com/jaspervdj/profiteur/issues/33
profiteur = doJailbreak super.profiteur;
# Test suite has overly strict bounds on tasty.
# Test suite has overly strict bounds on tasty, jailbreaking fails.
# https://github.com/input-output-hk/nothunks/issues/9
nothunks = doJailbreak super.nothunks;
nothunks = dontCheck super.nothunks;
# Allow building with recent versions of tasty.
lukko = doJailbreak super.lukko;
@ -2178,12 +2151,6 @@ self: super: {
# https://github.com/plow-technologies/hspec-golden-aeson/issues/17
hspec-golden-aeson = dontCheck super.hspec-golden-aeson;
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
stylish-haskell = (super.stylish-haskell.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
});
# To strict bound on hspec
# https://github.com/dagit/zenc/issues/5
zenc = doJailbreak super.zenc;
@ -2195,7 +2162,7 @@ self: super: {
assert super.graphql.version == "1.0.3.0";
appendConfigureFlags [
"-f-json"
] (lib.warnIf (lib.versionAtLeast self.hspec.version "2.9.0") "@NixOS/haskell: Remove jailbreak for graphql" doJailbreak super.graphql);
] super.graphql;
# https://github.com/ajscholl/basic-cpuid/pull/1
basic-cpuid = appendPatch (fetchpatch {
@ -2633,9 +2600,6 @@ in {
sha256 = "QzpZ7lDedsz1mZcq6DL4x7LBnn58rx70+ZVvPh9shRo=";
}) super.text-format;
# 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage
rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; };
# 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3
tzdata = dontCheck super.tzdata;
@ -2647,9 +2611,6 @@ in {
# 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12
# Other dependencies are resolved with doJailbreak for both swarm and brick_1_3
swarm = doJailbreak (super.swarm.override {
witch = super.witch_1_1_2_0;
brick = doJailbreak (dontCheck (super.brick_1_3.override {
text-zipper = super.text-zipper_0_12;
}));
brick = doJailbreak (dontCheck super.brick_1_3);
});
})

View file

@ -301,12 +301,12 @@ self: super: ({
# Build segfaults unless `fixity-th` is disabled.
# https://github.com/tweag/ormolu/issues/927
ormolu_0_5_0_1 = overrideCabal (drv: {
ormolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1);
fourmolu_0_9_0_0 = overrideCabal (drv: {
}) (disableCabalFlag "fixity-th" super.ormolu);
fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0);
}) (disableCabalFlag "fixity-th" super.fourmolu);
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin

View file

@ -52,9 +52,6 @@ self: super: {
# Tests fail because of typechecking changes
conduit = dontCheck super.conduit;
# 0.30 introduced support for GHC 9.2.
cryptonite = doDistribute self.cryptonite_0_30;
# cabal-install needs most recent versions of Cabal and Cabal-syntax
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
@ -80,14 +77,11 @@ self: super: {
assoc = doJailbreak super.assoc;
async = doJailbreak super.async;
base64-bytestring = doJailbreak super.base64-bytestring;
base-compat = self.base-compat_0_12_2;
base-compat-batteries = self.base-compat-batteries_0_12_2;
binary-instances = doJailbreak super.binary-instances;
ChasingBottoms = doJailbreak super.ChasingBottoms;
constraints = doJailbreak super.constraints;
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
data-fix = doJailbreak super.data-fix;
dbus = self.dbus_1_2_27;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
@ -97,7 +91,7 @@ self: super: {
# causing the build-depends to be skipped. Since the dependency
# list hasn't changed much since 0.6.4, we can just reuse the
# normal expression.
inherit (self.ghc-exactprint_1_5_0) src version;
inherit (super.ghc-exactprint) src version;
revision = null; editedCabalFile = null;
libraryHaskellDepends = [
self.fail
@ -105,14 +99,10 @@ self: super: {
self.data-default
] ++ drv.libraryHaskellDepends or [];
}) super.ghc-exactprint;
ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107;
ghc-lib-parser = doDistribute super.ghc-lib-parser;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_1_0;
hashable-time = doJailbreak super.hashable-time;
# 1.1.1 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hedgehog = assert super.hedgehog.version == "1.0.5"; doJailbreak super.hedgehog;
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);
indexed-traversable = doJailbreak super.indexed-traversable;
@ -120,14 +110,13 @@ self: super: {
lifted-async = doJailbreak super.lifted-async;
lukko = doJailbreak super.lukko;
lzma-conduit = doJailbreak super.lzma-conduit;
ormolu = self.ormolu_0_5_0_1;
parallel = doJailbreak super.parallel;
path = doJailbreak super.path;
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
primitive = doJailbreak super.primitive;
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
retrie = dontCheck super.retrie;
singleton-bool = doJailbreak super.singleton-bool;
servant = doJailbreak super.servant;
servant-swagger = doJailbreak super.servant-swagger;
@ -183,22 +172,11 @@ self: super: {
# Tests depend on `parseTime` which is no longer available
hourglass = dontCheck super.hourglass;
# 0.17.0 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed
memory = assert super.memory.version == "0.16.0"; appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl";
}) (overrideCabal {
editedCabalFile = null;
revision = null;
} super.memory);
# For -fghc-lib see cabal.project in haskell-language-server.
stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell;
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override {
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
}));
hlint = doDistribute (enableCabalFlag "ghc-lib" super.hlint);
# https://github.com/sjakobi/bsb-http-chunked/issues/38
bsb-http-chunked = dontCheck super.bsb-http-chunked;
@ -208,17 +186,11 @@ self: super: {
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
fourmolu = super.fourmolu_0_9_0_0;
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = doJailbreak (dontCheck super.hiedb);
apply-refact = doDistribute super.apply-refact_0_10_0_0;
# 2022-02-05: The following plugins dont work yet on ghc9.2.
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
haskell-language-server = super.haskell-language-server.override {
@ -232,6 +204,6 @@ self: super: {
(if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
super.inline-c-cpp;
relude = dontCheck self.relude_1_1_0_0;
relude = dontCheck super.relude;
hermes-json = doJailbreak super.hermes-json;
}

View file

@ -58,9 +58,6 @@ in {
# Tests fail because of typechecking changes
conduit = dontCheck super.conduit;
# 0.30 introduced support for GHC 9.2.
cryptonite = doDistribute self.cryptonite_0_30;
doctest = self.doctest_0_20_1;
# consequences of doctest breakage follow:
@ -85,8 +82,6 @@ in {
assoc = doJailbreak super.assoc;
async = doJailbreak super.async;
base64-bytestring = doJailbreak super.base64-bytestring;
base-compat = self.base-compat_0_12_2;
base-compat-batteries = self.base-compat-batteries_0_12_2;
binary-instances = doJailbreak super.binary-instances;
ChasingBottoms = doJailbreak super.ChasingBottoms;
constraints = doJailbreak super.constraints;
@ -99,7 +94,6 @@ in {
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_1_0;
hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);

View file

@ -4687,7 +4687,6 @@ broken-packages:
- skemmtun
- skulk
- skylighting-extensions
- skylighting-format-ansi
- skype4hs
- slack
- slack-api

View file

@ -111,11 +111,6 @@ dont-distribute-packages:
- Forestry
- FormalGrammars
- Foster
- Frames
- Frames-beam
- Frames-dsv
- Frames-map-reduce
- Frames-streamly
- Frank
- GLFW-OGL
- GLFW-task
@ -201,7 +196,6 @@ dont-distribute-packages:
- Hashell
- Hate
- Hawk
- Hayoo
- Hedi
- Hieroglyph
- HiggsSet
@ -281,11 +275,8 @@ dont-distribute-packages:
- NearContextAlgebra
- Ninjas
- NoSlow
- Nomyx
- Nomyx-Core
- Nomyx-Language
- Nomyx-Rules
- Nomyx-Web
- NonEmptyList
- Nussinov78
- OSM
@ -388,7 +379,6 @@ dont-distribute-packages:
- WxGeneric
- XML
- XMPP
- XSaiga
- YACPong
- Yablog
- Yogurt-Standalone
@ -438,7 +428,6 @@ dont-distribute-packages:
- aivika-distributed
- alg
- algebra-checkers
- algebra-driven-design
- algebra-sql
- algebraic
- algolia
@ -453,7 +442,6 @@ dont-distribute-packages:
- alsa-pcm-tests
- alsa-seq-tests
- alto
- amazon-emailer-client-snap
- amazonka
- amazonka-alexa-business
- amazonka-apigateway
@ -597,7 +585,6 @@ dont-distribute-packages:
- amby
- ampersand
- amqp-streamly
- analyze-client
- anatomy
- animate-example
- animate-frames
@ -665,7 +652,6 @@ dont-distribute-packages:
- ast-monad-json
- astview
- aterm-utils
- atlassian-connect-core
- atlassian-connect-descriptor
- atmos-dimensional-tf
- atomic-primops-foreign
@ -685,7 +671,6 @@ dont-distribute-packages:
- avers-api
- avers-api-docs
- avers-server
- aviation-cessna172-diagrams
- aviation-cessna172-weight-balance
- aviation-navigation
- aviation-weight-balance
@ -709,7 +694,6 @@ dont-distribute-packages:
- aws-simple
- aws-sns
- axiom
- azimuth-hs
- azure-functions-worker
- azure-service-api
- azure-servicebus
@ -850,7 +834,6 @@ dont-distribute-packages:
- butterflies
- bytable
- bytelog
- bytepatch
- bytestring-builder-varword
- bytestring-read
- ca
@ -898,7 +881,6 @@ dont-distribute-packages:
- casr-logbook-reports-meta-html
- cassandra-cql
- cassandra-thrift
- cassy
- casui
- categorical-algebra
- category
@ -918,7 +900,6 @@ dont-distribute-packages:
- chainweb-mining-client
- chalkboard-viewer
- chapelure
- charade
- chart-cli
- chart-svg-various
- chart-unit
@ -948,24 +929,9 @@ dont-distribute-packages:
- claferwiki
- clash
- classify-frog
- classy-miso
- clckwrks
- clckwrks-cli
- clckwrks-dot-com
- clckwrks-plugin-bugs
- clckwrks-plugin-ircbot
- clckwrks-plugin-mailinglist
- clckwrks-plugin-media
- clckwrks-plugin-page
- clckwrks-plugin-redirect
- clckwrks-theme-bootstrap
- clckwrks-theme-clckwrks
- clckwrks-theme-geo-bootstrap
- cless
- cleveland
- click-clack
- clifford
- clippings
- clocked
- cloud-haskell
- cloud-seeder
@ -983,7 +949,6 @@ dont-distribute-packages:
- codec
- codec-rpm
- codemonitor
- coformat
- cognimeta-utils
- coinbase-exchange
- colada
@ -1003,13 +968,11 @@ dont-distribute-packages:
- commodities
- commsec-keyexchange
- comonad-random
- compaREST
- compact-mutable
- compactable
- compdata-automata
- compdata-dags
- compdata-param
- compdoc-dhall-decoder
- complexity
- comprehensions-ghc
- compstrat
@ -1099,6 +1062,7 @@ dont-distribute-packages:
- cryptol
- crystalfontz
- cspmchecker
- css-simple
- csv-enumerator
- ctpl
- cube
@ -1123,7 +1087,6 @@ dont-distribute-packages:
- data-elf
- data-layer
- data-lens-fd
- data-lens-ixset
- data-lens-template
- data-object-json
- data-object-yaml
@ -1156,7 +1119,6 @@ dont-distribute-packages:
- ddc-war
- ddci-core
- debug
- decidable
- decimal-arithmetic
- dedukti
- deeplearning-hs
@ -1209,7 +1171,6 @@ dont-distribute-packages:
- diplomacy-server
- direct-rocksdb
- directory-contents
- dirfiles
- discogs-haskell
- discord-gateway
- discord-hs
@ -1239,7 +1200,6 @@ dont-distribute-packages:
- distributed-process-zookeeper
- distributed-static
- distribution-plot
- dixi
- dl-fedora
- dmenu-pkill
- dmenu-pmount
@ -1252,7 +1212,6 @@ dont-distribute-packages:
- dobutokO2
- dobutokO3
- dobutokO4
- doc-review
- domain
- domain-aeson
- domain-cereal
@ -1317,8 +1276,6 @@ dont-distribute-packages:
- engine-io-yesod
- entangle
- enum-text-rio
- enumerate
- enumerate-function
- enumeration
- enumerator-fd
- enumerator-tf
@ -1380,7 +1337,6 @@ dont-distribute-packages:
- fadno
- fair
- fallingblocks
- family-tree
- fast-bech32
- fastcdc
- fastirc
@ -1437,7 +1393,6 @@ dont-distribute-packages:
- fixed-point-vector-space
- fixed-precision
- fixhs
- flashblast
- flatbuffers
- flexiwrap
- flexiwrap-smallcheck
@ -1471,7 +1426,6 @@ dont-distribute-packages:
- fplll
- fpnla-examples
- frame-markdown
- freckle-app
- free-game
- free-theorems-counterexamples
- free-theorems-seq
@ -1501,7 +1455,6 @@ dont-distribute-packages:
- funflow
- funflow-nix
- funion
- funnyprint
- funsat
- fwgl-glfw
- fwgl-javascript
@ -1551,7 +1504,6 @@ dont-distribute-packages:
- ghc-mod
- ghc-session
- ghc-tags-plugin
- ghci-pretty
- ghcjs-dom-webkit
- ghcjs-fetch
- ghcjs-hplay
@ -1815,6 +1767,7 @@ dont-distribute-packages:
- graphicsFormats
- graphicstools
- graphql-client
- graphql-client_1_2_1
- graphtype
- greencard-lib
- gridbounds
@ -1842,6 +1795,7 @@ dont-distribute-packages:
- gtkimageview
- gtkrsync
- guarded-rewriting
- gvti
- hArduino
- hOff-display
- hPDB
@ -1888,7 +1842,6 @@ dont-distribute-packages:
- happs-hsp-template
- happs-tutorial
- happstack-auth
- happstack-authenticate
- happstack-contrib
- happstack-data
- happstack-dlg
@ -1981,24 +1934,34 @@ dont-distribute-packages:
- haskore-realtime
- haskore-supercollider
- haskore-synthesizer
- hasktorch
- hasktorch-ffi-thc
- hasktorch-indef
- hasktorch-signatures
- hasktorch-zoo
- haskus-utils-compat
- haskus-web
- haslo
- hasloGUI
- hasparql-client
- hasql
- hasql-cursor-query
- hasql-dynamic-statements
- hasql-implicits
- hasql-interpolate
- hasql-migration
- hasql-notifications
- hasql-optparse-applicative
- hasql-pipes
- hasql-pool
- hasql-postgres
- hasql-postgres-options
- hasql-queue
- hasql-streams-conduit
- hasql-streams-core
- hasql-streams-pipes
- hasql-streams-streaming
- hasql-streams-streamly
- hasql-th
- hasql-transaction
- hasql-url
- hasqlator-mysql
- hasqly-mysql
- hastache-aeson
@ -2042,7 +2005,6 @@ dont-distribute-packages:
- hedgehog-checkers-lens
- hedgehog-gen-json
- hedis-pile
- heist-aeson
- helic
- helics
- helics-wai
@ -2070,7 +2032,6 @@ dont-distribute-packages:
- hfractal
- hgalib
- hgen
- hgeometry-svg
- hgithub
- hiccup
- hie-core
@ -2104,7 +2065,6 @@ dont-distribute-packages:
- hls
- hly
- hmark
- hmatrix-backprop
- hmeap
- hmeap-utils
- hmep
@ -2112,6 +2072,7 @@ dont-distribute-packages:
- hmt-diagrams
- hnormalise
- ho-rewriting
- hoauth2-demo
- hoauth2-providers-tutorial
- hob
- hogre
@ -2130,6 +2091,7 @@ dont-distribute-packages:
- hoodle-render
- hoovie
- hoppy-docs
- horizon-gen-nix
- hotswap
- hout
- hp2any-graph
@ -2284,7 +2246,6 @@ dont-distribute-packages:
- indentation-parsec
- indentation-trifecta
- indexation
- indigo
- infernu
- infinity
- inline-java
@ -2305,7 +2266,6 @@ dont-distribute-packages:
- ipatch
- ipc
- ipld-cid
- ipprint
- iptadmin
- irc-fun-bot
- irc-fun-client
@ -2334,11 +2294,9 @@ dont-distribute-packages:
- ivory-quickcheck
- ivory-serialize
- ivory-stdlib
- ivy-web
- ix
- iyql
- j2hs
- jacinda
- jail
- java-bridge-extras
- java-character
@ -2425,12 +2383,9 @@ dont-distribute-packages:
- ks-test
- kubernetes-client
- kure-your-boilerplate
- kurita
- kvitable
- laborantin-hs
- labsat
- labyrinth
- labyrinth-server
- laika
- lambda-devs
- lambda-options
@ -2446,7 +2401,6 @@ dont-distribute-packages:
- lambdacube-examples
- lambdacube-gl
- lambdacube-samples
- lambdatwit
- lambdaya-bus
- lambdiff
- lang
@ -2500,7 +2454,6 @@ dont-distribute-packages:
- liblawless
- liblinear-enumerator
- libmolude
- libraft
- librato
- libxml-enumerator
- lifted-base-tf
@ -2531,7 +2484,6 @@ dont-distribute-packages:
- list-t-attoparsec
- list-t-html-parser
- list-tuple
- list-witnesses
- listenbrainz-client
- live-sequencer
- llvm
@ -2561,7 +2513,6 @@ dont-distribute-packages:
- log4hs
- logging-effect-extra
- logging-facade-journald
- logic-classes
- lojban
- lojysamban
- lol-apps
@ -2573,14 +2524,12 @@ dont-distribute-packages:
- loli
- loop-effin
- looper
- lorentz
- lostcities
- loup
- lp-diagrams-svg
- lrucaching-haxl
- ls-usb
- lsystem
- ltext
- luachunk
- lucid-colonnade
- lucid2-htmx
@ -2668,7 +2617,6 @@ dont-distribute-packages:
- minecraft-data
- minesweeper
- mini-egison
- minilight-lua
- minimung
- minioperational
- minirotate
@ -2710,11 +2658,7 @@ dont-distribute-packages:
- monte-carlo
- moo
- moo-nad
- moonshine
- morley
- morley-client
- morley-prelude
- morley-upgradeable
- morphisms-functors-inventory
- mortred
- motor-diagrams
@ -2726,9 +2670,6 @@ dont-distribute-packages:
- mpretty
- mprover
- mps
- mptcp
- mptcp-pm
- mptcpanalyzer
- msgpack-aeson
- msgpack-idl
- msgpack-rpc
@ -2767,7 +2708,6 @@ dont-distribute-packages:
- music-score
- music-sibelius
- music-suite
- musicbrainz-email
- musicxml2
- mutable-iter
- mute-unmute
@ -2778,7 +2718,6 @@ dont-distribute-packages:
- mxnet-examples
- mxnet-nn
- myTestlll
- mysnapsession-example
- mysql-haskell
- mysql-haskell-nem
- mysql-haskell-openssl
@ -2828,12 +2767,8 @@ dont-distribute-packages:
- nix-thunk
- nkjp
- nlp-scores-scripts
- nomyx-api
- nomyx-core
- nomyx-language
- nomyx-library
- nomyx-server
- nonlinear-optimization-backprop
- notmuch-haskell
- notmuch-web
- now-haskell
@ -2868,10 +2803,8 @@ dont-distribute-packages:
- off-simple
- ohloh-hs
- ois-input-manager
- olwrapper
- om-kubernetes
- om-legion
- online
- online-csv
- opc-xml-da-client
- open-adt-tutorial
@ -2893,7 +2826,6 @@ dont-distribute-packages:
- orgmode-parse
- orgstat
- osm-download
- otp-authenticator
- overload
- package-o-tron
- padKONTROL
@ -2948,12 +2880,13 @@ dont-distribute-packages:
- persistent-audit
- persistent-hssqlppp
- persistent-map
- persistent-mtl_0_5_0_0
- persistent-mtl
- persistent-mysql-haskell
- persistent-relational-record
- persona-idp
- peyotls
- peyotls-codec
- pg-client
- pg-entity
- pgsql-simple
- phonetic-languages-common
@ -2986,7 +2919,6 @@ dont-distribute-packages:
- pipes-files
- pipes-fluid
- pipes-illumina
- pipes-key-value-csv
- pipes-misc
- pipes-network-tls
- pipes-p2p
@ -2994,8 +2926,6 @@ dont-distribute-packages:
- pisigma
- pitchtrack
- pkgtreediff
- pkgtreediff_0_6_0
- planet-mitchell
- playlists-http
- plocketed
- plugins-auto
@ -3014,9 +2944,6 @@ dont-distribute-packages:
- pomodoro
- pontarius-mediaserver
- popenhs
- porcupine-core
- porcupine-http
- porcupine-s3
- portray-diff-hunit
- portray-diff-quickcheck
- ports
@ -3026,6 +2953,7 @@ dont-distribute-packages:
- postgresql-simple-ltree
- postgresql-simple-queue
- postgresql-simple-typed
- postgresql-syntax
- postgresql-tx-query
- postgresql-tx-squeal-compat-simple
- postmark
@ -3058,7 +2986,6 @@ dont-distribute-packages:
- product
- prof2dot
- progressbar
- project-forge
- project-m36
- prolog-graph
- prolog-graph-lib
@ -3067,13 +2994,13 @@ dont-distribute-packages:
- prometheus-effect
- propane
- proplang
- prosidyc
- proto-lens-descriptors
- proto3-suite
- proto3-wire
- protobuf-native
- protocol-buffers-descriptor-fork
- proton
- prune-juice
- psql
- ptera
- ptera-core
@ -3085,7 +3012,6 @@ dont-distribute-packages:
- puppetresources
- pure-cdb
- pure-priority-queue-tests
- purescript-iso
- pursuit-client
- push-notify
- push-notify-apn
@ -3108,11 +3034,9 @@ dont-distribute-packages:
- queue-sheet
- queuelike
- quickbooks
- quickcheck-combinators
- quickcheck-poly
- quickcheck-regex
- quickcheck-relaxng
- quickcheck-state-machine
- quickcheck-state-machine-distributed
- quickcheck-webdriver
- quicktest
@ -3201,7 +3125,6 @@ dont-distribute-packages:
- reflex-monad-auth
- reflex-process
- refractor
- refurb
- reg-alloc-graph-color
- regex-deriv
- regex-genex
@ -3223,6 +3146,7 @@ dont-distribute-packages:
- regular-web
- regular-xmlpickler
- reheat
- rel8
- relational-postgresql8
- relational-query
- relational-query-HDBC
@ -3256,7 +3180,6 @@ dont-distribute-packages:
- rest-stringmap
- rest-types
- rest-wai
- restful-snap
- restricted-workers
- rethinkdb-model
- rewrite
@ -3355,7 +3278,6 @@ dont-distribute-packages:
- scan-vector-machine
- schedevr
- scheduling
- schematic
- scholdoc
- scholdoc-citeproc
- scholdoc-texmath
@ -3388,16 +3310,11 @@ dont-distribute-packages:
- seqloc
- seqloc-datafiles
- sequor
- serpentine
- serv
- serv-wai
- servant-auth-token
- servant-auth-token-acid
- servant-auth-token-api
- servant-auth-token-leveldb
- servant-auth-token-persistent
- servant-auth-token-rocksdb
- servant-cli
- servant-client-namedargs
- servant-csharp
- servant-db-postgresql
@ -3416,7 +3333,6 @@ dont-distribute-packages:
- servant-rate-limit
- servant-reason
- servant-server-namedargs
- servant-snap
- servant-streaming-client
- servant-streaming-docs
- servant-streaming-server
@ -3436,12 +3352,10 @@ dont-distribute-packages:
- shake-ats
- shake-bindist
- shake-minify-css
- shakebook
- shaker
- shapefile
- shapely-data
- shapes-demo
- sheets
- shelduck
- shellmate-extras
- shine-varying
@ -3462,6 +3376,7 @@ dont-distribute-packages:
- simple-log-syslog
- simple-logging
- simple-nix
- simple-parser
- simple-pascal
- simple-postgresql-orm
- simple-session
@ -3475,7 +3390,6 @@ dont-distribute-packages:
- skeletons
- sketch-frp-copilot
- skylark-client
- skylighting_0_13_1_1
- slate
- slidemews
- slip32
@ -3492,32 +3406,7 @@ dont-distribute-packages:
- smtlib2-quickcheck
- smtlib2-timing
- smtp2mta
- snap-auth-cli
- snap-elm
- snap-extras
- snap-utils
- snaplet-actionlog
- snaplet-auth-acid
- snaplet-coffee
- snaplet-customauth
- snaplet-fay
- snaplet-hasql
- snaplet-haxl
- snaplet-hdbc
- snaplet-lss
- snaplet-mongoDB
- snaplet-mysql-simple
- snaplet-oauth
- snaplet-postmark
- snaplet-recaptcha
- snaplet-redson
- snaplet-rest
- snaplet-riak
- snaplet-sedna
- snaplet-sqlite-simple-jwt-auth
- snaplet-stripe
- snaplet-tasks
- snaplet-wordpress
- snappy-iteratee
- sndfile-enumerators
- sneakyterm
@ -3539,7 +3428,6 @@ dont-distribute-packages:
- source-code-server
- spade
- sparkle
- sparrow
- sparsebit
- sparser
- spata
@ -3576,7 +3464,6 @@ dont-distribute-packages:
- stackage-setup
- stackage-upload
- stackage2nix
- stackctl
- stan
- starrover2
- stateful-mtl
@ -3608,12 +3495,10 @@ dont-distribute-packages:
- stutter
- stylist
- stylist-traits
- subhask
- substring-parser
- sugar-data
- sugar-json
- sugar-scheme
- summoner-tui
- sump
- sunroof-examples
- sunroof-server
@ -3712,7 +3597,9 @@ dont-distribute-packages:
- test-sandbox-compose
- test-simple
- testbench
- text-builder-dev_0_3_3
- text-ansi
- text-builder
- text-builder-dev
- text-json-qq
- text-locale-encoding
- text-plus
@ -3721,7 +3608,6 @@ dont-distribute-packages:
- th-alpha
- th-context
- th-instances
- th-typegraph
- theatre
- theoremquest-client
- thimk
@ -3763,7 +3649,6 @@ dont-distribute-packages:
- tonatona-persistent-sqlite
- tonatona-servant
- too-many-cells
- top
- topaz
- topkata
- total-map
@ -3834,7 +3719,6 @@ dont-distribute-packages:
- typed-encoding-encoding
- typed-streams
- typelevel
- typelevel-rewrite-rules
- typescript-docs
- typson-beam
- typson-esqueleto
@ -3850,7 +3734,6 @@ dont-distribute-packages:
- unagi-bloomfilter
- unbeliever
- unbound
- unfoldable-restricted
- uni-events
- uni-graphs
- uni-htk
@ -3916,15 +3799,11 @@ dont-distribute-packages:
- vector-text
- venzone
- verdict-json
- verifiable-expressions
- vessel
- vflow-types
- vfr-waypoints
- vigilance
- vimeta
- vinyl-operational
- vision
- visual-graphrewrite
- vocoder
- vocoder-audio
- vocoder-conduit
@ -3958,10 +3837,8 @@ dont-distribute-packages:
- web-page
- web-routes-regular
- web-routing
- web3
- web3-bignum
- web3-crypto
- web3-ethereum
- web3-polkadot
- web3-provider
- web3-solidity
@ -4017,6 +3894,7 @@ dont-distribute-packages:
- xml-enumerator-combinators
- xml-isogen
- xml-monad
- xml-parser
- xml-pipe
- xml-push
- xml-query-xml-conduit
@ -4044,11 +3922,9 @@ dont-distribute-packages:
- yam-transaction-postgresql
- yam-web
- yaml-rpc-scotty
- yaml-rpc-snap
- yarr-image-io
- yavie
- ycextra
- yeamer
- yeshql
- yesod-articles
- yesod-auth-ldap

View file

@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super {
}) super.procex;
# Test suite wants to run main executable
fourmolu_0_9_0_0 = overrideCabal (drv: {
fourmolu = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_9_0_0;
}) super.fourmolu;
# Test suite needs to execute 'disco' binary
disco = overrideCabal (drv: {

File diff suppressed because it is too large Load diff