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

flake improvements #76

Merged
merged 2 commits into from
Jun 26, 2023
Merged

flake improvements #76

merged 2 commits into from
Jun 26, 2023

Conversation

disassembler
Copy link
Contributor

@disassembler disassembler commented Jun 23, 2023

  • exposes project from haskell.nix at top level
  • adds work-around so --update-input with CHaP works as expected

Changelog

- description: |
    Flake improvements:
    - exposes project from haskell.nix at top level
    - adds work-around so --update-input with CHaP works as expected
  compatibility: no-api-changes
  type: maintenance

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • The change log section in the PR description has been filled in
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • roundtrip tests
  • Any changes are noted in the CHANGELOG.md for affected package
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
  • Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

Copy link
Contributor

@angerman angerman left a comment

Choose a reason for hiding this comment

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

LGTM

Although the CHaP workaround could be better in explaining why this is necessary right now.

hamishmack and others added 2 commits June 26, 2023 10:32
This helps haskell.nix find the package source correctly.
@newhoggy newhoggy added this pull request to the merge queue Jun 26, 2023
@newhoggy
Copy link
Collaborator

Merging, but @disassembler can you please add an explanation as suggested by @angerman to the PR?

@hamishmack
Copy link
Contributor

From #69:

This helps haskell.nix find the package source correctly. In particular new packages that are not in the main CHaP branch yet will be loaded correctly.

To try it out you will need a local CHaP, this can be build with:

git clone git@github.com:input-output-hk/cardano-haskell-packages.git
cd cardano-haskell-packages
nix develop -c foliage build -j 0 --write-metadata

That will make a cardano-haskell-packages/_repo dir with the CHaP repository including any new packages. To use from a directory containing this cardano-api branch run:

nix build --override-input CHaP path:/home/hamish/iohk/cardano-haskell-packages/_repo .\#hydraJobs.required

Make sure to use path: and the full path to the _repo directory.

Merged via the queue into main with commit a060630 Jun 26, 2023
@newhoggy newhoggy deleted the sl/flake-improvements branch June 26, 2023 12:41
@hamishmack
Copy link
Contributor

Also we can update this once input-output-hk/haskell.nix#1984 is merged.

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.

4 participants