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

Update rules_nixpgks to HEAD and drop rules-nixpkgs-arm.patch #13798

Merged
merged 4 commits into from
May 10, 2022

Conversation

cbley-da
Copy link
Contributor

@cbley-da cbley-da commented May 5, 2022

Purpose

Drop the rules-nixpkgs-arm.patch from the rules_nixpkgs repository, since its changes have been brought upstream in rules_nixpkgs#191.

Changes

Question ❓

While we are at it, I really would like to drop the @com_github_digital_asset_daml//bazel_tools:nixpkgs-disable-http2.patch from rules_nixpkgs, too. This works around a problem that was seen with old nix versions and was fixed with nix 2.3.3 (NixOS/nix#2733 (comment))

Is it still feasible to maintain backward compatibility with nix < 2.3.3?

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description
  • If you mean to change the status of a component, please make sure you keep the Component Status page up to date.

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@cbley-da cbley-da force-pushed the update-rules_nixpkgs branch 4 times, most recently from 2b0abfe to f7b7438 Compare May 6, 2022 12:21
cbley-da added 4 commits May 6, 2022 14:27
Since [rules_nixpkgs#191] has been merged, we can drop the `rules-nixpkgs-arm.patch` from rules_nixpkgs.

Also, rules_nixpkgs has been split into several components which need to be
added explicitly in `deps.bzl`, see [#182].

[#191]: tweag/rules_nixpkgs#191
[#182]: tweag/rules_nixpkgs#182
It has been updated in rules_nixpkgs, so this just follows suite.
In rules_nixpkgs, this attribute is now used to determine whether the compiler is clang, see [#216].

[#216]: tweag/rules_nixpkgs#216

CHANGELOG_BEGIN
CHANGELOG_END
@cbley-da cbley-da force-pushed the update-rules_nixpkgs branch from f7b7438 to b2c9f47 Compare May 6, 2022 12:48
@cbley-da cbley-da changed the title Update rules_nixpgks to HEAD Update rules_nixpgks to HEAD and drop rules-nixpkgs-arm.patch May 6, 2022
@cbley-da cbley-da marked this pull request as ready for review May 6, 2022 15:22
@cbley-da cbley-da requested a review from garyverhaegen-da as a code owner May 6, 2022 15:22
Copy link
Contributor

@garyverhaegen-da garyverhaegen-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥

@garyverhaegen-da
Copy link
Contributor

garyverhaegen-da commented May 6, 2022

While we are at it, I really would like to drop

Happy to drop more patches. There shouldn't be any reason why we need to support old nixes as far as I'm aware. But please do that as a separate PR, as that seems unrelated to this change here.

@cbley-da
Copy link
Contributor Author

cbley-da commented May 9, 2022

Happy to drop more patches. There shouldn't be any reason why we need to support old nixes as far as I'm aware. But please do that as a separate PR, as that seems unrelated to this change here.

Please see #13820

@cbley-da cbley-da merged commit 38f4241 into main May 10, 2022
@cbley-da cbley-da deleted the update-rules_nixpkgs branch May 10, 2022 08:16
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