diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-12-15 02:34:18 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-12-15 14:44:00 +0100 |
| commit | d70098ec63b6339d877ad47594d9f518b495f616 (patch) | |
| tree | 4f91587773a0be6d1187b9777a866d0196db8fc1 | |
| parent | 1710ed1f6f8ceb75cf7d1cf55ee0cc21760e1c7a (diff) | |
| download | nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar.gz nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar.bz2 nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar.lz nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar.xz nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.tar.zst nixpkgs-d70098ec63b6339d877ad47594d9f518b495f616.zip | |
flatpak: 1.14.0 → 1.14.1
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)
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/flatpak/no-breaking-fish.patch | 11 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index d79923c0f81..60ad2868318 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 2a67aead120..00000000000 --- 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 |