Unverified Commit 7822f2f0 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #327988 from Nydragon/lollypop-bump-version 

lollypop: 1.4.39 -> 1.4.40
parents 46e7871c dab6632e

pkgs/applications/audio/lollypop/default.nix→pkgs/by-name/lo/lollypop/package.nix

+55 −42
Original line number Diff line number Diff line 
{ lib

, fetchFromGitLab

, nix-update-script

, meson

, ninja

, pkg-config

, python3

, gtk3

, gst_all_1

, libhandy

, libsecret

, libsoup_3

, appstream-glib

, desktop-file-utils

, totem-pl-parser

, gobject-introspection

, glib-networking

, gdk-pixbuf

, glib

, pango

, wrapGAppsHook3

, lastFMSupport ? true

, youtubeSupport ? true

, kid3Support ? true

{

  lib,

  fetchFromGitLab,

  nix-update-script,

  meson,

  ninja,

  pkg-config,

  python3,

  gtk3,

  gst_all_1,

  libhandy,

  libsecret,

  libsoup_3,

  appstream-glib,

  desktop-file-utils,

  totem-pl-parser,

  gobject-introspection,

  glib-networking,

  gdk-pixbuf,

  glib,

  pango,

  kid3,

  wrapGAppsHook3,

  lastFMSupport ? true,

  youtubeSupport ? true,

  kid3Support ? true,

}:



python3.pkgs.buildPythonApplication rec {

  pname = "lollypop";

  version = "1.4.39";

  version = "1.4.40";



  format = "other";
@@ -36,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { 
    repo = pname;

    rev = version;

    fetchSubmodules = true;

    hash = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo=";

    hash = "sha256-hdReviNgcigXuNqJns6aPW+kixlpmRXtqrLlm/LGHBo=";

  };



  nativeBuildInputs = [
@@ -49,29 +51,38 @@ python3.pkgs.buildPythonApplication rec { 
    wrapGAppsHook3

  ];



  buildInputs = with gst_all_1;

    [

      gdk-pixbuf

      glib

      glib-networking

  buildInputs =

    (with gst_all_1; [

      gst-libav

      gst-plugins-bad

      gst-plugins-base

      gst-plugins-good

      gst-plugins-ugly

      gstreamer



    ])

    ++ [

      gdk-pixbuf

      glib

      glib-networking

      gtk3

      libhandy

      libsoup_3

      pango

      totem-pl-parser

    ] ++ lib.optional lastFMSupport libsecret;

    ]

    ++ lib.optional lastFMSupport libsecret;



  propagatedBuildInputs = with python3.pkgs;

    [ beautifulsoup4 pillow pycairo pygobject3 ]

    ++ lib.optional lastFMSupport pylast

    ++ lib.optional youtubeSupport yt-dlp

    ++ lib.optional kid3Support pkgs.kid3;

  propagatedBuildInputs =

    (with python3.pkgs; [

      beautifulsoup4

      pillow

      pycairo

      pygobject3

    ])

    ++ lib.optional lastFMSupport python3.pkgs.pylast

    ++ lib.optional youtubeSupport python3.pkgs.yt-dlp

    ++ lib.optional kid3Support kid3;



  postPatch = ''

    chmod +x meson_post_install.py
@@ -93,15 +104,17 @@ python3.pkgs.buildPythonApplication rec { 
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  passthru = { updateScript = nix-update-script { }; };

  passthru = {

    updateScript = nix-update-script { };

  };



  meta = with lib; {

  meta = {

    changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";

    description = "Modern music player for GNOME";

    homepage = "https://gitlab.gnome.org/World/lollypop";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ lovesegfault ];

    platforms = platforms.linux;

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ lovesegfault ];

    platforms = lib.platforms.linux;

    mainProgram = "lollypop";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -30861,8 +30861,6 @@ with pkgs; 














  deadd-notification-center = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../applications/misc/deadd-notification-center { });



























  lollypop = callPackage ../applications/audio/lollypop { };



























  losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { };





























  m32edit = callPackage ../applications/audio/midas/m32edit.nix { };