-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
protobuf3_21: 3.21.2 -> 21.5, update versioning scheme #191207
Conversation
@@ -46,7 +46,7 @@ let | |||
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"' | |||
''; | |||
|
|||
patches = lib.optionals (lib.versionOlder version "3.22") [ | |||
patches = lib.optionals (lib.versionOlder version "22") [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this still work like this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
protobuf 3.21 was the only one using the cmake generic builder. So yes :).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO we should also try to reduce the number of protobuf variants we have.
I think the maintenance is pretty minimal. And protobuf is pretty pedantic about which versions you use, so I think we should keep around the non-EOL versions. |
New version, v21.6, is available: |
When I try to cross-compile, I get this:
If I add the alias |
This could fix several errors12 in #191339 because it picks up protocolbuffers/protobuf#10271. From my reading of the ticket, it seems that Footnotes |
Yea.... cross compilation + overriding :( |
FYI, it's these lines that cause this to happen: nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix Lines 59 to 65 in e2420ef
Maybe still using the minor version in the name would be good? Otherwise those lines should probably be changed to support both. |
Seeing as 3.21/21.x are the only versions of protobuf using the cmake builder, I can just adopt the newer convention. |
Note: 3.21 got security update in the meantime (and became the default version). |
Can I help with anything to move this forward? Also, would it make sense to rename/add a new package called protoc? Given that the new versioning scheme is for protoc only and language runtimes will continue using semver. |
After 6 months, I stopped caring, let's get this in. |
Updated diff, going to merge in 24hrs if no objections. It's been ~6 months |
d6d1c7b
to
3efc254
Compare
|
||
callPackage ./generic-v3-cmake.nix { | ||
version = "21.12"; | ||
sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Migrate this to hash
, please.
@@ -0,0 +1,6 @@ | |||
{ callPackage, abseil-cpp, ... }: | |||
|
|||
callPackage ./generic-v3-cmake.nix { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is v3
here still correct/relevant?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can probably remove it. shouldn't be meaningful anymore.
much of this was applied |
Description of changes
Upstream dropped the previous "3" major version, to better help with handling changes to underlying ecosystems. https://developers.google.com/protocol-buffers/docs/news/2022-05-06
cc @infinisil if this is the correct way to do this version transition
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes