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

Jump to bottom

mesa: 19.2.1 -> 19.2.3 (and associated fixes) #72999

Merged
merged 24 commits into from Nov 10, 2019
Merged

mesa: 19.2.1 -> 19.2.3 (and associated fixes) #72999

merged 24 commits into from Nov 10, 2019

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Nov 7, 2019 •
edited

Motivation for this change

This was released the other day, and I want to use it on my AMD gpu.

A lot of things have changed upstream, mesa stopped providing a bunch of headers as libglvnd also provides the same headers (though not exactly the same), so we need a bit of fixups for some packages to build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that Affected packagesrelevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @vcunat

List of affected packages

New failures

None

Still failing (ie failing since before this PR)
  • python38Packages.pysonos
  • appeditor
  • liquidfun
  • python27Packages.neurotools - Package dropped, thanks @nico202
    A dependency is python3 only while neurotools is python2 only
    cc maintainer @nico202
  • python37Packages.tensorflow
  • python37Packages.edward
    Pulls in tensorflow
Unknown
  • qt59.qtwebkit
    I don't want to waste time on this package, it's not really used by anything
    A follow-up PR removing Qt 5.9 will be created
Notes
  • libGLU_combined should be removed in a follow-up PR

@adisbladis adisbladis changed the base branch from master to staging November 7, 2019 20:38
worldofpeace
worldofpeace suggested changes Nov 7, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Just one comment, obviously haven't tested anything yet.
The fixes to the GNOME/Gtk side of things are appreciated ✨

pkgs/servers/x11/xorg/default.nix Show resolved Hide resolved
@adisbladis
Copy link
Member Author

@GrahamcOfBorg build xorg.xorgserver

@jonringer
Copy link
Contributor

Is this for navi cards? because I would love to use my 5700XT xD

@adisbladis
Copy link
Member Author

adisbladis commented Nov 9, 2019 •
edited

@jonringer Hehe :) I'm using this from my 5700XT and it works great!

If you'd like to try it out with a bit less rebuilds I cherry picked the same commits on master in https://github.com/adisbladis/nixpkgs/tree/mesa-19_2_3-master.

@adisbladis
Copy link
Member Author

adisbladis commented Nov 9, 2019 •
edited

I have now tested this on MacOS too, I didn't find any new broken packages there either, but I have not run a full rebuild.

edit: MacOS needs some more testing before I feel 100% confident to merge.

@jonringer
Copy link
Contributor

wish i was at home with my 3900X to review this, on my laptop. If it's not merged by tomorrow, I'll review this :)

@adisbladis adisbladis mentioned this pull request Nov 10, 2019
Merged
10 tasks
@adisbladis
Copy link
Member Author

Pushed a patch to fix the qtbase build on Darwin and bumped the default version of Qt from 5.11 to 5.12 on Darwin.

This is required as Qt 5.11 no longer builds, and I'd rather spend my time fixing Qt 5.12 than going down the rabbit hole of patching old unsupported software.

@adisbladis
Copy link
Member Author

After a full nox-review on x86_64-linux (with only the failures listed in this PR) and a partial but fairly extensive Darwin rebuild (most graphical packages don't build on Darwin to begin with) I feel pretty good about this PR.

@adisbladis adisbladis merged commit 119b1b6 into NixOS:staging Nov 10, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
@adisbladis @dtzWill
Merge pull request NixOS#72999 from adisbladis/mesa-19_2_3
cbcda73 
mesa: 19.2.1 -> 19.2.3 (and associated fixes)
(cherry picked from commit 119b1b6)
@veprbl veprbl mentioned this pull request Nov 12, 2019
Closed
@eadwu
Copy link
Member

eadwu commented Nov 14, 2019

#73402

@FRidh
Copy link
Member

FRidh commented Nov 14, 2019

19.2.4 is now also in staging-next

@jonringer jonringer mentioned this pull request Nov 21, 2019
Merged
10 tasks
This was referenced Nov 23, 2019
Merged
Merged
B4dM4n added a commit to B4dM4n/nixpkgs that referenced this pull request Nov 27, 2019
@B4dM4n
egl-wayland: fix build
46e98a9 
Add headers that got moved in NixOS#72999
@hedning hedning mentioned this pull request Nov 27, 2019
Merged
10 tasks
@B4dM4n B4dM4n mentioned this pull request Nov 27, 2019
Merged
10 tasks
@corpix corpix mentioned this pull request Nov 28, 2019
Closed
10 tasks
corpix added a commit to corpix/nixpkgs that referenced this pull request Jul 21, 2022
@corpix
zam-plugins: fix build
2602b2a 
GL/gl.h was removed from mesa package in NixOS#72999, needs to be directly imported from libGL now
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace requested changes

@alyssais alyssais Awaiting requested review from alyssais

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@ttuegel ttuegel Awaiting requested review from ttuegel

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: qt/kde 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@adisbladis @worldofpeace @nico202 @jonringer @eadwu @FRidh