Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 5 insertions, 21 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix
index c9759d76246e..8f8354ae8587 100644
--- a/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix
@@ -12,19 +12,16 @@
 , gdk-pixbuf
 , gst_all_1
 , glib
-, gtk3
-, libgee
-, check
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
 , gobject-introspection
-, libsoup
+, libsoup_3
 }:
 
 stdenv.mkDerivation rec {
   pname = "libdmapsharing";
-  version = "3.9.10";
+  version = "3.9.12";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
@@ -34,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = pname;
     rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g";
+    sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";
   };
 
   nativeBuildInputs = [
@@ -60,31 +57,18 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
     glib
-    libsoup
-  ];
-
-  checkInputs = [
-    libgee
-    check
-    gtk3
+    libsoup_3
   ];
 
   configureFlags = [
     "--enable-gtk-doc"
+    "--disable-tests" # Tests require mDNS server.
   ];
 
-  # Cannot disable tests here or `check` from checkInputs would not be included.
-  # Cannot disable building the tests or docs will not build:
-  # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49
-  doCheck = true;
-
   preConfigure = ''
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  # Tests require mDNS server.
-  checkPhase = ":";
-
   meta = with lib; {
     homepage = "https://www.flyn.org/projects/libdmapsharing/";
     description = "Library that implements the DMAP family of protocols";