Update foliage and make required changes#1271
Merged
neilmayhew merged 7 commits intomainfrom Mar 20, 2026
Merged
Conversation
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
e28a7e5 to
25bb1c1
Compare
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
25bb1c1 to
827249b
Compare
Contributor
Author
|
I'm keeping this a draft until input-output-hk/foliage#119 is merged |
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
827249b to
1c5d6a8
Compare
There was a problem hiding this comment.
Pull request overview
This pull request updates the foliage dependency to a version that changes how package version overwriting is handled. Instead of using an explicit force-version field in metadata files, the new version determines whether to overwrite versions based solely on the presence of revision-0 cabal files.
Changes:
- Updated
foliagedependency from rev 5283d01 to rev 94644ae (input-output-hk/foliage#119) - Removed all
force-version = truefields from 53 package metadata files in_sources/ - Modified
add-from-github.shto stop writing theforce-versionfield when adding new packages - Updated
compare-package-metadata.shto temporarily filter outforced-versionfield during metadata comparison - Enhanced
local-ci.shto use revision-specific flake references and added archive extension validation
Reviewed changes
Copilot reviewed 48 out of 49 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| flake.lock | Updates foliage dependency to version that drops force-version field support |
| scripts/local-ci.sh | Adds revision-specific nix develop reference and archive extension check for better CI validation |
| scripts/compare-package-metadata.sh | Filters forced-version field from OLD metadata to enable clean comparison during transition |
| scripts/add-from-github.sh | Removes code that writes force-version field when adding packages from GitHub |
| _sources/*/meta.toml (53 files) | Removes force-version = true field from all package metadata files |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
angerman
force-pushed
the
nm/foliage-update
branch
from
1c5d6a8 to
b87057c
Compare
Contributor
|
@neilmayhew oof, after rebase everything fails now :( |
Contributor
Author
I believe this is an upstream problem due to a recent change on Hackage. I'll wait a couple of days to see what happens with that and then try updating the Hackage index again. |
Contributor
Author
neilmayhew
force-pushed
the
nm/foliage-update
branch
4 times, most recently
from
23fa5c4 to
a678bfa
Compare
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
a678bfa to
670a467
Compare
andreabedini
approved these changes
Mar 12, 2026
Contributor
andreabedini
left a comment
andreabedini
left a comment
There was a problem hiding this comment.
LGTM 👍 Well executed plan @neilmayhew!
Occasionally the download-artifact action doesn't clean up after itself and leaves behind a directory with the same name as the one we're about to create.
This brings in input-output-hk/foliage#119 which drops the `force-version` field and uses only the presence of a revision-0 cabal file to determine whether the upstream cabal file needs to be overwritten.
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
670a467 to
910837f
Compare
This is necessary to avoid false positives when detecting new packages to build in CI This commit can be reverted after #1271 is merged
neilmayhew
force-pushed
the
nm/foliage-update
branch
from
910837f to
5d0f719
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This brings in input-output-hk/foliage#119 which drops the
force-versionfield and uses only the presence of a revision-0 cabal file to determine whether the upstream cabal file needs to be overwritten.Also:
force-versionfield inadd-from-githubforce-versionfield in the existing metadata filesforced-versionfield when comparing package metadata (temporary change)local-ciscript that were helpful for testing this changeNote: The necessary revision-0 files were added to CHaP a while ago, but without using the version of
foliagethat requires them.