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.

Sign up for GitHub

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

Jump to bottom

zig: 0.8.1 -> 0.9.0 #151518

Merged
merged 1 commit into from
Jan 1, 2022
Merged

zig: 0.8.1 -> 0.9.0 #151518

merged 1 commit into from
Jan 1, 2022

Conversation

suhr
Copy link
Contributor

@suhr suhr commented Dec 21, 2021

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@McSinyx
Copy link
Member

McSinyx commented Dec 21, 2021

LOL no way you beat me to it 😄

@suhr
Copy link
Contributor Author

suhr commented Dec 21, 2021 

2 packages failed to build:
river zls

2 packages built:
clipbuzz zig

There are some breaking changes in new Zig.

@ofborg ofborg bot requested review from AndersonTorres and andrewrk December 21, 2021 07:43
@McSinyx
Copy link
Member

McSinyx commented Dec 21, 2021

Yay I'm the maintainer of the only future-proof Zig package! Jokes aside let me link zigtools/zls#438 and riverwm/river#489.

@ofborg ofborg bot requested a review from andrewrk December 23, 2021 11:22
@suhr suhr mentioned this pull request Dec 23, 2021
Closed
13 tasks
@suhr
Copy link
Contributor Author

suhr commented Dec 23, 2021

And zls now builds on 0.9.0. Do we need to wait until river is updated?

@McSinyx
Copy link
Member

McSinyx commented Dec 24, 2021

river 0.1.2 with zig 0.9 support has been released. I'm not sure how backward compatible 0.9 is but I suppose it might be easier to upgrade all of them in the same PR.

@suhr
Copy link
Contributor Author

suhr commented Dec 24, 2021

But river 0.1.2 requires wlroots 0.15.0 which is still in staging.
cast @primeos

Maybe there should be two versions of zig in nixpkgs for now.

@suhr
Copy link
Contributor Author

suhr commented Dec 24, 2021

Here we go, now there are two zigs and this PR can be safely merged.

@andrewrk
Copy link
Member

Here we go, now there are two zigs and this PR can be safely merged.

My absolute favorite thing about NixOS, hands down. (Not being sarcastic)

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package and removed 10.rebuild-darwin: 1 labels Dec 24, 2021
@moni-dz moni-dz mentioned this pull request Dec 25, 2021
Closed
13 tasks
moni-dz
moni-dz reviewed Dec 25, 2021
View reviewed changes
pkgs/top-level/all-packages.nix
Comment on lines +3599 to +3601
river = callPackage ../applications/window-managers/river {
zig = zig_0_8_1;
};
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
river = callPackage ../applications/window-managers/river {
zig = zig_0_8_1;
};
river = callPackage ../applications/window-managers/river { };

river 0.1.2 calls for zig 0.9.0 now, otherwise LGTM

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Isn't river 0.1.2 still in staging? And this PR is in master.

Copy link
Contributor

Choose a reason for hiding this comment

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

I decided not to target staging, and wait for the wlroots update to hit master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Then it should be zig = zig_0_8_1;, so this PR could be merged before the wlroots update hits the master.

@McSinyx
Copy link
Member

McSinyx commented Dec 30, 2021

GH-151234 with wlroots 0.15.0 has been merged, I think Zig 0.8.1 can be dropped now.

@suhr
Copy link
Contributor Author

suhr commented Dec 30, 2021

It's still 0.14.1 in master.

@McSinyx
Copy link
Member

McSinyx commented Dec 30, 2021

Right, sorry, my mistake.

@AndersonTorres
Copy link
Member

I wish you all a happy new year!

@AndersonTorres AndersonTorres merged commit e1eeb53 into NixOS:master Jan 1, 2022
@suhr suhr deleted the zig branch January 1, 2022 10:38
@Atemu Atemu mentioned this pull request Jan 15, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moni-dz moni-dz moni-dz left review comments

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@andrewrk andrewrk Awaiting requested review from andrewrk

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@suhr @McSinyx @andrewrk @AndersonTorres @moni-dz