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

Plasma Mobile Gear: 21.05 -> 21.06 -> 21.07 -> 21.08 #130151

Merged
merged 15 commits into from
Oct 22, 2021

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Jul 14, 2021

Motivation for this change

Issues

✔️ YES ready for review now

  • kweather will segfault under X11, but runs just fine under Plasma Mobile. ¯\_(ツ)_/¯

Relevant people

cc @SCOTT-HAMILTON (for keysmith upgrade)
cc @dotlambda (for angelfish shuffling around)

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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Relase 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.

I ran all the apps under X11, and under a Plasma Mobile VM.

@samueldr
Copy link
Member Author

pkgs/applications/plasma-mobile/koko.nix Outdated Show resolved Hide resolved
pkgs/applications/plasma-mobile/koko.nix Outdated Show resolved Hide resolved
pkgs/applications/kde/kpublictransport.nix Outdated Show resolved Hide resolved
@samueldr samueldr force-pushed the feature/plasma-mobile-gear-21.06 branch from 9e38644 to 7e78321 Compare October 6, 2021 20:30
@samueldr samueldr changed the title Plasma Mobile Gear: 21.05 -> 21.06 Plasma Mobile Gear: 21.05 -> 21.06 -> 21.07 -> 21.08 Oct 7, 2021
@samueldr samueldr marked this pull request as ready for review October 7, 2021 01:01
@samueldr
Copy link
Member Author

samueldr commented Oct 7, 2021

@dotlambda review requested for angelfish

@SCOTT-HAMILTON review requested for keysmith

@samueldr samueldr mentioned this pull request Oct 7, 2021
10 tasks
@samueldr
Copy link
Member Author

samueldr commented Oct 16, 2021

TODO

  • Break evaluation of angelfish's cargo dependencies to prevent accidental bad updates

pkgs/applications/plasma-mobile/audiotube.nix Show resolved Hide resolved
, python3Packages
}:

mkDerivation rec {
Copy link
Member

Choose a reason for hiding this comment

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

I think you can use buildPythonApplication and get rid of wrapPython as well as $PYTHONPATH.

Copy link
Member Author

Choose a reason for hiding this comment

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

Does buildPythonApplication automatically composes with the specially injected mkDerivation? Remember that this is not stdenv.mkDerivation, but a special cased variant with multiple differences.

Copy link
Member

Choose a reason for hiding this comment

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

I think so cause I remember using it together with libsForQt5.callPackage and everything just working.

Copy link
Member Author

Choose a reason for hiding this comment

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

Can't see how it would work, and grepping around for buildPythonApplication I can't see any in "kde sauce" mkDerivation, which reminder here, do more than even the one from libsForQt5.callPackage.

Also note that I know next to nothing to how python things work generally, and then not really much more in Nixpkgs. I'll be glad to apply changes, but it looks like some other packages will need similar fixes if it is possible.

pkgs/applications/plasma-mobile/keysmith.nix Show resolved Hide resolved
@samueldr samueldr force-pushed the feature/plasma-mobile-gear-21.06 branch from e87b68a to 94a44db Compare October 18, 2021 20:11
@ofborg ofborg bot requested a review from dotlambda October 18, 2021 20:27
The hardcoded cargo hash could have been left unchanged on package
updates. By breaking the build explicitly we ensure partial updates
won't accidentally slip past us.
@samueldr samueldr force-pushed the feature/plasma-mobile-gear-21.06 branch from af67116 to 88fe1fe Compare October 20, 2021 00:43
@samueldr samueldr merged commit 028159e into NixOS:master Oct 22, 2021
@samueldr samueldr deleted the feature/plasma-mobile-gear-21.06 branch October 22, 2021 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants