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 5.20 #104810

Merged
merged 36 commits into from Dec 13, 2020
Merged

Plasma 5.20 #104810

merged 36 commits into from Dec 13, 2020

Conversation

Thra11
Copy link
Member

@Thra11 Thra11 commented Nov 24, 2020

Motivation for this change

Update to the latest plasma version

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/)
  • 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.

@Thra11
Copy link
Member Author

Thra11 commented Nov 24, 2020

Not building yet:

cycle detected in the references of '/nix/store/2hd7a5hlazsh3p166s6qra9ls3x72y2b-kglobalaccel-5.76.0' from '/nix/store/p2cxq2vjbjmjz2vmgz9r5lz63vgkjjwa-kglobalaccel-5.76.0-bin'
error: build of '/nix/store/z492yvhrmbdz677iflvwqg6bz4gi4d5c-kglobalaccel-5.76.0.drv' on 'ssh://thrall@192.168.1.2' failed: cycle detected in the references of '/nix/store/2hd7a5hlazsh3p166s6qra9ls3x72y2b-kglobalaccel-5.76.0' from '/nix/store/p2cxq2vjbjmjz2vmgz9r5lz63vgkjjwa-kglobalaccel-5.76.0-bin'

Note: kde-frameworks update is required for plasma 5.20. Can split the two commits into separate PRs if the plasma update ends up holding things up, but at the moment its the other way round.

@Thra11 Thra11 mentioned this pull request Nov 24, 2020
10 tasks
@hamburger1984
Copy link
Contributor

@Thra11 this might be a noobie question, but how can I trigger building kde-frameworks and plasma? (on my machine that is)

@Thra11
Copy link
Member Author

Thra11 commented Dec 2, 2020

@Thra11 this might be a noobie question, but how can I trigger building kde-frameworks and plasma? (on my machine that is)

That's a very good question. I think you can use the plasma5 and kdeFrameworks attributes to build all the packages in the sets, so either

nix-build '<nixpkgs>' -A plasma5

or

nix build nixpkgs.plasma5

and either

nix-build '<nixpkgs>' -A kdeFrameworks

or

nix build nixpkgs.kdeFrameworks

There's also a tool called nixpkgs-review which can help build things which have changed (so it would attempt to rebuild things which depend on plasma and kde frameworks in addition to the packages themselves) Not super familiar with how to use it, but I think you can do something like this:

nix-shell -p nixpkgs-review --run "nixpkgs-review wip"

@hamburger1984
Copy link
Contributor

hamburger1984 commented Dec 3, 2020

Trying to understand the circle..

git clone git@github.com:Thra11/nixpkgs.git
cd nixpkgs
git checkout plasma-5-20

Remove everything related to "user-manager" from pkgs/desktop/plasma-5/default.nix!

export NIXPKGS="$(pwd)"
nix-build $NIXPKGS -A plasma5 -vvvvv 2>&1 | tee ../plasma5_build.log
cd ..
wget https://gist.github.com/hamburger1984/7e23e3de3965ba0ca3954c948eacd140/raw/beab4fcb5503e39ff98bfdb8fe9eb158c6ddc83e/analyze_build.py
python analyze_build.py -l plasma5_build.log

--> https://gist.github.com/hamburger1984/77d15d4b27c7b49b528a7ecadb8ea5c2

