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

KDE: update frameworks and applications #22698

Merged
merged 8 commits into from Feb 14, 2017
Merged

KDE: update frameworks and applications #22698

merged 8 commits into from Feb 14, 2017

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Feb 12, 2017

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@FRidh, thanks for your PR! By analyzing the history of the files in this pull request, we identified @phunehehe, @vandenoever and @amiddelk to be potential reviewers.

@FRidh
Copy link
Member Author

FRidh commented Feb 12, 2017

Some packages are still being build.

@FRidh FRidh changed the base branch from master to staging February 12, 2017 09:54
fallbackPackage(0),
metadata(0),
fallbackPackage(nullptr),
metadata(nullptr),
- externalPaths(false),
+ externalPaths(true),
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are external paths allowed?
KPackage documentation says:

/**
 * @return true if paths/symlinks outside the package itself should be followed.
 * By default this is set to false for security reasons.
 */
bool allowExternalPaths() const;

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess because we use symbolic links in our wrapper.

Copy link
Contributor

Choose a reason for hiding this comment

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

You changed the setting, from true to false no? Did you encounter problems when the value was false?

Copy link
Member Author

Choose a reason for hiding this comment

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

That change was already present in the previous patch. Note which signs are part of the patch and which are GitHub's.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see now. The coloring is also applied to unchanged files. That confused me.
I've no problems with the patch as I read it, but I've not tested it.

Copy link
Member

Choose a reason for hiding this comment

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

@vandenoever I added this patch. It is required for Plasma to work at all. KDE upstream considers this to be a "security feature" but that's nonsense: if your "security" requires ignoring symlinks, you don't have "security".

@FRidh
Copy link
Member Author

FRidh commented Feb 14, 2017

Three packages fail

error: build of ‘/nix/store/bx24fh396ci9r10q7w3wxa2n8snm103z-digikam-5.4.0.drv’, ‘/nix/store/hiwvyp6d184l5i95wfawnh5hpqil5nfk-krita-3.1.1.drv’, ‘/nix/store/yln22jcj2f9x2iv3d7bbgjbl2ksxmd9k-screengrab-unstable-2016-09-12.drv’ failed

@FRidh
Copy link
Member Author

FRidh commented Feb 14, 2017

@ttuegel I'm using this branch now without any issues. Merge?

@the-kenny
Copy link
Contributor

I think we can remove kde.digikam (4) completely (instead of marking it as broken) if digikam5 works fine. I'm building it from this branch right now for testing.

@ttuegel
Copy link
Member

ttuegel commented Feb 14, 2017

We can address the removal of old Digikam versions later; most KDE 4 packages will shortly be removed anyway.

@ttuegel ttuegel merged commit f228ea5 into NixOS:staging Feb 14, 2017
@vcunat
Copy link
Member

vcunat commented Feb 18, 2017

There are several new build failures in KDE stuff on staging, most likely due to this merge: http://hydra.nixos.org/eval/1333416?filter=&compare=1333281&full=#tabs-now-fail It often seems like they're due to using a different c++ standard, e.g. those errors about not recognizing nullptr.

@vcunat
Copy link
Member

vcunat commented Feb 18, 2017

Oh, you discussed this already. Note that it's the new digikam5 that's reported as failing.

vcunat added a commit that referenced this pull request Feb 18, 2017
This fixes build after KDE updates in f228ea5 #22698.
/cc maintainer @abbradar.  I only tested starting it up.
@the-kenny
Copy link
Contributor

Huh, I actually tried digikam5 after merging this. I'll investigate.

@vcunat
Copy link
Member

vcunat commented Feb 18, 2017

@the-kenny: it was only merged to staging, not master. Now it's in master.

peterhoeg pushed a commit to peterhoeg/nixpkgs that referenced this pull request Feb 18, 2017
@the-kenny
Copy link
Contributor

the-kenny commented Feb 18, 2017 via email

@FRidh FRidh deleted the kde branch February 22, 2017 13:26
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

6 participants