Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ea79d2707e0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f65f6338fa7f
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 16, 2020

  1. quodlibet: fix tests 

    - Add XDG_ICONS_DIRS to XDG_DATA_DIRS so tests can see icons.
- Skip quality tests and remove their dependencies.
- Add gdk-pixbuf to checkInputs to fix a test that uses SVGs.
    @101100
    101100 committed Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    GPG key ID: 6BA7C26C3FDF7BB3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b2a7d47 View commit details

Commits on Jan 17, 2020

  1. quodlibet: exclude test 

    - Excluded test_operon.py as it fails on ArchLinux for @sauyon.
    @101100
    101100 committed Jan 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    GPG key ID: 6BA7C26C3FDF7BB3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a185bb2 View commit details

Commits on Jan 18, 2020

  1. quodlibet: improve formatting and add comments

    @101100
    101100 committed Jan 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    GPG key ID: 6BA7C26C3FDF7BB3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    00a8de0 View commit details

Commits on Jan 30, 2020

  1. Merge pull request #77796 from 101100/fix-quodlibet 

    quodlibet: fix tests
    @jtojnar
    jtojnar authored Jan 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f65f633 View commit details
Showing with 13 additions and 4 deletions.
  1. +13 −4 pkgs/applications/audio/quodlibet/default.nix
17 changes: 13 additions & 4 deletions pkgs/applications/audio/quodlibet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {

nativeBuildInputs = [ wrapGAppsHook gettext ];

checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
checkInputs = [ gdk-pixbuf ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);

buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1;
@@ -33,13 +33,23 @@ python3.pkgs.buildPythonApplication rec {

LC_ALL = "en_US.UTF-8";

pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [
"--ignore=tests/plugin/test_replaygain.py"
] ++ [
# upstream does actually not enforce source code linting
"--ignore=tests/quality"
# build failure on Arch Linux
# https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355
"--ignore=tests/test_operon.py"
];

checkPhase = ''
runHook preCheck
env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \
env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \
HOME=$(mktemp -d) \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"}
py.test $pytestFlags
runHook postCheck
'';

@@ -65,6 +75,5 @@ python3.pkgs.buildPythonApplication rec {

maintainers = with maintainers; [ coroa sauyon ];
homepage = https://quodlibet.readthedocs.io/en/latest/;
broken = true;
};
}