summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2022-11-25 09:41:47 -0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-11-27 17:58:47 +0000
commita16ce18b404b68c179a603118f757c1a41f4ca5e (patch)
tree099af4854276689f924d0da955e530e563e27ed9
parentMerge pull request #203296 from NixOS/backport-203287-to-release-22.11 (diff)
downloadnixpkgs-a16ce18b404b68c179a603118f757c1a41f4ca5e.tar.gz
flatpak-builder: skip tests that depend on python2
(cherry picked from commit 9fc087f39cd43312ccdda3ef47c63ce3c333ae41)
-rw-r--r--pkgs/development/tools/flatpak-builder/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index ea3a5f0c2515..79845ddceea3 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -80,7 +80,9 @@ in stdenv.mkDerivation rec {
# this on our patch for Flatpak 0.99.
(substituteAll {
src = ./fix-test-paths.patch;
- inherit glibcLocales python2;
+ inherit glibcLocales;
+ # FIXME use python3 for tests that rely on python2
+ # inherit python2;
})
];
@@ -137,7 +139,7 @@ in stdenv.mkDerivation rec {
installedTestsDependencies = [
gnupg
ostree
- python2
+ # FIXME python2
gnumake
];