Skip to content

resholve: work around nixpkgs aarch64-darwin issues#155251

Merged
happysalada merged 1 commit intoNixOS:masterfrom
abathur:resholve_oildev_workaround
Jan 27, 2022
Merged

resholve: work around nixpkgs aarch64-darwin issues#155251
happysalada merged 1 commit intoNixOS:masterfrom
abathur:resholve_oildev_workaround

Conversation

@abathur
Copy link
Member

@abathur abathur commented Jan 16, 2022

These are hopefully both just short-term workarounds.

The OfBorg results should clarify whether this works.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 16, 2022
@winterqt
Copy link
Member

Result of nixpkgs-review pr 155251 run on aarch64-darwin 1

3 packages failed to build:
  • bashup-events32
  • bashup-events44
  • resholve

@abathur abathur marked this pull request as ready for review January 20, 2022 06:43
@abathur abathur marked this pull request as draft January 20, 2022 06:44
@abathur abathur mentioned this pull request Jan 20, 2022
13 tasks
@abathur abathur force-pushed the resholve_oildev_workaround branch from 9339845 to 014a70c Compare January 25, 2022 20:49
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Jan 26, 2022
@abathur abathur force-pushed the resholve_oildev_workaround branch 2 times, most recently from d2a23b3 to bdeb231 Compare January 26, 2022 02:50
- add an oil-dev patch to work around build failure documented in
  NixOS#154203
- override configargparse to disable tests and work around failure
  reported in NixOS#156807
@abathur abathur force-pushed the resholve_oildev_workaround branch from bdeb231 to a0c7e0e Compare January 26, 2022 04:12
@abathur abathur marked this pull request as ready for review January 26, 2022 04:37
@abathur
Copy link
Member Author

abathur commented Jan 26, 2022

Reopening for review since ofborg aarch64-darwin ran clean.

@abathur abathur requested a review from happysalada January 26, 2022 04:41
@abathur abathur changed the title resholve: work around nixpkgs aarch64-darwin issue resholve: work around nixpkgs aarch64-darwin issues Jan 26, 2022
@happysalada
Copy link
Contributor

the fix makes sense, and ofborg pass.
happy to merge at this point. Leaving this open in case you are looking for more feedback.

@abathur
Copy link
Member Author

abathur commented Jan 26, 2022

I am a bit unsure about the override approach, but if it passes your gut check it is probably fine. :)

@happysalada
Copy link
Contributor

Like you said, it's a short term fix :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants