Skip to content

Upgrade to LTS 22.26 GHC 9.6.5 #5142

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.

Sign up for GitHub

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

Merged
merged 34 commits into from
Jul 15, 2024
Merged

Upgrade to LTS 22.26 GHC 9.6.5 #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2d1bf19
Mostly Upgrade LTS to ghc 9.6.5
ChrisPenner Jun 26, 2024
61b2666
Temporarily ignore deprecations from jose
ChrisPenner Jun 27, 2024
4a9b358
Swap from x509 to crypton-x509 since old packages are abandoned
ChrisPenner Jun 27, 2024
61e0522
Fix redundant liftA2 imports
ChrisPenner Jun 27, 2024
745660d
Fix servant request stuff
ChrisPenner Jun 27, 2024
a7f234a
Use random token rather than NanoID
ChrisPenner Jun 27, 2024
f3d4455
Update opt-parse help
ChrisPenner Jun 27, 2024
7538111
Upgrade watch expression stuff
ChrisPenner Jun 27, 2024
b85bea8
Clean up stack.yaml pins
ChrisPenner Jun 27, 2024
87e15d7
Bump stack version in CI
ChrisPenner Jun 27, 2024
06e730d
Attempt to bump nix flake
ChrisPenner Jun 27, 2024
c97d93e
lsp 2.3.0.0
neduard Jun 27, 2024
a35d706
Use GHC.IsList
neduard Jun 27, 2024
95a0eb9
cleanup cabal
neduard Jun 27, 2024
c3fe983
Merge neduard's lsp fixes
ChrisPenner Jun 27, 2024
5dcc096
update transcripts
ChrisPenner Jun 27, 2024
e94f870
Remove Primes from module names
ChrisPenner Jun 27, 2024
563e148
Resolve conflicts with trunk
ChrisPenner Jun 27, 2024
8f694f1
Add note about deprecations
ChrisPenner Jun 27, 2024
15f236a
Add issue number
ChrisPenner Jun 27, 2024
121d51c
Don’t export packages for individual build tools
sellout Jun 27, 2024
d0f4c70
Remove the non-haskell.nix devShell
sellout Jun 27, 2024
01e0351
Switch `nixos-unstable` to `release-23.11`
sellout Jun 27, 2024
a5b9864
Don’t hide `unison-project` in an overlay
sellout Jun 27, 2024
ba13de4
Remove dead code
sellout Jun 27, 2024
86819b8
Remove reference to non-existent Cabal component
sellout Jun 27, 2024
110b5ca
Actually cache UCM in CI
sellout Jun 27, 2024
f25af69
Override tool versions directly in the package set
sellout Jun 27, 2024
dad9d6d
Minor simplification of haskell-nix-flake
sellout Jun 27, 2024
7b373d7
Eliminate `only-tools` devShell
sellout Jun 27, 2024
f2c8020
Can now include the devShells in `all` package
sellout Jun 27, 2024
5ae7963
Merge branch 'simplifying-nix' into cp/ghc-upgrade
sellout Jun 27, 2024
c47bdcf
Get Nix build working with GHC 9.6.5
sellout Jun 27, 2024
ecf5fe1
Merge pull request #5155 from sellout/cp/ghc-upgrade
aryairani Jul 6, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/bundle-ucm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:

- name: install stack
uses: unisonweb/actions/stack/install@main
with:
stack-version: 2.15.5
Comment on lines +42 to +43
Copy link
Contributor

@aryairani aryairani Jun 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can also change the default on unisonweb/actions/stack/install if we like that better.

Copy link
Member Author

@ChrisPenner ChrisPenner Jun 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I figured it was a bit of a chicken-and-egg thing. TBH I kind of like specifying here because it's easy to see what it's using and easy to bump again in the future 😄

I'm glad you added it as an arg for that step.

Copy link
Contributor

@aryairani aryairani Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I like specifying it in this project too; I just wish we didn't have to specify it 4 times in this project, but maybe that's fine. Replace All.

Copy link
Contributor

@sellout sellout Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can read JSON in GH workflows, and also in Nix (I don’t know if there are other places we need versions).

So, we could write a dependency-versions.json file or something that the flake can read into its versions attrSet, and that workflows can read as well. I’ve been wanting to extract it from the flake anyway.


- name: build
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ jobs:
- name: install stack
if: steps.cache-ucm-binaries.outputs.cache-hit != 'true'
uses: unisonweb/actions/stack/install@main
with:
stack-version: 2.15.5

# Build deps, then build local code. Splitting it into two steps just allows us to see how much time each step
# takes.
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/haddocks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:

- name: install stack
uses: unisonweb/actions/stack/install@main
with:
stack-version: 2.15.5

- name: build with haddocks
working-directory: unison
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix-dev-cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
name: unison
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: build all packages and development shells
run: nix -L build --accept-flake-config --no-link --keep-going '.#build-tools'
run: nix -L build --accept-flake-config --no-link --keep-going '.#all'
2 changes: 2 additions & 0 deletions .github/workflows/update-transcripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:

- name: install stack
uses: unisonweb/actions/stack/install@main
with:
stack-version: 2.15.5

# One of the transcripts fails if the user's git name hasn't been set.
- name: set git user info
Expand Down
2 changes: 1 addition & 1 deletion codebase2/util-serialization/U/Util/Serialization.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

module U.Util.Serialization where

import Control.Applicative (Applicative (liftA2), liftA3)
import Control.Applicative (liftA3)
import Control.Monad (foldM, replicateM, replicateM_, when)
import Data.Bits (Bits, clearBit, setBit, shiftL, shiftR, testBit, (.|.))
import Data.ByteString (ByteString, readFile, writeFile)
Expand Down
15 changes: 11 additions & 4 deletions contrib/cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ packages:
parser-typechecker
unison-core
unison-cli
unison-cli-main
unison-hashing-v2
unison-merge
unison-share-api
unison-share-projects-api
unison-syntax
Expand All @@ -46,10 +48,12 @@ source-repository-package
tag: 9275eea7982dabbf47be2ba078ced669ae7ef3d5

constraints:
fsnotify < 0.4,
crypton-x509-store <= 1.6.8,
servant <= 0.19.1,
optparse-applicative <= 0.17.1.0
lsp == 2.3.0.0,
fsnotify == 0.4.1.0,
crypton-x509-store == 1.6.9,
servant == 0.20.1,
optparse-applicative == 0.18.1.0,
tls == 1.8.0

-- For now there is no way to apply ghc-options for all local packages
-- See https://cabal.readthedocs.io/en/latest/cabal-project.html#package-configuration-options
Expand Down Expand Up @@ -128,6 +132,9 @@ package unison-core
package unison-hashing-v2
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info

package unison-merge
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info

package unison-share-api
ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info

Expand Down
Loading