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

5 files changed, 19 insertions, 28 deletions

diff --git a/nixpkgs/pkgs/applications/audio/fmit/default.nix b/nixpkgs/pkgs/applications/audio/fmit/default.nix
index a61f7dc0a905..680694aa403d 100644
--- a/nixpkgs/pkgs/applications/audio/fmit/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake
+{ stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
@@ -9,18 +9,18 @@ assert portaudioSupport -> portaudio != null;
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  name = "fmit-${version}";
-  version = "1.1.14";
+mkDerivation rec {
+  pname = "fmit";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
-    sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x";
-    rev = "v${version}";
-    repo = "fmit";
     owner = "gillesdegottex";
+    repo = "fmit";
+    rev = "v${version}";
+    sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];
   buildInputs = [ fftw qtbase qtmultimedia ]
     ++ optionals alsaSupport [ alsaLib ]
     ++ optionals jackSupport [ libjack2 ]
diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index 464552584a45..e4d508b2a1f5 100644
--- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -15,13 +15,12 @@
 , gobject-introspection
 , wrapGAppsHook
 , lastFMSupport ? true
-, wikipediaSupport ? true
-, youtubeSupport ? true, youtube-dl
+, youtubeSupport ? true
 }:
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.1.4.2";
+  version = "1.1.4.14";
 
   format = "other";
   doCheck = false;
@@ -30,7 +29,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0rn3q7xslqq5hw4wb739ywg5dr99xpkbmyw80y84rsg0wfrwbjlc";
+    sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj";
   };
 
   nativeBuildInputs = [
@@ -64,7 +63,6 @@ python3.pkgs.buildPythonApplication rec  {
     pygobject3
   ]
   ++ lib.optional lastFMSupport pylast
-  ++ lib.optional wikipediaSupport wikipedia
   ++ lib.optional youtubeSupport youtube-dl
   ;
 
diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix
index 6d186cccde34..bc7c2ff9a24f 100644
--- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix
@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   name = "mixxx-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
     rev = "release-${version}";
-    sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
+    sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/applications/audio/munt/default.nix b/nixpkgs/pkgs/applications/audio/munt/default.nix
index 3d40e4c39f4d..c9a1e9bea808 100644
--- a/nixpkgs/pkgs/applications/audio/munt/default.nix
+++ b/nixpkgs/pkgs/applications/audio/munt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem }:
 
 let
   desktopItem = makeDesktopItem rec {
@@ -8,7 +8,7 @@ let
     genericName = "Munt synthesiser";
     categories = "Audio;AudioVideo;";
   };
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   version = "2.3.0";
   pname = "munt";
 
diff --git a/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/nixpkgs/pkgs/applications/audio/pamixer/default.nix
index 322a4e238461..7c4520967850 100644
--- a/nixpkgs/pkgs/applications/audio/pamixer/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pamixer/default.nix
@@ -1,27 +1,20 @@
 { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  name = "pamixer-${version}";
-  version = "1.3.1";
+  pname = "pamixer";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "cdemoulins";
     repo = "pamixer";
     rev = version;
-    sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw";
+    sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7";
   };
 
-  # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed
-  patches = [(fetchpatch {
-    url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch";
-    sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb";
-  })];
-
   buildInputs = [ boost libpulseaudio ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp pamixer $out/bin
+    install -Dm755 pamixer -t $out/bin
   '';
 
   meta = with stdenv.lib; {