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

treewide: Remove libGLU_combined #73261

Merged
merged 5 commits into from Nov 19, 2019

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Nov 11, 2019

Motivation for this change

This old compatibility hack has started causing real issues after mesa restructured headers.

These changes broke qt 5.9 and 5.11, as I don't want to fiddle around with old software (and in the case of Qt 5.11 it's unsupported by upstream anyway) I decided to drop these package sets.

merkaartor is the only package I know was broken by this change.

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 relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@alyssais
Copy link
Member

alyssais commented Nov 12, 2019 via email

@adisbladis
Copy link
Member Author

adisbladis commented Nov 12, 2019

@alyssais There are zero packages depending on it and even older "supported" Qt versions break relatively often.
I don't see any reason to keep it around, it only adds maintenance burden and longer build times for testing these kind of large changes.

If someone else is willing to put in the work to fix Qt 5.9, sure, keep it. But I'm not going to do it.

@FRidh FRidh added this to WIP in Staging Nov 12, 2019
@FRidh FRidh removed this from WIP in Staging Nov 12, 2019
@FRidh FRidh added this to WIP in Staging Nov 12, 2019
@alyssais
Copy link
Member

There are zero packages depending on it

Unless I’m missing something, there are, but you just marked them as broken? bcc125c#diff-6367cbd678e23a7acd08a81656356e26

@adisbladis
Copy link
Member Author

adisbladis commented Nov 14, 2019

Fixed merkaartor build in ff5f891. This PR should be ready to go.

Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

You cannot simply edit pkgs/development/haskell-modules/hackage-packages.nix manually. Any changes you make there will be lost when the generator for that file runs. Breaking changes that affect the Haskell package set must be coordinated with cabal2nix2 to work properly.

@peti
Copy link
Member

peti commented Nov 14, 2019

@adisbladis, can you please address @alyssais comment #73261 (comment)?

@adisbladis
Copy link
Member Author

@peti I've reported an issue in cabal2nix. I didn't even know I was editing generated files that needed any coordination since I was just doing find & replace over all of nixpkgs.

The build marked as broken was fixed in ff5f891

@FRidh
Copy link
Member

FRidh commented Nov 14, 2019

Is there anything against having the hooks from PostProcess.hs in a file in Nixpkgs, and patch cabal2nix with that contents so we can avoid having to sync with another repo?

@peti
Copy link
Member

peti commented Nov 14, 2019

Is there anything against having the hooks from PostProcess.hs in a file in Nixpkgs, and patch cabal2nix with that contents so we can avoid having to sync with another repo?

It's not just that one module. That kind of Nixpkgs-specific know-how is hard-coded all throughout cabal2nix. We'd have to put pretty much all of cabal2nix into Nixpkgs, and that doesn't feel like a good solution.

@adisbladis
Copy link
Member Author

If there are no problems I will merge this one within the next 48 hours.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

Didn't do much testing as im traveling, but I like the intention of the PR

@alyssais
Copy link
Member

alyssais commented Nov 18, 2019 via email

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

Successfully merging this pull request may close these issues.

None yet

6 participants