Merge master into staging-next

3 files changed, 59 insertions, 9 deletions

diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
new file mode 100644
index 00000000000..f82ec7a4ea1
--- /dev/null
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -0,0 +1,44 @@
+{ 
+  stdenv, fetchurl, docbook_xsl,
+  docbook_xml_dtd_45, python, pygments, 
+  libxslt 
+}:
+
+stdenv.mkDerivation rec {
+  version = "6.12.0";
+  name = "csound-manual-${version}";
+  
+  src = fetchurl {
+    url = "https://github.com/csound/manual/archive/${version}.tar.gz";
+    sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp";
+  };
+
+
+  prePatch = ''
+    substituteInPlace manual.xml \
+      --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+                "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
+  '';
+
+  nativeBuildInputs = [ libxslt.bin ];
+
+  buildInputs = [ docbook_xsl python pygments ];
+
+  buildPhase = ''
+    make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/doc/csound
+    cp -r ./html $out/share/doc/csound
+  '';
+
+  meta = {
+    description = "The Csound Canonical Reference Manual";
+    homepage = "https://github.com/csound/manual";
+    license = stdenv.lib.licenses.fdl12Plus;
+    maintainers = [ stdenv.lib.maintainers.hlolli ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index a285663d8ce..8547b0cc553 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "0.9.915";
+  version = "0.9.921";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh";
+    sha256 = "0a79qnci93yicd58r6kr6yinpqz67s39h0xk5qkzlsplpbawvf3y";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix
index 20f6271c7ad..3184f89ced9 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@@ -1,20 +1,26 @@
 { stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }:
 
 stdenv.mkDerivation {
-  name = "squeezelite-git-2016-05-27";
+  name = "squeezelite-git-2018-08-14";
 
   src = fetchFromGitHub {
-    owner = "ralph-irving";
-    repo = "squeezelite";
-    rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e";
-    sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm";
+    owner  = "ralph-irving";
+    repo   = "squeezelite";
+    rev    = "ecb6e3696a42113994640e5345d0b5ca2e77d28b";
+    sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
   };
 
   buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ];
 
+  enableParallelBuilding = true;
+
   installPhase = ''
-    mkdir -p $out/bin
-    cp squeezelite $out/bin
+    runHook preInstall
+
+    install -Dm755 -t $out/bin                   squeezelite
+    install -Dm644 -t $out/share/doc/squeezelite *.txt *.md
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {