Switch proto-lens SRP from carbolymer fork to google upstream master#1144
Merged
carbolymer merged 1 commit intomasterfrom Mar 20, 2026
Merged
Switch proto-lens SRP from carbolymer fork to google upstream master#1144carbolymer merged 1 commit intomasterfrom
carbolymer merged 1 commit intomasterfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the proto-lens source-repository-package (SRP) pin to use the upstream google/proto-lens repo (instead of the carbolymer fork) and wires Nix to fetch the repo with submodules while fixing problematic symlinks.
Changes:
- Pin proto-lens SRP to an upstream
google/proto-lenscommit for GHC ≥ 9.12. - Add a Nix fetch + “symlink fixing” derivation for proto-lens (including submodules).
- Simplify Nix package source overrides by generating overrides for a set of proto-lens subpackages.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| flake.nix | Fetch upstream proto-lens with submodules, patch symlinked paths, and override build sources accordingly |
| cabal.project | Switch SRP from carbolymer/proto-lens to google/proto-lens for GHC ≥ 9.12 |
Contributor
|
@carbolymer I've opened a new pull request, #1145, to work on those changes. Once the pull request is ready, I'll request review from you. |
3 tasks
c93cb9a to
d944877
Compare
d944877 to
f3666fb
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.
Changelog
Context
The
carbolymerfork ofproto-lenswas used as a temporary workaround for GHC 9.12 support. Now that the upstream fix has been merged (google/proto-lens#519), we can switch the source-repository-package to point directly atgoogle/proto-lensmaster.The SRP is now conditional on
impl(ghc >= 9.12)so it only applies where needed.How to trust this PR
cabal.project: SRP switched fromcarbolymer/proto-lenstogoogle/proto-lensat the merge commit of #519, gated behindimpl(ghc >= 9.12)flake.nix: Nix fetch updated to match, with symlink fixing and simplified package overrides vialib.genAttrsChecklist