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

2 files changed, 38 insertions, 49 deletions

diff --git a/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
index 63948ab4fad3..832ae945aa2c 100644
--- a/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
+++ b/nixpkgs/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
@@ -1,8 +1,16 @@
-diff --git a/data/meson.build b/data/meson.build
-index c189753..12c10cb 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -7,7 +7,7 @@ if get_option('enable-backend')
+diff --git i/data/meson.build w/data/meson.build
+index 6ac2a11..73f433b 100644
+--- i/data/meson.build
++++ w/data/meson.build
+@@ -1,6 +1,6 @@
+ if get_option('enable-backend')
+     conf = configuration_data()
+-    conf.set('sysconfdir', sysconfdir)
++    conf.set('sysconfdir', sysconfdir_install)
+ 
+     if get_option('demo-agent')
+         conf.set('demo_agent', 'geoclue-demo-agent;')
+@@ -8,7 +8,7 @@ if get_option('enable-backend')
          conf.set('demo_agent', '')
      endif
  
@@ -11,16 +19,16 @@ index c189753..12c10cb 100644
      configure_file(output: 'geoclue.conf',
                     input: 'geoclue.conf.in',
                     configuration: conf,
-@@ -16,7 +16,7 @@ if get_option('enable-backend')
+@@ -17,7 +17,7 @@ if get_option('enable-backend')
      conf = configuration_data()
      conf.set('libexecdir', libexecdir)
      conf.set('dbus_srv_user', get_option('dbus-srv-user'))
 -    conf.set('sysconfdir', sysconfdir)
 +    conf.set('sysconfdir', sysconfdir_install)
  
-     service_dir = join_paths(datadir, 'dbus-1', 'system-services')
-     configure_file(output: 'org.freedesktop.GeoClue2.service',
-@@ -33,7 +33,7 @@ if get_option('enable-backend')
+     confd_dir = join_paths(conf_dir, 'conf.d')
+     install_emptydir(confd_dir)
+@@ -37,7 +37,7 @@ if get_option('enable-backend')
      # DBus Service policy file
      dbus_service_dir = get_option('dbus-sys-dir')
      if dbus_service_dir == ''
@@ -29,10 +37,10 @@ index c189753..12c10cb 100644
      endif
      configure_file(output: 'org.freedesktop.GeoClue2.conf',
                     input: 'org.freedesktop.GeoClue2.conf.in',
-diff --git a/demo/meson.build b/demo/meson.build
+diff --git i/demo/meson.build w/demo/meson.build
 index 1427fbe..2623f16 100644
---- a/demo/meson.build
-+++ b/demo/meson.build
+--- i/demo/meson.build
++++ w/demo/meson.build
 @@ -54,7 +54,7 @@ if get_option('demo-agent')
                                     install_dir: desktop_dir)
  
@@ -42,10 +50,10 @@ index 1427fbe..2623f16 100644
      meson.add_install_script('install-file.py',
                               desktop_file.full_path(),
                               autostart_dir)
-diff --git a/meson.build b/meson.build
-index fde6fa3..39b7b0a 100644
---- a/meson.build
-+++ b/meson.build
+diff --git i/meson.build w/meson.build
+index 220ae2b..dbf6458 100644
+--- i/meson.build
++++ w/meson.build
 @@ -12,7 +12,11 @@ gclue_api_version='2.0'
  datadir = join_paths(get_option('prefix'), get_option('datadir'))
  includedir = join_paths(get_option('prefix'), get_option('includedir'))
@@ -61,18 +69,18 @@ index fde6fa3..39b7b0a 100644
  header_dir = 'libgeoclue-' + gclue_api_version
 @@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
  conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
- conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/')
+ conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/')
  conf.set_quoted('LOCALEDIR', localedir)
 -conf.set_quoted('SYSCONFDIR', sysconfdir)
 +conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
  conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
  conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
  conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
-diff --git a/meson_options.txt b/meson_options.txt
-index 83bc60e..b726329 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -34,6 +34,9 @@ option('systemd-system-unit-dir',
+diff --git i/meson_options.txt w/meson_options.txt
+index 5b8c42d..945dfd5 100644
+--- i/meson_options.txt
++++ w/meson_options.txt
+@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
  option('dbus-srv-user',
         type: 'string', value: 'root',
         description: 'The user (existing) as which the service will run')
diff --git a/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
index d7b417ac09e9..4bad33000c06 100644
--- a/nixpkgs/pkgs/development/libraries/geoclue/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoclue/default.nix
@@ -12,7 +12,7 @@
 , docbook_xml_dtd_412
 , glib
 , json-glib
-, libsoup
+, libsoup_3
 , libnotify
 , gdk-pixbuf
 , modemmanager
@@ -27,38 +27,19 @@
 
 stdenv.mkDerivation rec {
   pname = "geoclue";
-  version = "2.5.7";
+  version = "2.7.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
-    owner = pname;
-    repo = pname;
+    owner = "geoclue";
+    repo = "geoclue";
     rev = version;
-    sha256 = "1mv1vs4q94bqkmgkj53jcsw1x31kczwydyy3r27a7fycgzmii1pj";
+    hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc=";
   };
 
   patches = [
-    # Fix for falling back to GeoIP when WiFi devices are not found
-    # https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
-    # NOTE: this should be removed when the next version is released
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
-      sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
-    })
-
-    # Make the Mozilla API key configurable
-    # https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
-      sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
-      sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
-    })
-
     ./add-option-for-installation-sysconfdir.patch
   ];
 
@@ -82,7 +63,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     json-glib
-    libsoup
+    libsoup_3
     avahi
     gobject-introspection
   ] ++ lib.optionals withDemoAgent [
@@ -120,8 +101,8 @@ stdenv.mkDerivation rec {
     broken = stdenv.isDarwin && withDemoAgent;
     description = "Geolocation framework and some data providers";
     homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin mimame ];
     platforms = with platforms; linux ++ darwin;
-    license = licenses.lgpl2;
+    license = licenses.lgpl2Plus;
   };
 }