Skip to content

nanovg and monomer can build on darwins#348537

Closed
yuanwang-wf wants to merge 154 commits intoNixOS:haskell-updatesfrom
yuanwang-wf:monomer-not-broken-on-mac
Closed

nanovg and monomer can build on darwins#348537
yuanwang-wf wants to merge 154 commits intoNixOS:haskell-updatesfrom
yuanwang-wf:monomer-not-broken-on-mac

Conversation

@yuanwang-wf
Copy link

@yuanwang-wf yuanwang-wf commented Oct 14, 2024

I think haskell packages nanovg and monomer were marked with badPlatforms with darwin were due to mesa cannot build on darwin. #272166 fix mesa build on darwin. I tested build a monomer app on aarch64-darwin, the app renders correctly afaict

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Oct 14, 2024
@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Oct 14, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 14, 2024
@maralorn
Copy link
Member

maralorn commented Oct 16, 2024 •
edited
Loading

Thx! 😄

This is an autogenerated file. Please locate the lines corresponding to those packages in the hackage2nix-configuration/main.yaml file next to it and adapt them accordingly. Then run maintainers/scripts/haskell/regenerate-hackage-packages.sh.

@maralorn
Copy link
Member

maralorn commented Oct 16, 2024

Both files still seem a bit inconsistent.
Please also follow the contributing guide lines and squash everything into one commit.

@yuanwang-wf yuanwang-wf force-pushed the monomer-not-broken-on-mac branch from c161b50 to 81295f4 Compare October 16, 2024 23:41
@yuanwang-wf
Copy link
Author

yuanwang-wf commented Oct 16, 2024

Both files still seem a bit inconsistent. Please also follow the contributing guide lines and squash everything into one commit.

Sorry about that. there are some webkitgtk changes. I am not sure about them. I think this is ready for another look. thank you for your time

@maralorn
Copy link
Member

maralorn commented Oct 16, 2024

  1. Mark this PR a draft.
  2. Rebase your commit onto haskell-updates and force push.
  3. Change the base of this pr to haskell-updates
  4. Unmark draft.

Then maybe rerun the script and hopefully the webkit changes disappear.

@yuanwang-wf yuanwang-wf marked this pull request as draft October 17, 2024 00:07
mweinelt and others added 17 commits October 16, 2024 18:10
@mweinelt @yuanwang-wf
evcc: 0.130.9 -> 0.130.13
9ab418c 
https://github.com/evcc-io/evcc/releases/tag/0.130.10
https://github.com/evcc-io/evcc/releases/tag/0.130.11
https://github.com/evcc-io/evcc/releases/tag/0.130.12
https://github.com/evcc-io/evcc/releases/tag/0.130.13
@jian-lin @yuanwang-wf
emacsPackages.psgml: add upstream bug link
9cce40a
@jian-lin @yuanwang-wf
emacsPackages.chronometrist-key-values: override when only needed
5197f37
@jian-lin @yuanwang-wf
emacsPackages.frontside-javascript: override only when needed
54ce6ab
@jian-lin @yuanwang-wf
emacsPackages.alectryon: override only when needed
870f259
@jian-lin @yuanwang-wf
emacsPackages.bpr: override only when needed
6d6fcbc
@dotlambda @yuanwang-wf
python312Packages.icalendar: 5.0.13 -> 6.0.0
ff4389c 
Diff: collective/icalendar@refs/tags/v5.0.13...v6.0.0

Changelog: https://github.com/collective/icalendar/blob/v6.0.0/CHANGES.rst
@dotlambda @yuanwang-wf
python312Packages.x-wr-timezone: 0.0.7 -> 1.0.1
710965b 
Diff: niccokunzmann/x-wr-timezone@v0.0.7...v1.0.1

Changelog: https://github.com/niccokunzmann/x-wr-timezone/blob/v1.0.1/README.rst#changelog
@dotlambda @yuanwang-wf
python312Packages.recurring-ical-events: 3.3.0 -> 3.3.2
13a7f03 
Diff: niccokunzmann/python-recurring-ical-events@v3.3.0...v3.3.2

Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/v3.3.2/README.rst#changelog
@dotlambda @yuanwang-wf
xandikos: fix compatibility with icalendar v6
170bc03
@dotlambda @yuanwang-wf
xandikos: modernize
a380503
@dotlambda @yuanwang-wf
todoman: depends on pytz
0d1329b
@dotlambda @yuanwang-wf
todoman: modernize
ccf534f
@dotlambda @yuanwang-wf
python312Packages.icalevents: fix compatibility with icalendar v6
a5e6db8
@dotlambda @yuanwang-wf
python312Packages.icalendar: 6.0.0 -> 6.0.1
06dc95b 
Diff: collective/icalendar@refs/tags/v6.0.0...v6.0.1

