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

Update nix build tools #1029

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

carbolymer
Copy link
Contributor

Changelog

- description: |
    <insert-changelog-description-here>
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  # - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  # - refactoring    # QoL changes
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

Additional context for the PR goes here. If the PR fixes a particular issue please provide a link to the issue.

How to trust this PR

Highlight important bits of the PR that will make the review faster. If there are commands the reviewer can run to observe the new behavior, describe them.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

@@ -107,8 +106,7 @@
# tools we want in our shell, from hackage
shell.tools =
{
# for now we're using latest cabal for `cabal haddock-project` fixes
# cabal = "3.10.3.0";
cabal = "3.14.1.1";
Copy link
Contributor Author

@carbolymer carbolymer Jan 23, 2025

Choose a reason for hiding this comment

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

  • bump in GHA if nix is happy with that version

Copy link
Contributor

Choose a reason for hiding this comment

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

@carbolymer> why this specific version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's just the latest, to not have to build cabal ourselves from a specific commit. That was done to include a fix for haddocks building.

;;
"aarch64-linux")
derivation+="x86_64-linux.ghc965-aarch64-unknown-linux-musl"
derivation+="x86_64-linux.ghc96-aarch64-unknown-linux-musl"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • double check derivation name

Copy link
Contributor

Choose a reason for hiding this comment

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

@carbolymer> please try the release pipeline on this branch as follows:

gh workflow run "Release Upload" -r $(git branch --show-current)

Because the HEAD of this branch has no associated tag, it will run the pipeline but not create a release, so it's a good way to test your change. See the documentation: https://github.com/IntersectMBO/cardano-cli/blob/master/.github/workflows/release-upload.yml#L28

flake.nix Outdated
@@ -107,8 +106,7 @@
# tools we want in our shell, from hackage
shell.tools =
{
# for now we're using latest cabal for `cabal haddock-project` fixes
# cabal = "3.10.3.0";
cabal = "3.14.1.1";
ghcid = "0.8.8";
Copy link
Contributor Author

@carbolymer carbolymer Jan 23, 2025

Choose a reason for hiding this comment

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

  • consider bumping other tools as well

@@ -43,7 +43,7 @@ jobs:
/home/runner/.cache/hie-bios
/home/runner/.cache/ghcide
/home/runner/.local/state/cabal
.ghc.environment.x86_64-linux-9.8.2
.ghc.environment.x86_64-linux-*
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch 👍

@carbolymer carbolymer force-pushed the mgalazyn/chore/update-nix-build-tools branch 4 times, most recently from 907bc52 to 31b63c5 Compare January 24, 2025 10:39
Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • Test the workflow manually

@carbolymer carbolymer force-pushed the mgalazyn/chore/update-nix-build-tools branch from 31b63c5 to 3e2e43f Compare January 24, 2025 10:45
@carbolymer carbolymer force-pushed the mgalazyn/chore/update-nix-build-tools branch from 5db0ffb to 590084d Compare January 24, 2025 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants