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

7 files changed, 31 insertions, 16 deletions

diff --git a/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
index 411d8a1f6f63..e402f7045727 100644
--- a/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
+++ b/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
@@ -4,6 +4,7 @@
 , budgie-desktop-view
 , glib
 , gsettings-desktop-schemas
+, magpie
 , mate
 , nixos-artwork
 , nixos-background-light ? nixos-artwork.wallpapers.nineish
@@ -31,9 +32,15 @@ let
     document-font-name="Noto Sans 10"
     monospace-font-name="Hack 10"
 
+    [org.gnome.desktop.peripherals.touchpad:Budgie]
+    tap-to-click=true
+
     [org.gnome.desktop.wm.preferences:Budgie]
     titlebar-font="Noto Sans Bold 10"
 
+    [org.gnome.mutter:Budgie]
+    edge-tiling=true
+
     [com.solus-project.budgie-menu:Budgie]
     use-default-menu-icon=true
 
@@ -56,6 +63,7 @@ let
       budgie-desktop
       budgie-desktop-view
       gsettings-desktop-schemas
+      magpie
   ] ++ extraGSettingsOverridePackages;
 
 in
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix
index 952a626b9fb7..23891f8ab9c9 100644
--- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix
@@ -17,24 +17,26 @@
 , openjpeg
 , djvulibre
 , qtbase
+, gtest
 }:
 
 stdenv.mkDerivation rec {
   pname = "deepin-reader";
-  version = "5.10.29";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-IpgmTmnrPWc9EFZVM+S2nFxdpPjbgXqEWUnK/O9FmUg=";
+    hash = "sha256-69NCxa20wp/tyyGGH/FbHhZ83LECbJWAzaLRo7iYreA=";
   };
 
-  patches = [ ./use-pkg-config.diff ];
-
+  # don't use vendored htmltopdf
   postPatch = ''
-    substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \
-      --replace "/usr" "$out"
+    substituteInPlace deepin_reader.pro \
+      --replace "SUBDIRS += htmltopdf" " "
+    substituteInPlace reader/document/Model.cpp \
+      --replace "/usr/lib/deepin-reader/htmltopdf" "htmltopdf"
   '';
 
   nativeBuildInputs = [
@@ -56,6 +58,7 @@ stdenv.mkDerivation rec {
     libspectre
     djvulibre
     openjpeg
+    gtest
   ];
 
   qmakeFlags = [
diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix b/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix
index 2202e94881c1..1d07bf167c80 100644
--- a/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix
@@ -51,13 +51,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "43.7";
+  version = "43.8";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    sha256 = "NBrLmwNUyytflewz32aZtKAHaNydIi1rYAtW4kKGlmc=";
+    sha256 = "TjTh8XWTS9hJqEvZX6Nb8G6EEuAt8loDbC8RNdUz8oE=";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix b/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix
index b3ee9dc25ef7..ee4a3b77b72b 100644
--- a/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix
@@ -36,16 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals withExamples [
     "bin"
   ] ++ lib.optionals withDocumentation [
-    "doc"
+    "devdoc"
   ];
 
   patches = [
     # Improves install locations of demo & docs
     # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release
     (fetchpatch {
-      name = "0001-geonames-Use-GNUInstallDirs-more.patch";
-      url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch";
-      hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY=";
+      name = "0001-geonames-Use-CMAKE_INSTALL_BINDIR-for-install.patch";
+      url = "https://gitlab.com/OPNA2608/geonames/-/commit/3bca6d4d02843aed851a0a7480d5cd5ac02b4cda.patch";
+      hash = "sha256-vwffuMKpIqymYaiGEvnNeVXLmnz5e4aBpg55fnNbjKs=";
     })
   ];
 
diff --git a/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 0735a2212c7e..9f6a8f3ecf4a 100644
--- a/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -3,8 +3,10 @@
 , fetchFromGitHub
 , cmake
 , kwindowsystem
+, libexif
 , libfm-qt
 , lxqt-qtplugin
+, menu-cache
 , qtx11extras
 , gitUpdater
 , extraQtStyles ? []
@@ -27,8 +29,10 @@ mkDerivation rec {
 
   buildInputs = [
     kwindowsystem
+    libexif
     libfm-qt
     lxqt-qtplugin
+    menu-cache
     qtx11extras
   ]
   ++ extraQtStyles;
diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix
index 0d80c6bd451e..b0f8a02f6d7e 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix
@@ -21,9 +21,9 @@
 let unwrapped = mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.18.6";
+  version = "4.18.7";
 
-  sha256 = "sha256-7SWpIBGm/YhnQSWYi5BgYjx8WCiEqxZRTagz/cY0p3E=";
+  sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU=";
 
   nativeBuildInputs = [
     docbook_xsl
diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
index 032b29eaef3d..6583c8b03a2e 100644
--- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala
-, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce
+, gtk3, libwnck, libxfce4util, xfce4-panel, waf, xfce
 , gitUpdater
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";
   };
 
-  nativeBuildInputs = [ pkg-config vala wafHook python3 ];
+  nativeBuildInputs = [ pkg-config vala waf.hook python3 ];
   buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
 
   postPatch = ''