Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

lib: Lower bitflags requirement to just "1" #103

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

cgwalters
Copy link
Member

@cgwalters cgwalters commented Sep 27, 2021

This is dealt with in a newer nix but we need to match
what is locked in rpm-ostree right now. See
nix-rust/nix@5495bbc


@lucab
Copy link
Member

lucab commented Sep 27, 2021

I'm not sure I'm understanding what this PR is fixing. Do we have to support somewhere a toolchain <1.46?

@cgwalters
Copy link
Member Author

cgwalters commented Sep 27, 2021

Was trying to answer that with the

but we need to match what is locked in rpm-ostree right now.

bit in the PR comment. Without this, I get a failure in coreos/rpm-ostree#3139
because https://github.com/coreos/rpm-ostree/blob/3e787cee05dbae266cfb107a6426dbb473a2e3ee/Cargo.lock#L81
(And as that nix PR shows, current nix is bound to <1.3)

@cgwalters
Copy link
Member Author

Hmm or maybe we could declare we support both 1.2 and 1.3 here?

@cgwalters
Copy link
Member Author

Or maybe our dependency on bitflags is massive overkill for a single bit 😉

@lucab
Copy link
Member

lucab commented Sep 27, 2021

Detailing it through, I was surprised we can't build with both 1.2 and 1.3 in the lockfile.
But then I guess this is because cargo is unifying the 1.x dependency, which is different than what happens for crates at 0.x (which are not compatible and thus do not get unified).
If we don't have any particular requirement here, I think we can just try specifying 1 so that the final consumer lockfile can pick whatever it wants.

@lucab
Copy link
Member

lucab commented Sep 27, 2021

Anyway, I'm also fine with just fixing the build now and kicking the can to later improve compatibility, LGTM!

This is dealt with in a newer nix but we need to match
what is locked in rpm-ostree right now.  See
nix-rust/nix@5495bbc
@cgwalters cgwalters changed the title lib: Lower bitflags to 1.2 lib: Lower bitflags to 1 Sep 27, 2021
@cgwalters cgwalters changed the title lib: Lower bitflags to 1 lib: Lower bitflags requirement to just "1" Sep 27, 2021
@cgwalters cgwalters enabled auto-merge September 27, 2021 17:29
@cgwalters
Copy link
Member Author

OK yep using just "1" works.

@cgwalters cgwalters merged commit bf17787 into ostreedev:main Sep 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants