Merge master into staging-next

4 files changed, 39 insertions, 29 deletions

diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index 6a0156eedbc..55c98249dd3 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -6,27 +6,27 @@
 , gettext
 , appstream
 , appstream-glib
-, wrapGAppsHook
+, wrapGAppsHook4
 , desktop-file-utils
 , gobject-introspection
-, gtksourceview4
-, gspell
-, libhandy
-, poppler_gi
-, webkitgtk_4_1
-, librsvg
+, gtk4
+, gtksourceview5
+, libadwaita
 , libportal
+, librsvg
+, poppler_gi
+, webkitgtk_6_0
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "setzer";
-  version = "56";
+  version = "59";
 
   src = fetchFromGitHub {
     owner = "cvfosammmm";
     repo = "Setzer";
     rev = "v${version}";
-    hash = "sha256-YCJu8EU+8RD09QNVT/RYF2ZJZ7cp+oawXThqTzg8ENQ=";
+    hash = "sha256-PmkEOOi30Fa8VXNmKPvp6UAaw74MID9uTaCzXs9vPpk=";
   };
 
   format = "other";
@@ -37,28 +37,28 @@ python3.pkgs.buildPythonApplication rec {
     gettext
     appstream # for appstreamcli
     appstream-glib
-    wrapGAppsHook
+    wrapGAppsHook4
     desktop-file-utils
     gobject-introspection
   ];
 
   buildInputs = [
-    gtksourceview4
-    gspell
-    libhandy
-    poppler_gi
-    webkitgtk_4_1
-    librsvg
+    gtk4
+    gtksourceview5
+    libadwaita
     libportal
+    librsvg
+    poppler_gi
+    webkitgtk_6_0
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    pygobject3
-    pyxdg
+    bibtexparser
     pdfminer-six
-    pycairo
     pexpect
-    bibtexparser
+    pycairo
+    pygobject3
+    pyxdg
   ];
 
   checkPhase = ''
diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix
index 6b7e8f9c642..af4064abbec 100644
--- a/pkgs/applications/file-managers/nnn/default.nix
+++ b/pkgs/applications/file-managers/nnn/default.nix
@@ -10,11 +10,14 @@
 , readline
 , which
 , musl-fts
+, pcre
   # options
 , conf ? null
 , withIcons ? false
 , withNerdIcons ? false
 , withEmojis ? false
+, withPcre ? false
+, extraMakeFlags ? [ ]
 }:
 
 # Mutually exclusive options
@@ -44,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} src/nnn.h";
 
   nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
-  buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
+  buildInputs = [ readline ncurses ]
+    ++ lib.optional stdenv.hostPlatform.isMusl musl-fts
+    ++ lib.optional withPcre pcre;
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include";
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
@@ -52,7 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [ "PREFIX=$(out)" ]
     ++ lib.optionals withIcons [ "O_ICONS=1" ]
     ++ lib.optionals withNerdIcons [ "O_NERD=1" ]
-    ++ lib.optionals withEmojis [ "O_EMOJI=1" ];
+    ++ lib.optionals withEmojis [ "O_EMOJI=1" ]
+    ++ lib.optionals withPcre [ "O_PCRE=1" ]
+    ++ extraMakeFlags;
 
   binPath = lib.makeBinPath [ file which ];
 
@@ -63,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
     installShellCompletion --fish misc/auto-completion/fish/nnn.fish
     installShellCompletion --zsh misc/auto-completion/zsh/_nnn
 
+    cp -r plugins $out/share
+    cp -r misc/quitcd $out/share/quitcd
+
     wrapProgram $out/bin/nnn --prefix PATH : "$binPath"
   '';
 
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index f806be834bc..4721e946464 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boinc";
-  version = "7.22.2";
+  version = "7.24.1";
 
   src = fetchFromGitHub {
     name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-9GgvyYiDfppRuDFfxn50e+YZeSX0SLKSfo31lWx2FBs=";
+    hash = "sha256-CAzAKxNHG8ew9v2B1jK7MxfWGwTfdmDncDe7QT+twd8=";
   };
 
   nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
index 0a700a52573..ea24741ba51 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
@@ -1,25 +1,25 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pdm-backend
+, hatchling
 , more-itertools
 , click
 }:
 
 buildPythonPackage rec {
   pname = "hyprshade";
-  version = "0.9.3";
+  version = "0.12.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "loqusion";
     repo = "hyprshade";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-ou072V9nZUqf5DEolkMQy979SjaZs4iOuoszw50k4Y8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xcFX1YApwEN40jPgRT0H/7SiODxXGYVTPUkSZ8OFIWs=";
   };
 
   nativeBuildInputs = [
-    pdm-backend
+    hatchling
   ];
 
   propagatedBuildInputs = [ more-itertools click ];