diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
commit | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (patch) | |
tree | f25103b54e5edbcface07e28fe999101b7872d97 /pkgs/applications/audio | |
parent | 7e912475961c791737f545eeaa3b898b1224a94b (diff) | |
parent | ee1b8e4c7b9134dd8ae18d3476dff1691de20d0f (diff) | |
download | nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.gz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.bz2 nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.lz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.xz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.zst nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/amarok/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ff3c456c364..c72815d5ca2 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,18 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -mkDerivation { +mkDerivation rec { pname = "amarok"; - version = "2.9.0-20190731"; + version = "2.9.0-20190824"; 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 = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; - rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; - sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; + sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; |