Merge remote-tracking branch 'nixpkgs/nixos-unstable'

1 files changed, 9 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/applications/audio/amarok/default.nix b/nixpkgs/pkgs/applications/audio/amarok/default.nix
index 063cfcaa9fae..c75adb11ed49 100644
--- a/nixpkgs/pkgs/applications/audio/amarok/default.nix
+++ b/nixpkgs/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,19 +7,16 @@
 }:
 
 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";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 
   propagatedBuildInputs = [
@@ -35,7 +32,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 ];
   };
 }