diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 8df2be1a0391f9..f68d93fa69d4f5 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.610"; + version = "0.9.611"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0nn4cjw0c2ysd3y2a7l08ybcd21v993wsz99f7w0881jhws3q5p4"; + sha256 = "1k78a26sld0xd14c9hr4qv8c7qaq1m8zqk1mzrh4pl7ysqqg9p20"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix deleted file mode 100644 index dfcdebace3b07e..00000000000000 --- a/pkgs/misc/lollypop-portal/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig -, python3, gnome3, gst_all_1, gtk3, libnotify -, kid3, easytag, gobjectIntrospection, wrapGAppsHook }: - -python3.pkgs.buildPythonApplication rec { - name = "lollypop-portal-${version}"; - version = "0.9.7"; - - format = "other"; - doCheck = false; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "gnumdk"; - repo = name; - rev = version; - sha256 = "0rn5xmh6391i9l69y613pjad3pzdilskr2xjfcir4vpk8wprvph3"; - }; - - nativeBuildInputs = [ - gobjectIntrospection - meson - ninja - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - gnome3.gnome-settings-daemon - gnome3.libsecret - gnome3.totem-pl-parser - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - libnotify - python3 - ]; - - pythonPath = with python3.pkgs; [ - pycairo - pydbus - pygobject3 - ]; - - preFixup = '' - buildPythonPath "$out/libexec/lollypop-portal $pythonPath" - patchPythonScript "$out/libexec/lollypop-portal" - - gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}" - ) - ''; - - meta = with stdenv.lib; { - description = "DBus Service for Lollypop"; - homepage = https://gitlab.gnome.org/gnumdk/lollypop-portal; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4aeab6c0e3c6a..f3e400816da6f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22104,8 +22104,6 @@ with pkgs; lilypond = lilypond-unstable; }; - lollypop-portal = callPackage ../misc/lollypop-portal { }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; mailcore2 = callPackage ../development/libraries/mailcore2 {