Changelog: https://github.com/collective/icalendar/blob/v6.0.1/CHANGES.rst
@dotlambda @yuanwang-wf
autosuspend: 7.0.1 -> 7.0.2
147fa86 
Diff: languitar/autosuspend@refs/tags/v7.0.1...v7.0.2

Changelog: https://github.com/languitar/autosuspend/releases/tag/v7.0.2
@dotlambda @yuanwang-wf
khal: pin icalendar at 5.0.13
6c6a8a6
melvyn2 and others added 13 commits October 16, 2024 18:19
@melvyn2 @yuanwang-wf
sof-firmware: add new files from 2024.09
51d59cf
@r-ryantm @yuanwang-wf
apkeep: 0.16.0 -> 0.17.0
5588005
@FlameFlag @yuanwang-wf
gallery-dl: 1.27.5 -> 1.27.6
8462ca4 
Changelog: https://github.com/mikf/gallery-dl/releases/tag/v1.27.6
Diff: mikf/gallery-dl@v1.27.5...v1.27.6
@SharzyL @yuanwang-wf
riscv-pk: 1.0.0 -> unstable-2024-10-09
999e749
@marius851000 @yuanwang-wf
python3Packages.skytemple-ssb-emulator: 1.6.4 -> 1.8.0, fetch from Gi…
52b1a45 
…tHub

SkyTemple/skytemple-ssb-emulator@1.6.4...1.8.0
@marius851000 @yuanwang-wf
python3Packages.skytemple-ssb-debugger: 1.7.0 -> 1.8.2
822e557 
SkyTemple/skytemple-ssb-debugger@1.7.0...1.8.2
@marius851000 @yuanwang-wf
python3Packages.pmdsky-debug-py: 8.0.4 -> 10.0.21
d3e94a4 
SkyTemple/pmdsky-debug-py@8.0.4...10.0.21
@marius851000 @yuanwang-wf
python3Packages.explorerscript: 0.1.3 -> 0.2.1.post2, do not rebuild …
bd534d9 
…antlr files

SkyTemple/ExplorerScript@0.1.5...0.2.1.post2
@marius851000 @yuanwang-wf
python3Packages.skytemple-rust: 1.6.5 -> 1.8.2, fetch from GitHub
06b239c 
SkyTemple/skytemple-rust@1.6.5...1.8.2
@marius851000 @yuanwang-wf
python3Packages.skytemple-files: 1.7.0 -> 1.8.3
09ab712 
SkyTemple/skytemple-files@1.7.0...1.8.3
@marius851000 @yuanwang-wf
skytemple: 1.6.5 -> 1.8.3
bf60c84 
SkyTemple/skytemple@1.6.5...1.8.3
@r-ryantm @yuanwang-wf
tmux-sessionizer: 0.4.2 -> 0.4.3
6f66c01
@yuanwang-wf
nanovg and monomer can build on darwins
3d49a60 
update badPlatform list
update hackage-packages
@yuanwang-wf yuanwang-wf force-pushed the monomer-not-broken-on-mac branch from 81295f4 to 3d49a60 Compare October 17, 2024 00:20
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Oct 17, 2024
@yuanwang-wf yuanwang-wf changed the base branch from master to haskell-updates October 17, 2024 00:21
@maralorn
Copy link
Member

maralorn commented Oct 17, 2024

Oh, damn. I should have said cherry-pick your commit on top of haskell-updates, not rebase it.

@yuanwang-wf
Copy link
Author

yuanwang-wf commented Oct 17, 2024

should i just open a PR to haskell-update branch ?

@maralorn
Copy link
Member

maralorn commented Oct 17, 2024

In theory this PR is still salvagable, but you can also just open a new one.

@yuanwang-wf yuanwang-wf deleted the monomer-not-broken-on-mac branch October 17, 2024 00:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maralorn maralorn Awaiting requested review from maralorn

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.