gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #207604 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
maralorn
2022-12-28 17:45:15 +01:00
committed by GitHub
parent fab9a5b367 2383a233a8
commit 4422059266
10 changed files with 1068 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "d2f407d64c568ff572505378248cd834f808f6e0",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d2f407d64c568ff572505378248cd834f808f6e0.tar.gz",
"sha256": "0agbmi2gjrg5gnp8dy76770lyh3ny42clm55wlr529320wnc14wm",
"msg": "Update from Hackage at 2022-12-18T22:10:13Z"
"commit": "b88b3496b1b3beb0c706db8a39c0da3396d96f0b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b88b3496b1b3beb0c706db8a39c0da3396d96f0b.tar.gz",
"sha256": "0gs807cbyi6zyk9bvg5d3wx16575pmgv4j3m8hbz57aa5i71r0nv",
"msg": "Update from Hackage at 2022-12-24T13:11:25Z"
}
pkgs/development/haskell-modules/configuration-common.nix
+8 -7
View File
@@ -744,9 +744,9 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_10_7;
hspec = self.hspec_2_10_8;
hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_7;
hspec = self.hspec_2_10_8;
};
});
@@ -1440,14 +1440,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_7 = doDistribute (super.hspec_2_10_7.override {
hspec-discover = self.hspec-discover_2_10_7;
hspec-core = self.hspec-core_2_10_7;
hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override {
hspec-discover = self.hspec-discover_2_10_8;
hspec-core = self.hspec-core_2_10_8;
});
hspec-discover_2_10_7 = super.hspec-discover_2_10_7.override {
hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override {
hspec-meta = self.hspec-meta_2_10_5;
};
hspec-core_2_10_7 = super.hspec-core_2_10_7.override {
hspec-core_2_10_8 = super.hspec-core_2_10_8.override {
hspec-meta = self.hspec-meta_2_10_5;
};
@@ -2214,6 +2214,7 @@ self: super: {
# Too strict upper bound on th-desugar, fixed in 3.1.1
singletons-th = assert super.singletons-th.version == "3.1"; doJailbreak super.singletons-th;
singletons-base = doJailbreak super.singletons-base;
# Ships a broken Setup.hs
# https://github.com/lehins/conduit-aeson/issues/1
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+3
View File
@@ -176,4 +176,7 @@ self: super: {
# Later versions only support GHC >= 9.2
ghc-exactprint = self.ghc-exactprint_0_6_4;
apply-refact = self.apply-refact_0_9_3_0;
# Needs OneTuple for ghc < 9.2
binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
}
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+3
View File
@@ -205,6 +205,9 @@ self: super: {
# https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
megaparsec = doJailbreak super.megaparsec;
# Needs OneTuple for ghc < 9.2
binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
# Later versions only support GHC >= 9.2
ghc-exactprint = self.ghc-exactprint_0_6_4;
apply-refact = self.apply-refact_0_9_3_0;
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+3
View File
@@ -178,4 +178,7 @@ self: super: {
# Later versions only support GHC >= 9.2
ghc-exactprint = self.ghc-exactprint_0_6_4;
apply-refact = self.apply-refact_0_9_3_0;
# Needs OneTuple for ghc < 9.2
binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
}
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+3 -3
View File
@@ -112,10 +112,10 @@ in {
# Note: Any compilation fixes need to be done on the versioned attributes,
# since those are used for the internal dependencies between the versioned
# hspec packages in configuration-common.nix.
hspec = self.hspec_2_10_7;
hspec-core = self.hspec-core_2_10_7;
hspec = self.hspec_2_10_8;
hspec-core = self.hspec-core_2_10_8;
hspec-meta = self.hspec-meta_2_10_5;
hspec-discover = self.hspec-discover_2_10_7;
hspec-discover = self.hspec-discover_2_10_8;
# the dontHaddock is due to a GHC panic. might be this bug, not sure.
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+8 -1
View File
@@ -633,6 +633,7 @@ broken-packages:
- CC-delcont-ref-tf
- cci
- ccnx
- cdp
- c-dsl
- cedict
- cef
@@ -1099,6 +1100,7 @@ broken-packages:
- derive-lifted-instances
- derive-monoid
- derive-trie
- deriving-openapi3
- derp-lib
- describe
- descriptive
@@ -1317,6 +1319,7 @@ broken-packages:
- ekg-rrd
- ekg-statsd
- elevator
- eliminators
- elision
- elm-export-persistent
- elm-street
@@ -1575,6 +1578,7 @@ broken-packages:
- forml
- formura
- Fortnite-Hack-Cheats-Free-V-Bucks-Generator
- fortran-src-extras
- foscam-filename
- fpe
- FPretty
@@ -2212,6 +2216,7 @@ broken-packages:
- heterogeneous-list-literals
- hetris
- heukarya
- hevm
- HExcel
- hexchat
- hexif
@@ -3274,6 +3279,7 @@ broken-packages:
- medium-sdk-haskell
- meep
- megalisp
- melf
- mellon-core
- melody
- membrain
@@ -4783,7 +4789,6 @@ broken-packages:
- simplistic-generics
- singlethongs
- singleton-dict
- singletons-base
- singleton-typelits
- single-tuple
- singnal
@@ -5501,6 +5506,7 @@ broken-packages:
- ui-command
- unamb-custom
- unbeliever
- unbounded-delays-units
- unboxed
- unboxed-containers
- unboxed-references
@@ -5521,6 +5527,7 @@ broken-packages:
- uniqueness-periods-general
- uniqueness-periods-vector
- uniqueness-periods-vector-common
- units-attoparsec
- unittyped
- unitym-yesod
- uni-util
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+2
View File
@@ -86,6 +86,8 @@ default-package-overrides:
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
# reflex-dom-core 0.7.0.2 has no reflex 0.9 compatible release and most likely most people will want to use them together
- reflex < 0.9.0.0
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+9 -14
View File
@@ -1331,8 +1331,6 @@ dont-distribute-packages:
- elasticsearch-interchange
- electrs-client
- elerea-examples
- eliminators
- eliminators_0_9_1
- elliptic-curve
- elsa
- emacs-keys
@@ -1363,11 +1361,15 @@ dont-distribute-packages:
- essence-of-live-coding-PortMidi
- essence-of-live-coding-gloss
- essence-of-live-coding-gloss-example
- essence-of-live-coding-gloss_0_2_7
- essence-of-live-coding-pulse
- essence-of-live-coding-pulse-example
- essence-of-live-coding-pulse_0_2_7
- essence-of-live-coding-quickcheck
- essence-of-live-coding-quickcheck_0_2_7
- essence-of-live-coding-vivid
- essence-of-live-coding-warp
- essence-of-live-coding-warp_0_2_7
- estimators
- estreps
- eternity
@@ -1392,6 +1394,9 @@ dont-distribute-packages:
- eventsource-geteventstore-store
- eventsource-store-specs
- eventsource-stub-store
- eventuo11y
- eventuo11y-batteries
- eventuo11y-json
- every-bit-counts
- ewe
- exference
@@ -1490,6 +1495,7 @@ dont-distribute-packages:
- fmt-for-rio
- foldable1
- follower
- fontconfig-pure
- foo
- format
- format-status
@@ -1497,8 +1503,6 @@ dont-distribute-packages:
- formlets-hsp
- forsyde-deep
- forth-hll
- fortran-src
- fortran-src-extras
- fortran-vars
- foscam-directory
- foscam-sort
@@ -2118,7 +2122,6 @@ dont-distribute-packages:
- hesh
- hesql
- heterolist
- hevm
- hevolisa
- hevolisa-dph
- hexpat-conduit
@@ -2739,7 +2742,6 @@ dont-distribute-packages:
- medea
- mediabus-fdk-aac
- mediabus-rtp
- melf
- mellon-gpio
- mellon-web
- memcache-conduit
@@ -2994,7 +2996,6 @@ dont-distribute-packages:
- optimal-blocks
- optimusprime
- optparse-enum
- orbits
- orchid
- orchid-demo
- order-maintenance
@@ -3391,6 +3392,7 @@ dont-distribute-packages:
- rfc-redis
- rfc-servant
- rhine-gloss
- rhine-terminal
- rhythm-game-tutorial
- rib
- ribosome
@@ -3597,9 +3599,6 @@ dont-distribute-packages:
- simple-session
- simpleirc-lens
- simseq
- singleton-nats
- singletons-presburger
- singletons-presburger_0_7_1_0
- siphon
- siren-json
- sirkel
@@ -4009,7 +4008,6 @@ dont-distribute-packages:
- ukrainian-phonetics-basic
- unagi-bloomfilter
- unbound
- unbounded-delays-units
- uni-events
- uni-graphs
- uni-htk
@@ -4023,9 +4021,6 @@ dont-distribute-packages:
- uniqueness-periods-vector-filters
- uniqueness-periods-vector-general
- uniqueness-periods-vector-properties
- units
- units-attoparsec
- units-defs
- universal
- universe
- universe-dependent-sum
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+1025 -212
View File
File diff suppressed because it is too large Load Diff