(using this script: https://gist.github.com/hamburger1984/7e23e3de3965ba0ca3954c948eacd140)

@hamburger1984
Copy link
Contributor

This seems to fix the circle: hamburger1984@b03aa6d

Basically: specify outputs in kglobalaccel.nix

@hamburger1984
Copy link
Contributor

Upgraded to 5.20.4 + adjusted some dependencies and patches. It builds now, @Thra11 please have a look and maybe include Thra11#3

@eliasp
Copy link
Member

eliasp commented Dec 4, 2020

Looks good so far, except of the sddm Breeze theme...
DSC_3647.JPG

@Thra11 Thra11 marked this pull request as ready for review December 4, 2020 14:10
@Thra11 Thra11 requested a review from ttuegel as a code owner December 4, 2020 14:10
@jdnixx
Copy link

jdnixx commented Dec 4, 2020

@eliasp just curious, how did you override your local system modules to get that to work? I was trying last night, but still pretty dumb when it comes to nix's workings. Do you just have to create overrides(/overlays?) for these like 8 packages, and it should work? Or do you have to do something more complicated within services.xserver.desktopManager.plasma5...
image

@eliasp
Copy link
Member

eliasp commented Dec 4, 2020

@jdnixx I use
nixos-rebuild -I nixpkgs=/home/eliasp/code-repositories/public/nixos/nixpkgs build
to build from my local repository clone or
nixos-rebuild -I nixpkgs=/home/eliasp/code-repositories/public/nixos/nixpkgs switch
to build + switch.

@ttuegel
Copy link
Member

ttuegel commented Dec 5, 2020

The code changes look alright to me. I'll start building this tonight so I can test in the morning.

@ttuegel
Copy link
Member

ttuegel commented Dec 5, 2020

I'm getting this error from kapidox now:

build flags: -j8 -l8 SHELL=/nix/store/avpb88nl8gx2ghfj6w704b5sfzldn8rn-bash-4.4-p23>
Scanning dependencies of target build
Traceback (most recent call last):
  File "setup.py", line 4, in <module>
    from setuptools import setup
ImportError: No module named setuptools

@hamburger1984
Copy link
Contributor

I'm getting this error from kapidox now:

build flags: -j8 -l8 SHELL=/nix/store/avpb88nl8gx2ghfj6w704b5sfzldn8rn-bash-4.4-p23>
Scanning dependencies of target build
Traceback (most recent call last):
  File "setup.py", line 4, in <module>
    from setuptools import setup
ImportError: No module named setuptools

@Thra11 or @ttuegel can you cherry-pick this commit hamburger1984@17afe22

@Kiwi
Copy link
Member

Kiwi commented Dec 5, 2020

I'm getting this error from kapidox now:

build flags: -j8 -l8 SHELL=/nix/store/avpb88nl8gx2ghfj6w704b5sfzldn8rn-bash-4.4-p23>
Scanning dependencies of target build
Traceback (most recent call last):
  File "setup.py", line 4, in <module>
    from setuptools import setup
ImportError: No module named setuptools

@Thra11 or @ttuegel can you cherry-pick this commit hamburger1984@17afe22

This is what I came up with too but I think that it is broken? (and already was) even with that. at least most of the binaries do not work.

05:23:07 [kiwi@mvp-nixos nixpkgs]$ for i in /nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/*; do echo -e "\nrealpath $i"; $i; done

realpath /nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/depdiagram-generate
Traceback (most recent call last):
  File "/nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/depdiagram-generate", line 4, in <module>
    __import__('pkg_resources').run_script('kapidox==5.76.0', 'depdiagram-generate')
ModuleNotFoundError: No module named 'pkg_resources'

realpath /nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/depdiagram-generate-all
Usage: depdiagram-generate-all <dot_dir> <png_dir>

realpath /nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/depdiagram-prepare
Traceback (most recent call last):
  File "/nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/depdiagram-prepare", line 4, in <module>
    __import__('pkg_resources').run_script('kapidox==5.76.0', 'depdiagram-prepare')
ModuleNotFoundError: No module named 'pkg_resources'

realpath /nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/kapidox_generate
Traceback (most recent call last):
  File "/nix/store/xirljrmj32n8l22k3ajpi5ml5s9nqr1p-kapidox-5.76.0-bin/bin/kapidox_generate", line 4, in <module>
    __import__('pkg_resources').run_script('kapidox==5.76.0', 'kapidox_generate')
ModuleNotFoundError: No module named 'pkg_resources'

I don't think that's what it's supposed to do but I'm not sure. 😄

@ttuegel
Copy link
Member

ttuegel commented Dec 5, 2020

@Kiwi You're right, the build passes on master, but the package is broken. There aren't any packages that depend on it; maybe we should just remove it.

@Kiwi
Copy link
Member

Kiwi commented Dec 5, 2020

I tried for a while to figure out how to fix them but did not succeed (yet). I might figure it out eventually. Between that and electron apps I've spent the last 10+ hours not getting anything to work. :(

@ttuegel
Copy link
Member

ttuegel commented Dec 6, 2020

I have marked all the updated packages which are broken with Qt < 5.15. However, this breaks a number of other packages which depend on KDE Frameworks, that are pinned to older versions of Qt. We need to investigate these failures, at least:

  • calligra
  • digikam
  • digikam5
  • i-score
  • kdeApplications.konqueror
  • kdeApplications.rocs
  • kdevelop
  • lxqt.lxqt-config
  • trojita
  • wacomtablet
  • zanshin

I haven't investigated at all, so some of these may be marked broken already. For those, nothing else needs to be done.

In the meantime, I will start testing Plasma, too.

@Thra11
Copy link
Member Author

Thra11 commented Dec 6, 2020

wacomtablet should have been fixed /updated to Qt 5.15 by #104660 (which may have been merged after the commit this PR is based on)

@ttuegel
Copy link
Member

ttuegel commented Dec 8, 2020

Besides the SDDM theme, I noticed that KWin compositing is broken. Also, the KPanel settings reverted to the default configuration.

@eliasp
Copy link
Member

eliasp commented Dec 8, 2020

Besides the SDDM theme, I noticed that KWin compositing is broken. Also, the KPanel settings reverted to the default configuration.

There's something wrong with the panel and its effect on kwin... maximized windows don't take the panel into account anymore and just disappear behind the panel.
Not sure whether that's a problem on our side or upstream.

@poscat0x04 poscat0x04 mentioned this pull request Dec 13, 2020
10 tasks
@ttuegel
Copy link
Member

ttuegel commented Dec 13, 2020

As soon as I can see this evaluate on CI, then we're good to go! 🚀

@Kiwi
Copy link
Member

Kiwi commented Dec 13, 2020

the bot has spoken.

@ttuegel ttuegel merged commit 39b7603 into NixOS:staging Dec 13, 2020
@poscat0x04
Copy link
Contributor

🎉

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

7 participants