Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to GHC 8.10.4 #2533

Merged
merged 36 commits into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
337fc0d
Bump to ghc-8.10.4
Anviking Feb 22, 2021
727cee7
Enable unsafe migrations
Anviking Mar 10, 2021
86c30a2
Leverage new OnDeleteCascade
Anviking Mar 10, 2021
744984a
Fixup: Change fee DB type from Word to Word64
Anviking Mar 11, 2021
85d77e2
Quash another warning
rvl Mar 12, 2021
2c1082b
Remove source-repository-package entries from cabal.project for now
rvl Mar 11, 2021
402408e
stack.yaml: Remove fixes which are no longer needed
rvl Mar 11, 2021
760fd1d
stack.yaml: iohk-monitoring back to rev from cardano-node-1.25.1
rvl Mar 12, 2021
638e0e1
stack.yaml: update deps for new lts-17.5
rvl Mar 12, 2021
fd948f5
Bump Haskell.nix to latest master
Anviking Mar 10, 2021
ce71fdf
Use nixpkgs pin from iohk-nix (nixos-unstable branch)
rvl Feb 21, 2021
1d4c206
Bump iohk-nix to latest master
rvl Mar 11, 2021
41d3284
scripts/gen-hie.sh: Update to use cabal plan.json
rvl Dec 18, 2020
db75a10
Update hackage.nix and stackage.nix
rvl Mar 11, 2021
201207a
nix: Use qualified imports of library functions
rvl Mar 12, 2021
b0d1676
Update nix-shell for Haskell.nix changes
rvl Mar 12, 2021
6cf0724
Run stack2cabal
rvl Mar 12, 2021
86a643d
stylish-haskell fixes
rvl Mar 12, 2021
8ab0c6a
Fix for newer generic-lens
rvl Mar 12, 2021
9a8376e
Quash new warnings
rvl Mar 12, 2021
7a0af98
nix: Drop 19.03 and 20.09 nixpkgs pins
rvl Mar 12, 2021
213c7c8
nix: Changes for new Haskell.nix revision
rvl Mar 12, 2021
1333bba
Update CLISpec whitespace
Anviking Mar 12, 2021
cec26e5
Adjust estimateMaxInputsTests
Anviking Mar 15, 2021
09da3bc
Try adding basic weeder.dhall
Anviking Mar 15, 2021
93f45e8
Fixes for cabal.project
Anviking Mar 16, 2021
9f79f75
nix: Fix windows build failure
rvl Mar 16, 2021
fe9a19a
Use the LTS hspec versions
Anviking Mar 16, 2021
76c3c40
Move snapshot to cardano-haskell repo
Anviking Mar 16, 2021
9894e0c
Update hackage.nix and stackage.nix
rvl Mar 17, 2021
c62197f
Update niv boilerplate to latest version
rvl Mar 17, 2021
b0d74e2
Regenerate nix
rvl Mar 17, 2021
19291cd
Fix cabal.project
rvl Mar 17, 2021
0bbd839
Try to fix hydra eval error by bumping Haskell.nix
rvl Mar 17, 2021
e71c1ce
Move snapshot to cardano-haskell repo
Anviking Mar 16, 2021
63a899b
fixup! Regenerate nix
Mar 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ steps:

- label: 'Check Cabal Configure (Haskell.nix shellFor)'
command:
- 'nix-shell --run "cabal v2-update"'
- 'nix-shell --run "cabal v2-configure --project-file=cabal-nix.project --enable-tests --enable-benchmarks"'
- 'nix-shell --run "cabal v2-configure --project-file=cabal-nix.project -frelease --enable-tests --enable-benchmarks"'
- 'nix-shell --run "cabal update"'
- 'nix-shell --run "cabal configure --project-file=cabal-nix.project --enable-tests --enable-benchmarks"'
- 'nix-shell --run "cabal configure --project-file=cabal-nix.project -frelease --enable-tests --enable-benchmarks"'
agents:
system: x86_64-linux

- label: 'Check Cabal Configure'
command:
- 'nix-shell nix/cabal-shell.nix --run "cabal v2-update"'
- 'nix-shell nix/cabal-shell.nix --run "cabal v2-configure --enable-tests --enable-benchmarks"'
- 'nix-shell nix/cabal-shell.nix --run "cabal v2-configure -frelease --enable-tests --enable-benchmarks"'
- 'nix-shell nix/cabal-shell.nix --run "cabal update"'
- 'nix-shell nix/cabal-shell.nix --run "cabal configure --enable-tests --enable-benchmarks"'
- 'nix-shell nix/cabal-shell.nix --run "cabal configure -frelease --enable-tests --enable-benchmarks"'
agents:
system: x86_64-linux

Expand Down
206 changes: 59 additions & 147 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by stackage-to-hackage
index-state: 2021-03-11T00:00:00Z

with-compiler: ghc-8.6.5
with-compiler: ghc-8.10.4

packages:
lib/core/
Expand All @@ -16,7 +16,7 @@ packages:
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-addresses
tag: 115174cc451d3fc6b90ce61782f841e51f271c3d
tag: 05bd6d0b877d8fc440be83142935fa1e7a915916
subdir: command-line
core

Expand Down Expand Up @@ -120,180 +120,92 @@ source-repository-package
typed-protocols
typed-protocols-examples

source-repository-package
type: git
location: https://github.com/input-output-hk/persistent
tag: 107787ecc4c8a112375493cd66574f788f950fce
subdir: persistent
persistent-sqlite
persistent-template

source-repository-package
type: git
location: https://github.com/snoyberg/http-client.git
tag: 1a75bdfca014723dd5d40760fad854b3f0f37156
subdir: http-client

allow-older: *
allow-newer: *
-- -------------------------------------------------------------------------
-- Constraints tweaking

package cardano-wallet-core
ghc-options: -ddump-to-file -ddump-hi
-- Relax overly strict bounds in hjsonschema and hjsonpointer
allow-newer:
hjsonschema:*
, hjsonpointer:*
, cardano-sl-x509:ip

package cardano-wallet-core-integration
ghc-options: -ddump-to-file -ddump-hi
constraints:
hedgehog >= 1.0.2
-- dependency of systemd-2.3.0
, network >= 3.1.1.1
-- choose versions that work with base >= 4.12
, hjsonpointer >= 1.5.0
, hjsonschema >= 1.10.0

-- -------------------------------------------------------------------------
-- Enable specific tests in this repo

test-show-details: direct

package cardano-wallet
tests: True

package cardano-wallet-core
tests: True

package cardano-wallet-cli
ghc-options: -ddump-to-file -ddump-hi
tests: True

package cardano-wallet-launcher
ghc-options: -ddump-to-file -ddump-hi
tests: True

package cardano-wallet-text-class
tests: True

package cardano-numeric
ghc-options: -ddump-to-file -ddump-hi
tests: True

package text-class
ghc-options: -ddump-to-file -ddump-hi
package cardano-wallet-core-integration
tests: True

package cardano-wallet-test-utils
ghc-options: -ddump-to-file -ddump-hi

package cardano-wallet
ghc-options: -ddump-to-file -ddump-hi
tests: True

package strict-non-empty-containers
ghc-options: -ddump-to-file -ddump-hi
tests: True

-- Verbatim
package cardano-crypto
tests: False
benchmarks: False
package contra-tracer
tests: False
benchmarks: False
package iohk-monitoring
-- Disable all other tests. This is what they do in the cardano-node
-- cabal project.
-- The global tests: False flag doesn't seem to work though.

tests: False

package byron-spec-ledger
tests: False
benchmarks: False
package zip

package ouroboros-consensus-test
tests: False
benchmarks: False
package cardano-crypto-praos

package ouroboros-consensus-cardano-test
tests: False
benchmarks: False
package byron-spec-ledger

package ouroboros-network
tests: False
benchmarks: False
package ouroboros-consensus-cardano

package ouroboros-network-framework
tests: False
benchmarks: False

package small-steps
tests: False
benchmarks: False

package small-steps-test
tests: False
benchmarks: False
package ouroboros-consensus
tests: False
benchmarks: False
package ouroboros-consensus-byron
tests: False
benchmarks: False
package ouroboros-consensus-shelley
tests: False
benchmarks: False
package ouroboros-consensus-mock
tests: False
benchmarks: False
package cborg
tests: False
benchmarks: False
package http-client
tests: False
benchmarks: False

package goblins
tests: False
benchmarks: False
package io-sim
tests: False
benchmarks: False

package io-sim-classes
tests: False
benchmarks: False
package shelley-spec-non-integral
tests: False
benchmarks: False
package network-mux
tests: False
benchmarks: False
package typed-protocols
tests: False
benchmarks: False
package typed-protocols-examples
tests: False
benchmarks: False
package cardano-prelude
tests: False
benchmarks: False
package cardano-binary
tests: False
benchmarks: False
package cardano-sl-x509
tests: False
benchmarks: False
package cardano-crypto-class
tests: False
benchmarks: False
package cardano-crypto-wrapper
tests: False
benchmarks: False
package ouroboros-network-framework
tests: False
benchmarks: False
package ouroboros-network
tests: False
benchmarks: False
package byron-spec-chain
tests: False
benchmarks: False
package cardano-addresses
tests: False
benchmarks: False
package cardano-api
tests: False
benchmarks: False
package cardano-cli
tests: False
benchmarks: False
package cardano-crypto
tests: False
benchmarks: False
package cardano-ledger
tests: False
benchmarks: False
package cardano-node
tests: False
benchmarks: False
package cardano-transactions
tests: False
benchmarks: False
package lobemo-backend-monitoring
tests: False
benchmarks: False
package ntp-client
tests: False
benchmarks: False
package ouroboros-consensus-test-infra
tests: False
benchmarks: False
package persistent
tests: False
benchmarks: False
package persistent-sqlite
tests: False
benchmarks: False
package persistent-template
tests: False
benchmarks: False
package shelley-spec-ledger-test
tests: False
benchmarks: False

-- -------------------------------------------------------------------------
Loading