Merge pull request #116413 from dotlambda/amarok-2.9.71

amarok: 2020-06-12 -> 2.9.71
This commit is contained in:
Sandro 2021-03-16 00:00:41 +01:00 committed by GitHub
commit 86d749ff0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ mkDerivation, fetchgit, lib { mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools , extra-cmake-modules, kdoctools
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
@ -7,17 +7,12 @@
}: }:
mkDerivation rec { mkDerivation rec {
pname = "amarok-unstable"; pname = "amarok";
version = "2020-06-12"; version = "2.9.71";
src = fetchgit { src = fetchurl {
# master has the Qt5 version as of April 2018 but a formal release has not url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz";
# yet been made so change this back to the proper upstream when such a sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a";
# release is out
url = "https://invent.kde.org/multimedia/amarok.git";
# url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@ -35,7 +30,7 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://amarok.kde.org"; homepage = "https://amarok.kde.org";
description = "A powerful music player with an intuitive interface"; description = "A powerful music player with an intuitive interface";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };
} }