nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 22:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155548 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2022-01-24 19:39:15 +08:00 committed by GitHub
commit d6e2f44abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 608 additions and 947 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz",
"sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27",
"msg": "Update from Hackage at 2022-01-14T12:47:41Z"
"commit": "6f406277d7106375f7148466c985061d20cb028b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6f406277d7106375f7148466c985061d20cb028b.tar.gz",
"sha256": "0jvxybgv975lmk268x12dlp8xxv12vmpwc00k3nv6qqp0xd9bwla",
"msg": "Update from Hackage at 2022-01-18T22:54:05Z"
}

26
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -182,7 +182,7 @@ self: super: {
digit = doJailbreak super.digit;
# hnix.patch needed until the next release is bumped
hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"
hnix = generateOptparseApplicativeCompletion "hnix"
(overrideCabal (drv: {
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
doCheck = false;
@ -190,7 +190,7 @@ self: super: {
# needs newer version of relude and semialign than stackage has
relude = self.relude_1_0_0_1;
semialign = self.semialign_1_2_0_1;
})));
}));
# Fails for non-obvious reasons while attempting to use doctest.
focuslist = dontCheck super.focuslist;
@ -1110,14 +1110,16 @@ self: super: {
# https://github.com/elliottt/hsopenid/issues/15
openid = markBroken super.openid;
# The test suite needs the packages's executables in $PATH to succeed.
arbtt = overrideCabal (drv: {
# Version constraints on test dependency tasty-golden need to be relaxed:
# https://github.com/nomeata/arbtt/pull/146
arbtt = doJailbreak (overrideCabal (drv: {
# The test suite needs the packages's executables in $PATH to succeed.
preCheck = ''
for i in $PWD/dist/build/*; do
export PATH="$i:$PATH"
done
'';
}) super.arbtt;
}) super.arbtt);
# https://github.com/erikd/hjsmin/issues/32
hjsmin = dontCheck super.hjsmin;
@ -1745,6 +1747,8 @@ self: super: {
# Too strict version bounds on ghc-events
# https://github.com/haskell/ThreadScope/issues/118
threadscope = doJailbreak super.threadscope;
# https://github.com/mpickering/hs-speedscope/issues/16
hs-speedscope = doJailbreak super.hs-speedscope;
# Too strict version bounds on tasty
# Can likely be removed next week (2021-04-09) when 1.1.1.1 is released.
@ -2100,7 +2104,7 @@ self: super: {
# Needs brick > 0.64
nix-tree = super.nix-tree.override {
brick = self.brick_0_65;
brick = self.brick_0_66;
};
# build newer version for `pkgs.shellcheck`
@ -2220,6 +2224,16 @@ self: super: {
# Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
memory-cd = dontCheck super.memory-cd;
# raaz-0.3 onwards uses backpack and it does not play nicely with
# parallel builds using -j
#
# See: https://gitlab.haskell.org/ghc/ghc/-/issues/17188
#
# Overwrite the build cores
raaz = overrideCabal (drv: {
enableParallelBuilding = false;
}) super.raaz;
# https://github.com/andreymulik/sdp/issues/3
sdp = disableLibraryProfiling super.sdp;
sdp-binary = disableLibraryProfiling super.sdp-binary;

6
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -354,6 +354,7 @@ broken-packages:
- binary-derive
- binary-ext
- binary-indexed-tree
- binary-io
- binary-protocol
- binary-typed
- BinderAnn
@ -755,6 +756,7 @@ broken-packages:
- compact-socket
- compact-string
- compact-string-fix
- comparse
- compdata-dags
- compdata-param
- competition
@ -1308,7 +1310,6 @@ broken-packages:
- event-driven
- eventful-dynamodb
- eventful-sql-common
- eventlog2html
- eventloop
- eventstore
- ewe
@ -2404,7 +2405,6 @@ broken-packages:
- hsseccomp
- hssh
- hs-snowtify
- hs-speedscope
- hsSqlite3
- hssqlppp
- HsSVN
@ -3855,6 +3855,7 @@ broken-packages:
- powerdns
- powermate
- powerpc
- powerqueue-distributed
- powerqueue-levelmem
- pprecord
- PPrinter
@ -4013,7 +4014,6 @@ broken-packages:
- quiver
- quokka
- quoridor-hs
- raaz
- RabbitMQ
- rad
- radian

4
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -133,6 +133,9 @@ default-package-overrides:
# Pinning patch because it is mainly used by the reflex-frp ecosystem which is not yet compatible with it.
# https://github.com/reflex-frp/reflex-dom/issues/431
- patch < 0.0.5.0
# On the recommendation of hnix author:
# https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883
- hnix < 0.15
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -446,6 +449,7 @@ unsupported-platforms:
FTGL: [ x86_64-darwin, aarch64-darwin ]
fuzzytime: [ x86_64-darwin, aarch64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin, aarch64-darwin ]
gi-adwaita: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenu: [ x86_64-darwin, aarch64-darwin ]
gi-ggit: [ x86_64-darwin, aarch64-darwin ]

84
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View File

@ -1,4 +1,4 @@
# Stackage LTS 18.21
# Stackage LTS 18.22
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -164,14 +164,14 @@ default-package-overrides:
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
- ascii ==1.0.1.6
- ascii-case ==1.0.0.8
- ascii-char ==1.0.0.12
- ascii-case ==1.0.0.10
- ascii-char ==1.0.0.14
- asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.8
- ascii-predicates ==1.0.0.6
- ascii-group ==1.0.0.10
- ascii-predicates ==1.0.0.8
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.8
- ascii-th ==1.0.0.6
- ascii-superset ==1.0.1.10
- ascii-th ==1.0.0.8
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
- asn1-types ==0.3.4
@ -206,7 +206,7 @@ default-package-overrides:
- backprop ==0.2.6.4
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.6
- barbies ==2.0.3.0
- barbies ==2.0.3.1
- base16 ==0.3.1.0
- base16-bytestring ==1.0.2.0
- base16-lens ==0.1.3.2
@ -229,7 +229,7 @@ default-package-overrides:
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
- bcp47 ==0.2.0.4
- bcp47 ==0.2.0.5
- bcp47-orphans ==0.1.0.4
- bcrypt ==0.0.11
- bech32 ==1.1.2
@ -249,7 +249,7 @@ default-package-overrides:
- binary-instances ==1.0.2
- binary-list ==1.1.1.2
- binary-orphans ==1.0.1
- binary-parser ==0.5.7
- binary-parser ==0.5.7.1
- binary-parsers ==0.2.4.0
- binary-search ==2.0.0
- binary-shared ==0.8.3
@ -295,13 +295,13 @@ default-package-overrides:
- bower-json ==1.0.0.1
- boxes ==0.1.5
- brick ==0.62
- broadcast-chan ==0.2.1.1
- broadcast-chan ==0.2.1.2
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
- btrfs ==0.2.0.0
- buffer-builder ==0.2.4.7
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.2
- bugsnag-haskell ==0.0.4.3
- bugsnag-hs ==0.2.0.8
- bugzilla-redhat ==0.3.3
- burrito ==1.2.0.4
@ -426,8 +426,8 @@ default-package-overrides:
- comfort-array ==0.4.1
- comfort-graph ==0.0.3.1
- commonmark ==0.2.1.1
- commonmark-extensions ==0.2.2.1
- commonmark-pandoc ==0.2.1.1
- commonmark-extensions ==0.2.3
- commonmark-pandoc ==0.2.1.2
- commutative ==0.0.2
- comonad ==5.0.8
- comonad-extras ==4.0.1
@ -579,7 +579,7 @@ default-package-overrides:
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.17
- deferred-folds ==0.9.18
- dejafu ==2.4.0.3
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
@ -790,7 +790,7 @@ default-package-overrides:
- fmt ==0.6.3.0
- fn ==0.3.0.2
- focus ==1.0.3
- focuslist ==0.1.0.2
- focuslist ==0.1.1.0
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
- fold-debounce-conduit ==0.2.0.6
@ -809,7 +809,7 @@ default-package-overrides:
- free ==5.1.7
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.1
- freer-simple ==1.2.1.2
- freetype2 ==0.2.0
- free-vl ==0.1.4
- friendly-time ==0.4.1
@ -924,7 +924,7 @@ default-package-overrides:
- gingersnap ==0.3.1.0
- gi-pango ==1.0.24
- githash ==0.1.6.2
- github-release ==1.3.8
- github-release ==1.3.10
- github-rest ==1.0.3
- github-types ==0.2.1
- github-webhooks ==0.15.0
@ -1004,10 +1004,10 @@ default-package-overrides:
- hasktags ==0.72.0
- hasql ==1.4.5.3
- hasql-notifications ==0.2.0.0
- hasql-optparse-applicative ==0.3.0.6
- hasql-pool ==0.5.2
- hasql-optparse-applicative ==0.3.0.7
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-transaction ==1.0.1
- hasql-transaction ==1.0.1.1
- hasty-hamiltonian ==1.3.4
- HaTeX ==3.22.3.0
- HaXml ==1.25.8
@ -1118,7 +1118,7 @@ default-package-overrides:
- hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.4
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-expectations-pretty-diff ==0.7.2.6
- hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
@ -1134,7 +1134,7 @@ default-package-overrides:
- hspec-wai-json ==0.11.0
- hs-php-session ==0.0.9.3
- hsshellscript ==3.5.0
- hs-tags ==0.1.5.2
- hs-tags ==0.1.5.3
- HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.25
- HsYAML ==0.2.1.0
@ -1266,17 +1266,17 @@ default-package-overrides:
- io-storage ==0.3
- io-streams ==1.5.2.1
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2
- ip6addr ==1.0.3
- ipa ==0.3.1.1
- iproute ==1.7.12
- IPv6Addr ==2.0.3
- IPv6Addr ==2.0.4
- ipynb ==0.1.0.2
- ipython-kernel ==0.10.2.2
- irc ==0.6.1.0
- irc-client ==1.1.2.2
- irc-conduit ==0.3.0.5
- irc-ctcp ==0.1.3.1
- isbn ==1.1.0.2
- isbn ==1.1.0.3
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
@ -1412,7 +1412,7 @@ default-package-overrides:
- llvm-hs-pure ==9.0.0
- lmdb ==0.2.5
- load-env ==0.2.1.0
- loc ==0.1.3.10
- loc ==0.1.3.16
- locators ==0.3.0.3
- loch-th ==0.2.2
- lockfree-queue ==0.2.3.1
@ -1536,7 +1536,7 @@ default-package-overrides:
- monad-logger-logstash ==0.1.0.0
- monad-logger-prefix ==0.1.12
- monad-loops ==0.4.3
- monad-memo ==0.5.3
- monad-memo ==0.5.4
- monad-metrics ==0.2.2.0
- monad-par ==0.3.5
- monad-parallel ==0.7.2.5
@ -1599,7 +1599,7 @@ default-package-overrides:
- natural-sort ==0.1.2
- natural-transformation ==0.4
- ndjson-conduit ==0.1.0.5
- neat-interpolation ==0.5.1.2
- neat-interpolation ==0.5.1.3
- netcode-io ==0.0.3
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.2
@ -1726,7 +1726,7 @@ default-package-overrides:
- parsers ==0.12.10
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.12
- partial-semigroup ==0.5.1.14
- password ==3.0.0.0
- password-instances ==3.0.0.0
- password-types ==1.0.0.0
@ -1858,7 +1858,7 @@ default-package-overrides:
- profunctors ==5.6.2
- projectroot ==0.2.0.1
- project-template ==0.2.1.0
- prometheus ==2.2.2
- prometheus ==2.2.3
- prometheus-client ==1.0.1
- prometheus-metrics-ghc ==1.0.1.2
- prometheus-wai-middleware ==1.0.1.0
@ -1953,7 +1953,7 @@ default-package-overrides:
- reducers ==3.12.4
- refact ==0.3.0.2
- ref-fd ==0.5
- refined ==0.6.2
- refined ==0.6.3
- reflection ==2.1.6
- reform ==0.2.7.4
- reform-blaze ==0.2.4.3
@ -2071,7 +2071,7 @@ default-package-overrides:
- semialign-indexed ==1.1
- semialign-optics ==1.1
- semigroupoid-extras ==5
- semigroupoids ==5.3.6
- semigroupoids ==5.3.7
- semigroups ==0.19.2
- semirings ==0.6
- semiring-simple ==1.0.0.1
@ -2267,7 +2267,7 @@ default-package-overrides:
- string-random ==0.1.4.1
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- stripe-concepts ==1.0.3
- stripe-concepts ==1.0.3.1
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
@ -2320,7 +2320,7 @@ default-package-overrides:
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1
- tasty-golden ==2.3.4
- tasty-golden ==2.3.5
- tasty-hedgehog ==1.1.0.0
- tasty-hspec ==1.1.6
- tasty-hunit ==0.10.0.3
@ -2389,9 +2389,9 @@ default-package-overrides:
- these ==1.1.1.1
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
- these-skinny ==0.7.4
- these-skinny ==0.7.5
- th-expand-syns ==0.4.8.0
- th-extras ==0.0.0.5
- th-extras ==0.0.0.6
- th-lift ==0.8.2
- th-lift-instances ==0.1.19
- th-nowq ==0.1.0.5
@ -2475,7 +2475,7 @@ default-package-overrides:
- type-level-natural-number ==2.0
- type-level-numbers ==0.1.1.1
- typelits-witnesses ==0.4.0.0
- type-map ==0.1.6.0
- type-map ==0.1.7.0
- type-natural ==1.1.0.1
- typenums ==0.1.4
- type-of-html ==1.6.2.0
@ -2520,7 +2520,7 @@ default-package-overrides:
- universe-some ==1.2.1
- universum ==1.7.2
- unix-bytestring ==0.3.7.6
- unix-compat ==0.5.3
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.20
- unliftio-core ==0.2.0.1
@ -2590,7 +2590,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0
- wai-extra ==3.1.7
- wai-extra ==3.1.8
- wai-feature-flags ==0.1.0.3
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.7
@ -2636,7 +2636,7 @@ default-package-overrides:
- wizards ==1.0.3
- wl-pprint-annotated ==0.1.0.1
- wl-pprint-console ==0.1.0.2
- wl-pprint-text ==1.2.0.1
- wl-pprint-text ==1.2.0.2
- word24 ==2.0.1
- word8 ==0.1.3
- wordpress-auth ==1.0.0.1
@ -2668,7 +2668,7 @@ default-package-overrides:
- xml-conduit ==1.9.1.1
- xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.2
- xml-hamlet ==0.5.0.1
- xml-hamlet ==0.5.0.2
- xml-helpers ==1.0.0
- xml-html-qq ==0.1.0.1
- xml-indexed-cursor ==0.1.1.0

10
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -965,6 +965,8 @@ dont-distribute-packages:
- diplomacy
- diplomacy-server
- dirfiles
- dirtree
- disco
- discogs-haskell
- discord-gateway
- discord-hs
@ -1625,6 +1627,7 @@ dont-distribute-packages:
- hreq-conduit
- hs-blake2
- hs-brotli
- hs-duktape
- hs-ffmpeg
- hs-gen-iface
- hs-pkpass
@ -1658,7 +1661,7 @@ dont-distribute-packages:
- hsfacter
- hslogstash
- hspec-expectations-pretty
- hspec-expectations-pretty-diff_0_7_2_6
- hspec-expectations-pretty-diff
- hspec-pg-transact
- hspec-setup
- hspec-shouldbe
@ -2305,7 +2308,7 @@ dont-distribute-packages:
- pairing
- panda
- pandoc-japanese-filters
- pandoc_2_17
- pandoc_2_17_0_1
- papa
- papa-base
- papa-base-implement
@ -2461,6 +2464,7 @@ dont-distribute-packages:
- puppetresources
- pure-cdb
- pure-priority-queue-tests
- purescript-bridge
- purescript-iso
- push-notify
- push-notify-apn
@ -2746,6 +2750,7 @@ dont-distribute-packages:
- servant-streaming-client
- servant-streaming-docs
- servant-streaming-server
- servant-subscriber
- servant-swagger-tags
- servant-waargonaut
- servant-zeppelin-client
@ -3058,6 +3063,7 @@ dont-distribute-packages:
- trek-db
- triangulation
- tries
- trimdent
- trimpolya
- truelevel
- trurl

1389
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/haskell-modules/lib.nix → pkgs/development/haskell-modules/lib/default.nix
View File

@ -9,7 +9,7 @@ rec {
between the function name and argument of another. haskell.lib.compose is
preferred for any new code.
*/
compose = import ./lib/compose.nix { inherit pkgs lib; };
compose = import ./compose.nix { inherit pkgs lib; };
/* This function takes a file like `hackage-packages.nix` and constructs
a full package set out of that.

24
pkgs/development/haskell-modules/patches/hnix.patch
View File

@ -1,24 +0,0 @@
From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001
From: Anton Latukha <anton.latukha@gmail.com>
Date: Sun, 16 Jan 2022 18:16:50 +0200
Subject: [PATCH] fix aeson <2 support
---
src/Nix/Json.hs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs
index 3fe05269..329899e4 100644
--- a/src/Nix/Json.hs
+++ b/src/Nix/Json.hs
@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.Key as AKM
import qualified Data.Aeson.KeyMap as AKM
+#else
+import Nix.Expr.Types
#endif
import qualified Data.Vector as V
import Nix.Atoms
--
2.34.1

2
pkgs/top-level/haskell-packages.nix
View File

@ -19,7 +19,7 @@ let
"ghcHEAD"
];
haskellLibUncomposable = import ../development/haskell-modules/lib.nix {
haskellLibUncomposable = import ../development/haskell-modules/lib {
inherit (pkgs) lib;
inherit pkgs;
};