From e470d15423f7c202d33ee7cb11891542e298dfa3 Mon Sep 17 00:00:00 2001 From: goibhniu Date: Sun, 13 Dec 2015 18:16:49 +0100 Subject: zam-plugins: update hash (uses git submodules) --- pkgs/applications/audio/zam-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 7492e8e0a371..48f559dfd86d 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; rev = "91fe56931a3e57b80f18c740d2dde6b44f962aee"; - sha256 = "17slpywjs04xbcylyqjg6kqbpqwqbigf843y437yfvj1ar6ir1jp"; + sha256 = "0n29zxg4l2m3jsnfw6q2alyzaw7ibbv9nvk57k07sv3lh2yy3f30"; }; buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ]; -- cgit 1.4.1 From a8d43d6950b6f0c80436e905d4946e1371cf6e1e Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Sun, 13 Dec 2015 20:45:11 -0500 Subject: google-musicmanager: beta_1.0.221.5230-r0 -> beta_1.0.243.1116-r0 --- pkgs/applications/audio/google-musicmanager/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 7c69a25eb042..f86513659b64 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -6,23 +6,24 @@ let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; # When looking for newer versions, since google doesn't let you list their repo dirs, # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release - # fetch an appropriate packages file eg main/binary-amd64/Packages + # fetch an appropriate packages file such as main/binary-amd64/Packages: + # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; + sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; } else fetchurl { url = archUrl name "i386"; - sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; + sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; }; unpackPhase = '' -- cgit 1.4.1 From 872d0be1a0441d3e1071bc00feb109654a00f211 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:53:01 +0100 Subject: mopidy-gmusic: init at 1.0.0 --- lib/maintainers.nix | 1 + pkgs/applications/audio/mopidy-gmusic/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-gmusic/default.nix (limited to 'pkgs/applications/audio') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d1e2b100ab87..8b3694f9a3df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; + jgillich = "Jakob Gillich "; jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix new file mode 100644 index 000000000000..00468db767a2 --- /dev/null +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-gmusic-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; + sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://www.mopidy.com/; + description = "Mopidy extension for playing music from Google Play Music"; + license = licenses.asl20; + maintainers = [ maintainers.jgillich ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142ea8d114c3..e9f6847d34fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12489,6 +12489,8 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; -- cgit 1.4.1 From d241354dcdaee5329f78e1039ebcdd7ef05dc379 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 14:28:56 +0100 Subject: mopidy: 1.0.5 -> 1.1.1 --- pkgs/applications/audio/mopidy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7c2369448920..398899734309 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0lhmm2w2djf6mb3acw1yq1k4j74v1lf4kgx24dsdnpkgsycrv5q6"; + sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good ]; # There are no tests -- cgit 1.4.1 From c393711b4320c8939a44dc5af73e9e8c83dc0cff Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 11:56:28 +0900 Subject: praat: 5417 -> 5.4.17 --- pkgs/applications/audio/praat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 03ba33b4834a..883d49682cec 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: -let version = "5417"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "praat-${version}"; + version = "5.4.17"; src = fetchurl { - url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; - sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl"; + url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; + sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; }; configurePhase = '' -- cgit 1.4.1 From 95d62e78e3730404c79805411f5bc6917fd1ef05 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:07:22 -0500 Subject: mopidy: improve gstreamer plugin support --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 398899734309..91fc9d6f3fc9 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pygobject, gst_python -, gst_plugins_good, gst_plugins_base +, gst_plugins_good, gst_plugins_base, gst_plugins_ugly }: pythonPackages.buildPythonPackage rec { @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly ]; # There are no tests -- cgit 1.4.1 From 514b7b932808223d0e99adc1ca4f6461b105272c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:13:52 -0500 Subject: mopidy-mopify: 1.5.1->1.5.8 --- pkgs/applications/audio/mopidy-mopify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 4792a02f341d..b7a1fbf2f08c 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-mopify-${version}"; - version = "1.5.1"; + version = "1.5.8"; src = fetchurl { url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as"; + sha256 = "1gq88i5hbyskwhqf51myndqgmrndkyy6gs022sc387fy3dwxmvn0"; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; -- cgit 1.4.1 From 47cbbc3abe73b0e30ba89c88e484dccf9601b5a6 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:19:58 -0500 Subject: mopidy-youtube: init at 2.0.1 --- pkgs/applications/audio/mopidy-youtube/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-youtube/default.nix (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix new file mode 100644 index 000000000000..efd1425e2554 --- /dev/null +++ b/pkgs/applications/audio/mopidy-youtube/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-youtube-${version}"; + + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-youtube"; + rev = "v${version}"; + sha256 = "1si7j7m5kg0cxlhkw8s2mbnpmc9mb3l69n5sgklb1yv1s55iia6z"; + }; + + propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from YouTube"; + license = licenses.asl20; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5917e715c14e..802385fff487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12507,6 +12507,8 @@ let mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; easytag = callPackage ../applications/audio/easytag { }; -- cgit 1.4.1 From 7e7106851086577cc0109bc734a755ec520fb8cd Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:20:41 -0500 Subject: mopidy-soundcloud: init at 2.0.1 --- .../audio/mopidy-soundcloud/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-soundcloud/default.nix (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix new file mode 100644 index 000000000000..c10bb00909a2 --- /dev/null +++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-soundcloud-${version}"; + + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-soundcloud"; + rev = "v${version}"; + sha256 = "05yvjnivj26wjish7x1xrd9l5z8i14b610a8pbifnq3cq7y2m22r"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from SoundCloud"; + license = licenses.mit; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 802385fff487..45bbd5927aa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12509,6 +12509,8 @@ let mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; easytag = callPackage ../applications/audio/easytag { }; -- cgit 1.4.1 From a03b98271a7c1ac8e7f82d6808e739d7afe80df3 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:21:26 -0500 Subject: mopidy-musicbox-webclient: init at 2.0.0 --- .../audio/mopidy-musicbox-webclient/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-musicbox-webclient/default.nix (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix new file mode 100644 index 000000000000..e13a1a978fdc --- /dev/null +++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-musicbox-webclient-${version}"; + + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "pimusicbox"; + repo = "mopidy-musicbox-webclient"; + rev = "v${version}"; + sha256 = "0gnw6jn55jr6q7bdp70mk3cm5f6jy8lm3s7ayfmisihhjbl3rnaq"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from SoundCloud"; + license = licenses.mit; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45bbd5927aa6..3b584491b4f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12511,6 +12511,8 @@ let mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; easytag = callPackage ../applications/audio/easytag { }; -- cgit 1.4.1 From 4446b078fcb75d6cae991350d8c8008c2b92251e Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 21:22:04 -0500 Subject: mopidy-spotify-tunigo: init at 0.2.1 --- .../audio/mopidy-spotify-tunigo/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-spotify-tunigo/default.nix (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix new file mode 100644 index 000000000000..ab07b0f1f68e --- /dev/null +++ b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-spotify-tunigo-${version}"; + + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "trygveaa"; + repo = "mopidy-spotify-tunigo"; + rev = "v${version}"; + sha256 = "0827wghbgrscncnshz30l97hgg0g5bsnm0ad8596zh7cai0ibss0"; + }; + + propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for providing the browse feature of Spotify"; + license = licenses.asl20; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b584491b4f2..b729d6ef2a87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12507,6 +12507,8 @@ let mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { }; + mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; -- cgit 1.4.1 From e8aee16550b66d634ee3fb8c864b2e8aa4a03055 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 19 Dec 2015 11:05:24 +0000 Subject: ncmpcpp: 0.6.7 -> 0.7 --- pkgs/applications/audio/ncmpcpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e316df4a8c1f..70cde4b0c706 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline -, libiconv +, libiconv, icu , outputsSupport ? false # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? false # clock screen @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.7"; + version = "0.7"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008"; + sha256 = "0xzz0g9whqjcjaaqmsw5ph1zvpi2j5v3i5k73g7916rca3q4z4jh"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost mpd_clientlib ncurses readline libiconv ] + buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu ] ++ optional curlSupport curl ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; -- cgit 1.4.1 From 5810f0e7edc304a19332eacf2aaec232a00569ed Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 23:29:41 -0600 Subject: tomahawk: Qt 5 infrastructure upgrade --- pkgs/applications/audio/tomahawk/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 32d5f1aa13e5..61cb6b9896e3 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -11,9 +11,7 @@ assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs != null; assert enableTelepathy -> telepathy_qt != null; -let - quazipQt4 = quazip.override { qt = qt4; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "tomahawk-${version}"; version = "0.8.4"; @@ -29,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon - qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bf279527ef2..d6131f28c58b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13310,6 +13310,7 @@ let enableXMPP = config.tomahawk.enableXMPP or true; enableKDE = config.tomahawk.enableKDE or false; enableTelepathy = config.tomahawk.enableTelepathy or false; + quazip = qt5.quazip.override { qt = qt4; }; }; torchat = callPackage ../applications/networking/instant-messengers/torchat { -- cgit 1.4.1 From 971d580a008252337ba6ddcb20a5d1443af09029 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Tue, 22 Dec 2015 10:34:24 +0100 Subject: spotify: fix missing ffmpeg_0_10 dependency, fixes #11877 This makes local playback work. --- pkgs/applications/audio/spotify/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2868d7609738..f53154217a87 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig -, dbus, expat }: +, dbus, expat, ffmpeg_0_10 }: assert stdenv.system == "x86_64-linux"; @@ -15,6 +15,7 @@ let cups dbus expat + ffmpeg_0_10 fontconfig freetype GConf -- cgit 1.4.1 From 4400f01c0bb2630e4ff175024e05d2b171c2782b Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:00:20 +0100 Subject: amarok: fix taglib search --- pkgs/applications/audio/amarok/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d99e1b7a150f..95f55abddba6 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core ]; + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake + ''; + cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; propagatedUserEnvPkgs = [ qtscriptgenerator ]; -- cgit 1.4.1 From a25de32033e22ba9d70c813b81f6acd43d3f794e Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:00:32 +0100 Subject: cantata: fix taglib search --- pkgs/applications/audio/cantata/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 2d399ba44da3..c3b4e60b87c6 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -93,6 +93,10 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; + preConfigure = '' + sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake + ''; + postInstall = stdenv.lib.optionalString withQt5 '' wrapQtProgram "$out/bin/cantata" ''; -- cgit 1.4.1 From e94139f8c8a5e4c56ae7868e2348af47c4955a58 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Sat, 26 Dec 2015 18:42:03 +0100 Subject: Add comments identifying workarounds --- pkgs/applications/audio/amarok/default.nix | 1 + pkgs/applications/audio/cantata/default.nix | 1 + pkgs/development/libraries/taglib-extras/default.nix | 2 ++ 3 files changed, 4 insertions(+) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 95f55abddba6..e0519f2db5c1 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core ]; + # This is already fixed upstream, will be release in 2.9 preConfigure = '' sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index c3b4e60b87c6..6906c7bccb5e 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; + # This is already fixed upstream but not released yet. Maybe in version 2. preConfigure = '' sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake ''; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 1edabe4c81fd..623119703d4f 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ taglib ]; nativeBuildInputs = [ cmake ]; + + # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 preConfigure = '' sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; -- cgit 1.4.1 From bfd77fdbbe8dbc56955d4204602ccb8ff7acfd34 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Mon, 28 Dec 2015 22:49:36 +0100 Subject: amarok: add necessary dependencies to fix failing build --- pkgs/applications/audio/amarok/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index e0519f2db5c1..aec2768e4505 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -2,6 +2,7 @@ , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib , taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null +, lz4, lzo, snappy, libaio }: stdenv.mkDerivation rec { @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2 libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core + lz4 lzo snappy libaio ]; # This is already fixed upstream, will be release in 2.9 -- cgit 1.4.1 From 4f6c12de3076baef5025d902ccf74689c968b240 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 27 Dec 2015 19:41:23 +0000 Subject: spotify: Use specific openssl version Spotify needs an ABI compatible libssl as it is a binary. Only changes things if openssl is aliased to another libssl. --- pkgs/applications/audio/spotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index f53154217a87..81c2ee59bc53 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl_1_0_1, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig , dbus, expat, ffmpeg_0_10 }: @@ -67,8 +67,8 @@ stdenv.mkDerivation { # Work around Spotify referring to a specific minor version of # OpenSSL. - ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0 - ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 + ln -s ${openssl_1_0_1}/lib/libssl.so $libdir/libssl.so.1.0.0 + ln -s ${openssl_1_0_1}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so -- cgit 1.4.1