Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'

Conflicts:
	nixpkgs/nixos/modules/misc/documentation.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
	nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
	nixpkgs/pkgs/servers/mail/mailman/web.nix
	nixpkgs/pkgs/top-level/aliases.nix
	nixpkgs/pkgs/top-level/all-packages.nix
	nixpkgs/pkgs/top-level/impure.nix

1 files changed, 20 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
index a49026c35dcd..c3c9c20e86fd 100644
--- a/nixpkgs/pkgs/development/libraries/libmtp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmtp/default.nix
@@ -1,17 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkg-config
-, libusb1
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, gettext
+, lib
 , libiconv
+, libtool
+, libusb1
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "libmtp";
-  version = "1.1.18";
+  version = "1.1.19";
 
   src = fetchFromGitHub {
     owner = "libmtp";
     repo = "libmtp";
     rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "0rya6dsb67a7ny2i1jzdicnday42qb8njqw6r902k712k5p7d1r9";
+    sha256 = "sha256-o8JKoKVNpU/nHTDnKJpa8FlXt37fZnTf45WBTCxLyTs=";
   };
 
   outputs = [ "bin" "dev" "out" ];
@@ -24,30 +31,26 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs = [
-    libiconv
-  ];
+  buildInputs = [ libiconv ];
 
-  propagatedBuildInputs = [
-    libusb1
-  ];
+  propagatedBuildInputs = [ libusb1 ];
+
+  preConfigure = "./autogen.sh";
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  configureFlags = [ "--with-udev=${placeholder "out"}/lib/udev" ];
 
-  # tried to install files to /lib/udev, hopefully OK
-  configureFlags = [ "--with-udev=$$bin/lib/udev" ];
+  enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://libmtp.sourceforge.net";
+    homepage = "https://github.com/libmtp/libmtp";
     description = "An implementation of Microsoft's Media Transfer Protocol";
     longDescription = ''
       libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)
       in the form of a library suitable primarily for POSIX compliant operating
       systems. We implement MTP Basic, the stuff proposed for standardization.
-      '';
+    '';
     platforms = platforms.unix;
     license = licenses.lgpl21;
+    maintainers = with maintainers; [ lovesegfault ];
   };
 }