From d70098ec63b6339d877ad47594d9f518b495f616 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Dec 2022 02:34:18 +0100 Subject: [PATCH 1/2] =?UTF-8?q?flatpak:=201.14.0=20=E2=86=92=201.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/flatpak/releases/tag/1.14.1 SUMMARY: total=50; passed=38; skipped=0; failed=12; user=1229.5s; system=929.6s; maxrss=441956 FAIL: flatpak/test-bundle@system.wrap.test (Child process exited with code 1) FAIL: flatpak/test-bundle@user.wrap.test (Child process exited with code 1) FAIL: flatpak/test-prune.sh.test (Child process exited with code 1) FAIL: flatpak/test-run@system,nodeltas.wrap.test (Child process exited with code 1) FAIL: flatpak/test-bundle@system-norevokefs.wrap.test (Child process exited with code 1) FAIL: flatpak/test-run@system-norevokefs,nodeltas.wrap.test (Child process exited with code 1) FAIL: flatpak/test-run@system-norevokefs,deltas.wrap.test (Child process exited with code 1) FAIL: flatpak/test-run@user,deltas.wrap.test (Child process exited with code 1) FAIL: flatpak/test-run@system,deltas.wrap.test (Child process exited with code 1) FAIL: flatpak/test-history.sh.test (Child process exited with code 1) FAIL: flatpak/test-seccomp.sh.test (Child process exited with code 1) FAIL: flatpak/test-run@user,nodeltas.wrap.test (Child process exited with code 1) --- pkgs/development/libraries/flatpak/default.nix | 8 ++------ .../libraries/flatpak/no-breaking-fish.patch | 11 ----------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/flatpak/no-breaking-fish.patch diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index d79923c0f81a..60ad2868318f 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.0"; + version = "1.14.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch - # Do not clear XDG_DATA_DIRS in fish shell - # https://github.com/flatpak/flatpak/pull/5123 - ./no-breaking-fish.patch - # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch diff --git a/pkgs/development/libraries/flatpak/no-breaking-fish.patch b/pkgs/development/libraries/flatpak/no-breaking-fish.patch deleted file mode 100644 index 2a67aead1201..000000000000 --- a/pkgs/development/libraries/flatpak/no-breaking-fish.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/profile/flatpak.fish -+++ b/profile/flatpak.fish -@@ -1,7 +1,7 @@ - if type -q flatpak - # Set XDG_DATA_DIRS to include Flatpak installations - -- set -x --path XDG_DATA_DIRS -+ set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS - - set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share - set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share From 94cc90f0d15a2d0bd7c2af20689c082df5d5b963 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 15 Dec 2022 02:39:42 +0100 Subject: [PATCH 2/2] =?UTF-8?q?xdg-desktop-portal:=201.15.0=20=E2=86=92=20?= =?UTF-8?q?1.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.16.0 SUMMARY: total=6; passed=4; skipped=0; failed=2; user=1.1s; system=0.9s; maxrss=26012 FAIL: xdg-desktop-portal/test-portals.test (Child process killed by signal 6) FAIL: xdg-desktop-portal/test-document-fuse.sh.test (Child process killed by signal 9) --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 438940f3bac6..2cadab4a6742 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; - version = "1.15.0"; + version = "1.16.0"; outputs = [ "out" "installedTests" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = finalAttrs.version; - sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; + sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA="; }; patches = [