MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #142094 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2021-10-23 12:59:27 +08:00 committed by GitHub
commit da0e15c3d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 647 additions and 462 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": "73463ac080cd55650580d58fe80e5b2dcdfe5a7e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/73463ac080cd55650580d58fe80e5b2dcdfe5a7e.tar.gz",
"sha256": "1vwlpkrpfj6wdzlv4lwargyakyci81gri70z2jhkpvv3l6adc0gk",
"msg": "Update from Hackage at 2021-10-15T10:42:20Z"
"commit": "b60d5f4b773d16857c105718faad9699e145edcd",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b60d5f4b773d16857c105718faad9699e145edcd.tar.gz",
"sha256": "19avxynbjhkhvjy5kcxgd3fp0b2nczsk213s1za488r6kksj90f5",
"msg": "Update from Hackage at 2021-10-18T14:27:09Z"
}

49
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -49,6 +49,7 @@ self: super: {
# These packages (and their reverse deps) cannot be built with profiling enabled.
ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
ghc-datasize = disableLibraryProfiling super.ghc-datasize;
ghc-vis = disableLibraryProfiling super.ghc-vis;
# This test keeps being aborted because it runs too quietly for too long
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
@ -1272,22 +1273,18 @@ self: super: {
gi-cairo-render = doJailbreak super.gi-cairo-render;
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
svgcairo = overrideCabal super.svgcairo (drv: {
patches = [
# Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged.
(pkgs.fetchpatch {
url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch";
sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh";
})
# The update here breaks svgcairo:
# https://github.com/NixOS/nixpkgs/commit/08fcd73d9dc9a28aa901210b259d9bfb3c228018
# and updating the call to the header with the correct name fixes it.
(pkgs.fetchpatch {
url = "https://github.com/dalpd/svgcairo/commit/4dc6d8d3a6c24be0b8c1fd73b282ff247e7b1e6f.patch";
sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a";
})
];
});
svgcairo = appendPatches super.svgcairo [
# Remove when https://github.com/gtk2hs/svgcairo/pull/12 goes in.
(pkgs.fetchpatch {
url = "https://github.com/gtk2hs/svgcairo/commit/348c60b99c284557a522baaf47db69322a0a8b67.patch";
sha256 = "0akhq6klmykvqd5wsbdfnnl309f80ds19zgq06sh1mmggi54dnf3";
})
# Remove when https://github.com/gtk2hs/svgcairo/pull/13 goes in.
(pkgs.fetchpatch {
url = "https://github.com/dalpd/svgcairo/commit/d1e0d7ae04c1edca83d5b782e464524cdda6ae85.patch";
sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a";
})
];
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
@ -1827,6 +1824,21 @@ self: super: {
cabal-install-parsers = self.cabal-install-parsers_0_4_2;
};
# Build haskell-ci from git repository, including some useful fixes,
# e. g. required for generating the workflows for the cabal2nix repository
haskell-ci-unstable = (overrideSrc super.haskell-ci {
version = "0.13.20211011";
src = pkgs.fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "c88e67e675bc4a990da53863c7fb42e67bcf9847";
sha256 = "1zhv1cg047lfyxfs3mvc73vv96pn240zaj7f2yl4lw5yj6y5rfk9";
};
}).overrideScope (self: super: {
attoparsec = self.attoparsec_0_14_1;
Cabal = self.Cabal_3_6_2_0;
});
Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
# https://github.com/adamConnerSax/Frames-streamly/issues/1
patchPhase = ''
@ -2054,4 +2066,9 @@ EOT
# https://github.com/recursion-schemes/recursion-schemes/issues/128
recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch;
# Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release
# Can't use fetchpatch as it required tweaking the line endings as the .cabal
# file revision on hackage was gifted CRLF line endings
gogol-core = appendPatch super.gogol-core ./patches/gogol-core-144.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

2
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -75,6 +75,8 @@ self: super: {
weeder = self.weeder_2_3_0;
generic-lens-core = self.generic-lens-core_2_2_0_0;
generic-lens = self.generic-lens_2_2_0_0;
th-desugar = self.th-desugar_1_12;
autoapply = self.autoapply_0_4_1_1;
# Doesn't allow Dhall 1.39.*
weeder_2_3_0 = super.weeder_2_3_0.override {

2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -86,7 +86,7 @@ self: super: {
# Tests fail because of typechecking changes
conduit = dontCheck super.conduit;
constraints = appendPatch super.constraints (pkgs.fetchpatch {
constraints = appendPatch (doJailbreak super.constraints) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch";
sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3";
});

22
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -1299,7 +1299,6 @@ broken-packages:
- event-driven
- eventful-dynamodb
- eventful-sql-common
- eventlog2html
- eventloop
- eventstore
- ewe
@ -1341,6 +1340,7 @@ broken-packages:
- ez-couch
- Facebook-Password-Hacker-Online-Latest-Version
- faceted
- factory
- facts
- fadno-braids
- failable-list
@ -1409,6 +1409,7 @@ broken-packages:
- fingertree-tf
- finitary-derive
- firefly-example
- firestore
- first-and-last
- first-class-instances
- fit
@ -1655,7 +1656,6 @@ broken-packages:
- ghc-tcplugin-api
- ghc-time-alloc-prof
- ghc-usage
- ghc-vis
- gh-labeler
- giak
- Gifcurry
@ -1717,7 +1717,20 @@ broken-packages:
- gochan
- godot-haskell
- gofer-prelude
- gogol-core
- gogol-admin-emailmigration
- gogol-affiliates
- gogol-autoscaler
- gogol-bigtableadmin
- gogol-cloudmonitoring
- gogol-freebasesearch
- gogol-latencytest
- gogol-maps-coordinate
- gogol-maps-engine
- gogol-photoslibrary
- gogol-resourceviews
- gogol-servicemanagement
- gogol-taskqueue
- gogol-useraccounts
- gooey
- google-cloud
- GoogleCodeJam
@ -4388,9 +4401,12 @@ broken-packages:
- shorten-strings
- short-vec
- show-prettyprint
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-isreal
- Shpadoinkle-streaming
- Shpadoinkle-template
- Shpadoinkle-widgets
- shwifty
- sifflet
- sifflet-lib

7
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -100,6 +100,12 @@ default-package-overrides:
- hiedb == 0.4.0.*
# 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes
- weeder < 2.3.0
# 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0
- taskwarrior < 0.4.0.0
# 2021-10-19: autoapply 0.4.1.1 requires th-desugar 1.12
- autoapply < 0.4.1.1
# 2021-10-22: 1.8 breaks shake-bench
- SVGFonts < 1.8
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -150,6 +156,7 @@ package-maintainers:
- spago
- termonad
dalpd:
- ghc-vis
- svgcairo
domenkozar:
- cachix

185
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -331,6 +331,7 @@ dont-distribute-packages:
- Shellac-haskeline
- Shellac-readline
- ShortestPathProblems
- Shpadoinkle-developer-tools
- Shpadoinkle-disembodied
- Shpadoinkle-examples
- Shpadoinkle-router
@ -1118,6 +1119,7 @@ dont-distribute-packages:
- findhttp
- finite-table
- firstify
- fishfood
- fix-parser-simple
- fixed-point-vector
- fixed-point-vector-space
@ -1262,188 +1264,6 @@ dont-distribute-packages:
- goal-probability
- goal-simulation
- goat
- gogol
- gogol-abusiveexperiencereport
- gogol-acceleratedmobilepageurl
- gogol-accessapproval
- gogol-accesscontextmanager
- gogol-adexchange-buyer
- gogol-adexchange-seller
- gogol-adexchangebuyer2
- gogol-adexperiencereport
- gogol-admin-datatransfer
- gogol-admin-directory
- gogol-admin-emailmigration
- gogol-admin-reports
- gogol-adsense
- gogol-adsense-host
- gogol-affiliates
- gogol-alertcenter
- gogol-analytics
- gogol-analyticsreporting
- gogol-android-enterprise
- gogol-android-publisher
- gogol-androiddeviceprovisioning
- gogol-androidmanagement
- gogol-appengine
- gogol-apps-activity
- gogol-apps-calendar
- gogol-apps-licensing
- gogol-apps-reseller
- gogol-apps-tasks
- gogol-appstate
- gogol-autoscaler
- gogol-bigquery
- gogol-bigquerydatatransfer
- gogol-bigtableadmin
- gogol-billing
- gogol-binaryauthorization
- gogol-blogger
- gogol-books
- gogol-chat
- gogol-civicinfo
- gogol-classroom
- gogol-cloudasset
- gogol-clouderrorreporting
- gogol-cloudfunctions
- gogol-cloudidentity
- gogol-cloudiot
- gogol-cloudkms
- gogol-cloudmonitoring
- gogol-cloudprivatecatalog
- gogol-cloudprivatecatalogproducer
- gogol-cloudprofiler
- gogol-cloudscheduler
- gogol-cloudsearch
- gogol-cloudshell
- gogol-cloudtasks
- gogol-cloudtrace
- gogol-commentanalyzer
- gogol-composer
- gogol-compute
- gogol-consumersurveys
- gogol-container
- gogol-containeranalysis
- gogol-containerbuilder
- gogol-customsearch
- gogol-dataflow
- gogol-datafusion
- gogol-dataproc
- gogol-datastore
- gogol-debugger
- gogol-deploymentmanager
- gogol-dfareporting
- gogol-dialogflow
- gogol-digitalassetlinks
- gogol-discovery
- gogol-dlp
- gogol-dns
- gogol-docs
- gogol-doubleclick-bids
- gogol-doubleclick-search
- gogol-drive
- gogol-driveactivity
- gogol-factchecktools
- gogol-file
- gogol-firebase-dynamiclinks
- gogol-firebase-rules
- gogol-firebasehosting
- gogol-firebaseremoteconfig
- gogol-firestore
- gogol-fitness
- gogol-fonts
- gogol-freebasesearch
- gogol-fusiontables
- gogol-games
- gogol-games-configuration
- gogol-games-management
- gogol-genomics
- gogol-gmail
- gogol-groups-migration
- gogol-groups-settings
- gogol-healthcare
- gogol-iam
- gogol-iamcredentials
- gogol-iap
- gogol-identity-toolkit
- gogol-indexing
- gogol-jobs
- gogol-kgsearch
- gogol-language
- gogol-latencytest
- gogol-libraryagent
- gogol-logging
- gogol-manufacturers
- gogol-maps-coordinate
- gogol-maps-engine
- gogol-mirror
- gogol-ml
- gogol-monitoring
- gogol-oauth2
- gogol-oslogin
- gogol-pagespeed
- gogol-partners
- gogol-people
- gogol-photoslibrary
- gogol-play-moviespartner
- gogol-playcustomapp
- gogol-plus
- gogol-plus-domains
- gogol-poly
- gogol-prediction
- gogol-proximitybeacon
- gogol-pubsub
- gogol-qpxexpress
- gogol-redis
- gogol-remotebuildexecution
- gogol-replicapool
- gogol-replicapool-updater
- gogol-resourcemanager
- gogol-resourceviews
- gogol-run
- gogol-runtimeconfig
- gogol-safebrowsing
- gogol-script
- gogol-searchconsole
- gogol-securitycenter
- gogol-servicebroker
- gogol-serviceconsumermanagement
- gogol-servicecontrol
- gogol-servicemanagement
- gogol-servicenetworking
- gogol-serviceusage
- gogol-serviceuser
- gogol-sheets
- gogol-shopping-content
- gogol-siteverification
- gogol-slides
- gogol-sourcerepo
- gogol-spanner
- gogol-spectrum
- gogol-speech
- gogol-sqladmin
- gogol-storage
- gogol-storage-transfer
- gogol-streetviewpublish
- gogol-surveys
- gogol-tagmanager
- gogol-taskqueue
- gogol-testing
- gogol-texttospeech
- gogol-toolresults
- gogol-tpu
- gogol-tracing
- gogol-translate
- gogol-urlshortener
- gogol-useraccounts
- gogol-vault
- gogol-videointelligence
- gogol-vision
- gogol-webmaster-tools
- gogol-websecurityscanner
- gogol-youtube
- gogol-youtube-analytics
- gogol-youtube-reporting
- google-drive
- google-mail-filters
- google-maps-geocoding
@ -3051,6 +2871,7 @@ dont-distribute-packages:
- sql-simple-postgresql
- sql-simple-sqlite
- sqlite-simple-typed
- squeeze
- sr-extra
- sscgi
- sshd-lint

807
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

26
pkgs/development/haskell-modules/patches/gogol-core-144.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/gogol-core.cabal b/gogol-core.cabal
index 4c47988..caa4796 100644
--- a/gogol-core.cabal
+++ b/gogol-core.cabal
@@ -62,7 +62,7 @@ library
, lens >= 4.4
, resourcet >= 1.1
, scientific >= 0.3
- , servant >= 0.4.4
+ , servant >= 0.14.1
, text >= 1.1
, unordered-containers >= 0.2.5
diff --git a/src/Network/Google/Prelude.hs b/src/Network/Google/Prelude.hs
index a4ad9de..795c690 100644
--- a/src/Network/Google/Prelude.hs
+++ b/src/Network/Google/Prelude.hs
@@ -28,7 +28,7 @@ import Network.HTTP.Client as Export (RequestBody)
import Numeric.Natural as Export (Natural)
import Prelude as Export hiding (product, span, any, Word)
import Servant.API as Export hiding (Headers, Link, getResponse, Stream, ResponseHeader, Header, header)
-import Servant.Utils.Links as Export hiding (Link)
+import Servant.Links as Export hiding (Link)
import Web.HttpApiData as Export (FromHttpApiData (..), ToHttpApiData (..))
import Network.Google.Data.Bytes as Export

1
pkgs/top-level/all-packages.nix
View file

@ -14761,6 +14761,7 @@ with pkgs;
msitools = callPackage ../development/tools/misc/msitools { };
haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci;
haskell-ci-unstable = lowPrio (haskell.lib.justStaticExecutables haskellPackages.haskell-ci-unstable);
neoload = callPackage ../development/tools/neoload {
licenseAccepted = (config.neoload.accept_license or false);