[staging-next] xdg-desktop-portal: 1.18.4 -> 1.20.0#387894
[staging-next] xdg-desktop-portal: 1.18.4 -> 1.20.0#387894K900 merged 1 commit intoNixOS:staging-nextfrom
Conversation
github-actions
bot
added
6.topic: nixos
SuperSandro2000
left a comment
SuperSandro2000
left a comment
There was a problem hiding this comment.
LGTM with my limited xdp expierence
pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
Outdated
Show resolved
Hide resolved
K900
force-pushed
the
xdp-120
branch
2 times, most recently
from
87281e2 to
f389f9b
Compare
jtojnar
left a comment
jtojnar
left a comment
There was a problem hiding this comment.
Skimmed flatpak/xdg-desktop-portal@1.19.1...1.19.2, only noticed one minor thing.
That leaves flatpak/xdg-desktop-portal@1.18.4...1.19.1
K900
force-pushed
the
xdp-120
branch
3 times, most recently
from
ff38998 to
387d23b
Compare
jtojnar
left a comment
jtojnar
left a comment
There was a problem hiding this comment.
Skimmed through the remaining upstream diff. Did not notice anything problematic for us.
Should probably be squashed, as HEAD^^ does not build.
There was a problem hiding this comment.
Looks like this removes the D-Bus API docs. Not ideal but the extra closure is probably not worth it.
There was a problem hiding this comment.
Yeah, unfortunately this is as granular as the controls get.
There was a problem hiding this comment.
It this needed with docs disabled? Probably does not matter keeping it.
There was a problem hiding this comment.
I wonder if this was not supposed to be handled by the wrapGApp.
There was a problem hiding this comment.
Kinda, but wrapGApp-ing the Python tests doesn't really work as they're not called directly, they're imported by pytest.
There was a problem hiding this comment.
I wonder if we should a test for the sound validator too. Though TestNotification::test_sound_fd already appears to fail if we remove the patch.
validate-sound =
let
sound = fetchurl {
url = "https://github.com/xiph/opus-website/raw/refs/heads/master/static/examples/ehren-paper_lights-96.opus";
hash = "sha256-mX9aqiUo3oOSusP1kUDhqyS0kacASGl8jT3JHLQwDfM=";
};
in
runCommand "test-sound-validation" { } ''
${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-sound --sandbox --path=${sound} > "$out"
grep format=ogg/opus "$out"
'';There was a problem hiding this comment.
Yeah, tests failing are how I noticed it in the first place. I think we're fine here.
- remove unneeded dependencies - switch to wrapGAppsNoGuiHook - add patch to fix sound validation similar to icon validation - rebase other patches - use a single python env with all test dependencies, as pytest path is hardcoded into installed tests - fix installed tests, reenable location test (it works now) - clean up a bunch of old hacks Co-authored-by: aucub <[email protected]> Co-authored-by: Jan Tojnar <[email protected]>
4 participants
Needed for Pipewire 1.4.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.