git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88016 from kini/amarok/lastfm-support

amarok: add last.fm support, bump version

commitd3044f0ec2c3377fb1370dd5c5feff33d86435eb authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateMon 15 Jun 2020, 10:34 (6 years ago) parent67a0805557f56d
4 files changed+24−26
pkgs/applications/audio/amarok/default.nix+7−7 pkgs/development/libraries/liblastfm/default.nix+14−17 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+2−2
pkgs/applications/audio/amarok/default.nix+7−7
@@ -3,21 +3,21 @@
33, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
44, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
55, fftw, phonon, plasma-framework, threadweaver
6−, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
6+, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
77}:
88
99mkDerivation rec {
10− pname = "amarok";
11− version = "2.9.0-20190824";
10+ pname = "amarok-unstable";
11+ version = "2020-06-12";
1212
1313 src = fetchgit {
1414 # master has the Qt5 version as of April 2018 but a formal release has not
1515 # yet been made so change this back to the proper upstream when such a
1616 # release is out
17− url = "git://anongit.kde.org/amarok.git";
17+ url = "https://invent.kde.org/multimedia/amarok.git";
1818 # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
19− rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00";
20− sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j";
19+ rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b";
20+ sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x";
2121 };
2222
2323 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@@ -26,7 +26,7 @@ mkDerivation rec {
2626 qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
2727 karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
2828 phonon plasma-framework threadweaver
29− curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
29+ curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
3030 pcre snappy taglib taglib_extras
3131 ];
3232
pkgs/development/libraries/liblastfm/default.nix+14−17
@@ -1,27 +1,24 @@
1−{ stdenv, fetchurl, pkgconfig, which, cmake
1+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake
22, fftwSinglePrec, libsamplerate, qtbase
33, darwin }:
44
5−let version = "1.1.0"; in
6−
75stdenv.mkDerivation rec {
8− pname = "liblastfm";
9− inherit version;
6+ pname = "liblastfm-unstable";
7+ version = "2019-08-23";
108
11− # Upstream does not package git tags as tarballs. Get tarball from github.
12− src = fetchurl {
13− url = "https://github.com/lastfm/liblastfm/tarball/${version}";
14− name = "${pname}-${version}.tar.gz";
15− sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
9+ src = fetchFromGitHub {
10+ owner = "lastfm";
11+ repo = "liblastfm";
12+ rev = "2ce2bfe1879227af8ffafddb82b218faff813db9";
13+ sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0";
1614 };
1715
18− postPatch = ''
19− substituteInPlace CMakeLists.txt \
20− --replace 'find_package(Qt5Core QUIET)' \
21− 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)'
22− '';
16+ patches = [(fetchpatch {
17+ url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch";
18+ name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch";
19+ sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l";
20+ })];
2321
24− prefixKey = "--prefix ";
2522 nativeBuildInputs = [ pkgconfig which cmake ];
2623 buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
2724 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
@@ -31,7 +28,7 @@ stdenv.mkDerivation rec {
3128 repositories.git = "git://github.com/lastfm/liblastfm.git";
3229 description = "Official LastFM library";
3330 platforms = platforms.unix;
34− maintainers = [ maintainers.phreedom ];
31+ maintainers = [ maintainers.phreedom ];
3532 license = licenses.gpl3;
3633 };
3734}
pkgs/top-level/aliases.nix+1
@@ -252,6 +252,7 @@ mapAliases ({
252252 libjpeg_drop = libjpeg_original; # added 2020-06-05
253253 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
254254 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
255+ liblastfm = libsForQt5.liblastfm; # added 2020-06-14
255256 liblrdf = lrdf; # added 2018-04-25
256257 libqrencode = qrencode; # added 2019-01-01
257258 librdf = lrdf; # added 2020-03-22
pkgs/top-level/all-packages.nix+2−2
@@ -13082,8 +13082,6 @@ in
1308213082
1308313083 liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
1308413084
13085− liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { };
13086−
1308713085 liblcf = callPackage ../development/libraries/liblcf { };
1308813086
1308913087 liblqr1 = callPackage ../development/libraries/liblqr-1 { };
@@ -14357,6 +14355,8 @@ in
1435714355
1435814356 libktorrent = callPackage ../development/libraries/libktorrent { };
1435914357
14358+ liblastfm = callPackage ../development/libraries/liblastfm { };
14359+
1436014360 libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
1436114361
1436214362 libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };