diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-11-27 22:23:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 22:23:28 +0000 |
| commit | ca4f9f11548aa493916481ec4ef26b6ae51c507f (patch) | |
| tree | 1e2262cd31e78f75c13fbd6a4a458bbda4055b28 | |
| parent | Merge pull request #203122 from NixOS/backport-200354-to-release-22.11 (diff) | |
| parent | flatpak-builder: skip tests that depend on python2 (diff) | |
| download | nixpkgs-ca4f9f11548aa493916481ec4ef26b6ae51c507f.tar.gz | |
Merge pull request #203308 from NixOS/backport-202884-to-release-22.11
[Backport release-22.11] flatpak-builder: skip tests that depend on python2
| -rw-r--r-- | pkgs/development/tools/flatpak-builder/default.nix | 6 |
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 ]; |