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

Simplify lock file #257

Merged
merged 4 commits into from
May 10, 2023
Merged

Simplify lock file #257

merged 4 commits into from
May 10, 2023

Conversation

turion
Copy link
Collaborator

@turion turion commented Feb 9, 2023

I removed some duplicate inputs.

flake.nix Outdated Show resolved Hide resolved
@turion
Copy link
Collaborator Author

turion commented Feb 9, 2023

If we merge this, we can close #207.

@turion turion force-pushed the dev_simplify_lock_file branch 2 times, most recently from 6956aef to 1ce6ad5 Compare May 2, 2023 07:57
@turion turion mentioned this pull request May 2, 2023
@turion
Copy link
Collaborator Author

turion commented May 10, 2023

This PR introduces a lot of formatting changes which may make rebasing harder.
To rebase after this is merged, one should probably do the following:

  • Rebase onto a commit directly before this, manually resolving further conflicts
    • git rebase e1408795f3923c4eff81373d9e6fce47632bc038
  • Rebase onto the ormolu commit from this PR, automatically resolving conflicts and applying formatting
    • git rebase 9605aa02a1b92b6d5d725db3129d74a60d45798f -X theirs --exec 'ormolu -i $(git ls-files "*.hs"); git commit -a --amend --no-edit'
  • Rebase onto master
    • git rebase origin/master

@turion turion mentioned this pull request May 10, 2023
@turion turion merged commit 256aad7 into tweag:master May 10, 2023
@turion turion deleted the dev_simplify_lock_file branch May 10, 2023 12:20
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