Unverified Commit ca4f9f11 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #203308 from NixOS/backport-202884-to-release-22.11 

[Backport release-22.11] flatpak-builder: skip tests that depend on python2
parents 1b5181f8 a16ce18b

pkgs/development/tools/flatpak-builder/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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

    ];