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

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

Merged
merged 24 commits into from Nov 10, 2019
Merged

Conversation

@adisbladis
Copy link
Member

adisbladis commented Nov 7, 2019

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
Copy link
Member

worldofpeace left a comment

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 added 5 commits Nov 7, 2019
@adisbladis adisbladis force-pushed the adisbladis:mesa-19_2_3 branch from 18df167 to 7668f68 Nov 9, 2019
@adisbladis

This comment has been minimized.

Copy link
Member Author

adisbladis commented Nov 9, 2019

@GrahamcOfBorg build xorg.xorgserver

@jonringer

This comment has been minimized.

Copy link
Contributor

jonringer commented Nov 9, 2019

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

@adisbladis

This comment has been minimized.

Copy link
Member Author

adisbladis commented Nov 9, 2019

@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

This comment has been minimized.

Copy link
Member Author

adisbladis commented Nov 9, 2019

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

This comment has been minimized.

Copy link
Contributor

jonringer commented Nov 9, 2019

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 added 2 commits Nov 10, 2019
Qt 5.11 does not build after the latest mesa update
@adisbladis adisbladis mentioned this pull request Nov 10, 2019
2 of 10 tasks complete
@ofborg ofborg bot added the 6.topic: qt/kde label Nov 10, 2019
@adisbladis

This comment has been minimized.

Copy link
Member Author

adisbladis commented Nov 10, 2019

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

This comment has been minimized.

Copy link
Member Author

adisbladis commented Nov 10, 2019

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
9 of 10 checks passed
9 of 10 checks passed
grahamcofborg-eval Calculating Changed Outputs
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
mesa: 19.2.1 -> 19.2.3 (and associated fixes)
(cherry picked from commit 119b1b6)
@eadwu

This comment has been minimized.

Copy link
Contributor

eadwu commented Nov 14, 2019

#73402

@FRidh

This comment has been minimized.

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
5 of 10 tasks complete
This was referenced Nov 23, 2019
B4dM4n added a commit to B4dM4n/nixpkgs that referenced this pull request Nov 27, 2019
Add headers that got moved in NixOS#72999
@hedning hedning mentioned this pull request Nov 27, 2019
1 of 10 tasks complete
@B4dM4n B4dM4n mentioned this pull request Nov 27, 2019
4 of 10 tasks complete
@corpix corpix mentioned this pull request Nov 28, 2019
2 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.