From 3964931fa810101da8079a8252006bc9c014082c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Mar 2021 14:24:25 +0100 Subject: [PATCH] amarok: 2020-06-12 -> 2.9.71 --- pkgs/applications/audio/amarok/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 063cfcaa9fa..be984e7e98a 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchgit, lib +{ mkDerivation, fetchurl, lib , extra-cmake-modules, kdoctools , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem @@ -7,17 +7,12 @@ }: mkDerivation rec { - pname = "amarok-unstable"; - version = "2020-06-12"; + pname = "amarok"; + version = "2.9.71"; - src = fetchgit { - # master has the Qt5 version as of April 2018 but a formal release has not - # yet been made so change this back to the proper upstream when such a - # 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"; + src = fetchurl { + url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -35,7 +30,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://amarok.kde.org"; description = "A powerful music player with an intuitive interface"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; }; }