diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 74cf3c6ea7c2..bc9927fe10d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,6 +93,8 @@ This section describes in some detail how changes can be made and proposed with
 7. Respond to review comments, potential CI failures and potential merge conflicts by updating the pull request.
    Always keep the pull request in a mergeable state.
 
+   This process is covered in more detail from the non-technical side in [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).
+
    The custom [OfBorg](https://github.com/NixOS/ofborg) CI system will perform various checks to help ensure code quality, whose results you can see at the bottom of the pull request.
    See [the OfBorg Readme](https://github.com/NixOS/ofborg#readme) for more details.
 
@@ -306,7 +308,7 @@ If you consider having enough knowledge and experience in a topic and would like
 
 Container system, boot system and library changes are some examples of the pull requests fitting this category.
 
-## How to merge pull requests
+## How to merge pull requests yourself
 [pr-merge]: #how-to-merge-pull-requests
 
 To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise:
@@ -316,10 +318,7 @@ To streamline automated updates, leverage the nixpkgs-merge-bot by simply commen
 
 Further, nixpkgs-merge-bot will ensure all ofBorg checks (except the Darwin-related ones) are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofBorg to finish before attempting the merge again.
 
-For other pull requests, the *Nixpkgs committers* are people who have been given
-permission to merge.
-
-It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.
+For other pull requests, please see [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).
 
 In case the PR is stuck waiting for the original author to apply a trivial
 change (a typo, capitalisation change, etc.) and the author allowed the members
@@ -516,6 +515,7 @@ To get a sense for what changes are considered mass rebuilds, see [previously me
   - [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual.
 
 ### Writing good commit messages
+[writing-good-commit-messages]: #writing-good-commit-messages
 
 In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
 
@@ -614,3 +614,174 @@ Names of files and directories should be in lowercase, with dashes between words
 
   As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
   If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
+
+## I opened a PR, how do I get it merged?
+[i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged
+
+In order for your PR to be merged, someone with merge permissions on the repository ("committer") needs to review and merge it.
+Because the group of people with merge permissions is mostly a collection of independent unpaid volunteers who do this in their own free time, this can take some time to happen.
+It is entirely normal for your PR to sit around without any feedback for days, weeks or sometimes even months.
+We strive to avoid the latter cases of course but the reality of it is that this does happen quite frequently.
+Even when you get feedback, follow-up feedback may take similarly long.
+Don't be intimidated by this and kindly ask for feedback again every so often.
+If your change is good it will eventually be merged at some point.
+
+There are some things you can do to help speed up the process of your PR being merged though.
+In order to speed the process up, you need to know what needs to happen before a committer will actually hit the merge button.
+This section intends to give a little overview and insight of what happens after you create your PR.
+
+### The committer's perspective
+
+PRs have varying quality and even the best people make mistakes.
+It is the role of the committer team to assess whether any PR's changes are good changes or not.
+In order for any PR to be merged, at least one committer needs to be convinced of its quality enough to merge it.
+
+Committers typically assess three aspects of your PR:
+
+1. Whether the change's intention is necessary and desirable
+2. Whether the code quality of your changes is good
+3. Whether the artefacts produced by the code are good
+
+If you want your PR to get merged quickly and smoothly, it is in your best interest to help convince committers in these three aspects.
+
+### How to help committers assess your PR
+
+For the committer to judge your intention, it's best to explain why you've made your change.
+This does not apply to trivial changes like version updates because the intention is obvious (though linking the changelog is appreciated).
+For any more nuanced changed or even major version upgrades, it helps if you explain the background behind your change a bit.
+E.g. if you're adding a package, explain what it is and why it should be in Nixpkgs.
+This goes hand in hand with [Writing good commit messages](#writing-good-commit-messages).
+
+For the code quality assessment, you cannot do anything yourself as only the committer can do this and they already have your code to look at.
+In order to minimise the need for back and forth though, do take a look over your code changes yourself and try to put yourself into the shoes of someone who didn't just write that code.
+Would you immediately know what the code does by glancing at it?
+If not, reviewers will notice this and will ask you to clarify the code by refactoring it and/or adding a few explanations in code comments.
+Doing this preemptively can save you and the committer a lot of time.
+
+The code artefacts are the hardest for committers to assess because PRs touch all sorts of components: applications, libraries, NixOS modules, editor plugins and many many other things.
+Any individual committer can only really assess components that they themselves know how to use however and yet they must still be convinced somehow.
+There isn't a good generic solution to this but there are some ways easing the committer's job here:
+
+- Provide smoke tests that the committer can run without much research or setup.
+
+  Committers usually don't have the time or interest to learn how your component works and how they could test its functionality.
+  If you can provide a quick guide on how to use the component in a meaningful way or a ready-made command that demonstrates that the component works as expected, the committer can easily convince themselves that your change is good.
+  If it can be automated, you could even turn this smoke test into an automated NixOS test which reviewers could simply run via Nix.
+- Invite other users of the component to try it out and report their findings.
+
+  If a committer sees the testimonials of other users trying your change and it works as expected for them, that too can convince the committer of your PR's quality.
+- Describe what you have done to test your PR.
+
+  If you can convince the committer that you have done sufficient quality assurance on your changes and they trust your report, this too can convince them of your PR's quality, albeit not as strongly as the methods above.
+- Become a maintainer of the component.
+
+  This isn't something you can do on your first few PRs touching a component but listed maintainers generally receive more trust when it comes to changes to their maintained components and committers may opt to merge changes without deeper review when they see they're done by their respective maintainer.
+
+Even if you adhere to all of these recommendations, it is still quite possible for your PR to be forgotten or abandoned by any given committer.
+Please remain mindful of the fact that they are doing this on their own volition and unpaid in their free time and therefore [owe you nothing](https://mikemcquaid.com/open-source-maintainers-owe-you-nothing/).
+Causing a stink in such a situation is a surefire way to get any other potential committer to not want to look at your PR either.
+Ask them nicely whether they still intend to review your PR and find yourself another committer to look at your PR if not.
+
+### How can I get a committer to look at my PR?
+
+- Simply wait. Reviewers frequently browse open PRs and may happen to run across yours and take a look.
+- Get non-committers to review/approve. Many committers filter open PRs for low-hanging fruit that are already been reviewed.
+- [@-mention](https://github.blog/news-insights/mention-somebody-they-re-notified/) someone and ask them nicely
+- Post in one of the channels made for this purpose if there has been no activity for at least one week
+  - The current "PRs ready for review" or "PRs already reviewed" threads in the [NixOS Discourse](https://discourse.nixos.org/c/dev/14) (of course choose the one that applies to your situation)
+  - The [Nixpkgs Review Requests Matrix room](https://matrix.to/#/#review-requests:nixos.org).
+
+### CI failed or got stuck on my PR, what do I do?
+
+First ensure that the failure is actually related to your change.
+Sometimes, the CI system simply has a hiccup or the check was broken by someone else before you made your changes.
+Read through the error message; it's usually quite easy to tell whether it is caused by anything you did by checking whether it mentions the component you touched anywhere.
+If it is indeed caused by your change, obviously try to fix it.
+Don't be afraid of asking for advice if you're uncertain how to do that, others have likely fixed such issues dozens of times and can help you out.
+Your PR is unlikely to be merged if it has a known issue and it is the purpose of CI to alert you aswell as reviewers to these issues.
+
+ofBorg builds can often get stuck, particularly in PRs targeting `staging` and in builders for the Darwin platform. Reviewers will know how to handle them or when to ignore them.
+Don't worry about it.
+If there is a build failure however and it happened due to a package related to your change, you need to investigate it of course.
+If ofBorg reveals the build to be broken on some platform and you don't have access to that platform, you should set your package's `meta.broken` accordingly.
+
+When in any doubt, please simply ask via a comment in your PR or through one of the help channels.
+
+## I received a review on my PR, how do I get it over the finish line?
+
+In the review process, the committer will have left some sort of feedback on your PR.
+They may have immediately approved of your PR or even merged it but the more likely case is that they want you to change a few things or that they require further input.
+
+A reviewer may have taken a look at the code and it looked good to them ("Diff LGTM") but they still need to be convinced of the artefact's quality.
+They might also be waiting on input from other users of the component or its listed maintainer on whether the intention of your PR makes sense for the component.
+If you know of people who could help clarify any of this, please bring the PR to their attention.
+The current state of the PR is frequently not clearly communicated, so please don't hesitate to ask about it if it's unclear to you.
+
+It's also possible for the reviewer to not be convinced that your PR is necessary or that the method you've chose to achieve your intention is the right one.
+
+Please explain your intentions and reasoning to the committer in such a case.
+There may be constraints you had to work with which they're not aware of or qualities of your approach that they didn't immediately notice.
+(If these weren't clear to the reviewer, that's a good sign you should explain them in your commit message or code comments!)
+
+There are some further pitfalls and realities which this section intends to make you aware of.
+
+### A reviewer requested a bunch of insubstantial changes on my PR
+
+The people involved in Nixpkgs care about code quality because, once in Nixpkgs, it needs to be maintained for many years to come.
+It is therefore likely that other people will ask you to do some things in another way or adhere to some standard.
+Sometimes however, they also care a bit too much and may ask you to adhere to a personal preference of theirs.
+It's not always easy to tell which is which and whether the requests are critically important to merging the PR.
+Sometimes another reviewer may also come along with totally different opinions on some points too.
+
+It is convention to mark review comments that are not critical to the PR as nitpicks but this is not always followed.
+As the PR author, you should still take a look at these as they will often reveal best practices and unwritten rules that usually have good reasons behind them and you may want to incorporate them into your modus operandi.
+
+Please keep in mind that reviewers almost always mean well here.
+Their intent is not to denounce your code, they simply want your code to be as good as it can be.
+Through their experience, they may also take notice of a seemingly insignificant issues that have caused significant burden before.
+
+Sometimes however, they can also get a bit carried away and become too perfectionistic.
+If you feel some of the requests are unreasonable or merely a matter of personal preference, try to nicely remind the reviewers that you may not intend this code to be 100% perfect or that you have different taste in some regards and press them on whether they think that these requests are *critical* to the PR's success.
+
+While we do have a set of [official standards for the Nix community](https://github.com/NixOS/rfcs/), we don't have standards for everything and there are often multiple valid ways to achieve the same goal.
+Unless there are standards forbidding the patterns used in your code or there are serious technical, maintainability or readability issues with your code, you can insist to keep the code the way you made it and disregard the requests.
+Please communicate this clearly though; a simple "I prefer it this way and see no major issue with it" can save you a lot of arguing.
+
+If you are unsure about some change requests, please ask reviewers *why* they requested them.
+This will usually reveal how important they deem it to be and will help educate you about standards, best practices, unwritten rules aswell as preferences people have and why.
+
+Some committers may have stronger opinions on some things and therefore (understandably) may not want to merge your PR if you don't follow their requests.
+It is totally fine to get yourself a second or third opinion in such a case.
+
+### Committers work on a push-basis
+
+It's possible for you to get a review but nothing happens afterwards, even if you reply to review comments.
+A committer not following up on your PR does not necessarily mean they're disinterested or unresponsive, they may have simply forgotten to follow up on it or had some other circumstances preventing them from doing so.
+
+Committers typically handle many other PRs besides yours and it is not realistic for them to keep up with all of them to a degree where they could reasonably remember to follow up on all PRs that they had intended following up upon.
+If someone left an approving review on your PR and didn't merge a few days later, the most likely case is that they simply forgot.
+
+Please see it as your responsibility to actively remind reviewers of your open PRs.
+
+The easiest way to do so is to simply cause them a Github notification.
+Github notifies people involved in the PR when you add a comment to your PR, push your PR or re-request their review.
+Doing any of that will get you people's attention again.
+
+It may very well be the case that you have to do this every time you need the committer to follow up upon your PR.
+Again, this is a community project so please be mindful of people's circumstances here; be nice when requesting reviews again.
+
+It may also be the case that the committer has lost interest or isn't familiar enough with the component you're touching to be comfortable merging your PR.
+They will likely not immediately state that fact however, so please ask for clarification and don't hesitate to find yourself another committer to take a look at your PR.
+
+### Nothing helped
+
+If you followed these guidelines but still got no results or if you feel that you have been wronged in some way, please explicitly reach out to the greater community via its communication channels.
+
+The [NixOS Discourse](https://discourse.nixos.org/) is a great place to do this as it has historically been the asynchronous medium with the greatest concentration of committers and other people who are significantly involved in Nixpkgs.
+There is a dedicated discourse thread [PRs in distress](https://discourse.nixos.org/t/prs-in-distress/3604) where you can link your PR if everything else fails.
+The [Nixpkgs / NixOS contributions Matrix channel](https://matrix.to/#/#dev:nixos.org) is the best synchronous channel with the same qualities.
+
+Please reserve these for cases where you've made a serious effort in trying to get the attention of multiple active committers and provided realistic means for them to assess your PR's quality though.
+As mentioned previously, it is unfortunately perfectly normal for a PR to sit around for weeks on end due to the realities of this being a community project.
+Please don't blow up situations where progress is happening but is merely not going fast enough for your tastes.
+Honking in a traffic jam will not make you go any faster.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de77658f1e2c..73b917770384 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3816,6 +3816,13 @@
     githubId = 98980;
     name = "Chmouel Boudjnah";
   };
+  chn = {
+    name = "Haonan Chen";
+    email = "chn@chn.moe";
+    matrix = "@chn:chn.moe";
+    github = "CHN-beta";
+    githubId = 35858462;
+  };
   choochootrain = {
     email = "hurshal@imap.cc";
     github = "choochootrain";
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 7a3f408aa98e..43829b13c6c0 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -72,7 +72,28 @@ in {
               defaultText = literalExpression ''
                 if name == "" then "redis" else "redis-''${name}"
               '';
-              description = "The username and groupname for redis-server.";
+              description = ''
+                User account under which this instance of redis-server runs.
+
+                ::: {.note}
+                If left as the default value this user will automatically be
+                created on system activation, otherwise you are responsible for
+                ensuring the user exists before the redis service starts.
+              '';
+            };
+
+            group = mkOption {
+              type = types.str;
+              default = config.user;
+              defaultText = literalExpression "config.user";
+              description = ''
+                Group account under which this instance of redis-server runs.
+
+                ::: {.note}
+                If left as the default value this group will automatically be
+                created on system activation, otherwise you are responsible for
+                ensuring the group exists before the redis service starts.
+              '';
             };
 
             port = mkOption {
@@ -337,7 +358,7 @@ in {
           redisConfStore = redisConfig conf.settings;
         in ''
           touch "${redisConfVar}" "${redisConfRun}"
-          chown '${conf.user}' "${redisConfVar}" "${redisConfRun}"
+          chown '${conf.user}':'${conf.group}' "${redisConfVar}" "${redisConfRun}"
           chmod 0600 "${redisConfVar}" "${redisConfRun}"
           if [ ! -s ${redisConfVar} ]; then
             echo 'include "${redisConfRun}"' > "${redisConfVar}"
@@ -353,7 +374,7 @@ in {
         Type = "notify";
         # User and group
         User = conf.user;
-        Group = conf.user;
+        Group = conf.group;
         # Runtime directory and mode
         RuntimeDirectory = redisName name;
         RuntimeDirectoryMode = "0750";
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index a075070f38b2..b288a08efd85 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -49,10 +49,10 @@ let
   in
     if isString v then toPhpString v
     # NOTE: If any value contains a , (comma) this will not get escaped
-    else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v)
+    else if isList v && strings.isConvertibleWithToString v then toPhpString (concatMapStringsSep "," toString v)
     else if isInt v then toString v
     else if isBool v then toString (if v then 1 else 0)
-    else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))"
+    else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString (toString v._file)}))"
     else if isHasAttr "_raw" then v._raw
     else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded."
   ;
diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix
index 9a9f180b2102..b60dbe3f7bc3 100644
--- a/nixos/modules/services/web-apps/invoiceplane.nix
+++ b/nixos/modules/services/web-apps/invoiceplane.nix
@@ -31,7 +31,7 @@ let
   mkPhpValue = v:
     if isString v then escapeShellArg v
     # NOTE: If any value contains a , (comma) this will not get escaped
-    else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v)
+    else if isList v && strings.isConvertibleWithToString v then escapeShellArg (concatMapStringsSep "," toString v)
     else if isInt v then toString v
     else if isBool v then boolToString v
     else abort "The Invoiceplane config value ${lib.generators.toPretty {} v} can not be encoded."
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index c0863a3fe7a9..d03df9afe63d 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -81,10 +81,10 @@ let
   in
     if isString v then toPhpString v
     # NOTE: If any value contains a , (comma) this will not get escaped
-    else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v)
+    else if isList v && strings.isConvertibleWithToString v then toPhpString (concatMapStringsSep "," toString v)
     else if isInt v then toString v
     else if isBool v then boolToString v
-    else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))"
+    else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString (toString v._file)}))"
     else if isHasAttr "_raw" then v._raw
     else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded."
   ;
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix
index 6ae27b93f29e..90ce4b28a0d4 100644
--- a/pkgs/applications/audio/dr14_tmeter/default.nix
+++ b/pkgs/applications/audio/dr14_tmeter/default.nix
@@ -25,6 +25,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "dr14_tmeter";
     license = licenses.gpl3Plus;
     homepage = "http://dr14tmeter.sourceforge.net/";
-    maintainers = [ maintainers.adisbladis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix
index 3169cddfa7d5..6fd7f9caaace 100644
--- a/pkgs/applications/audio/surge-XT/default.nix
+++ b/pkgs/applications/audio/surge-XT/default.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation rec {
   pname = "surge-XT";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "surge";
     rev = "release_xt_${version}";
     fetchSubmodules = true;
-    hash = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw=";
+    hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
index b6c53e26c5ed..ae10492957eb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
@@ -6,11 +6,11 @@
 
 melpaBuild rec {
   pname = "ebuild-mode";
-  version = "1.72";
+  version = "1.75";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
-    hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc=";
+    hash = "sha256-zEJCjSL90Ok2bUbLNcEK3vWcQSOyfrWvctHqZACfdIc=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 0628e56baef6..f8fc458aef28 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1644,8 +1644,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.24.1";
-          hash = "sha256-C6p5IBJ6aKH2/AainIBwIWTPEALtHMkAd9+QnFCzA7c=";
+          version = "0.24.2";
+          hash = "sha256-u6l6JJ7oWyb5HjZvWxbO+2RXeSOrsgeq8jEMnGmM1Ns=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
@@ -5029,6 +5029,8 @@ let
         };
       };
 
+      visualjj.visualjj = callPackage ./visualjj.visualjj { };
+
       visualstudioexptteam.intellicode-api-usage-examples = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "intellicode-api-usage-examples";
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
new file mode 100644
index 000000000000..e15cfdd5beae
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  vscode-utils,
+  fetchurl,
+  ...
+}:
+
+let
+  version = "0.11.8";
+
+  sources = {
+    "x86_64-linux" = {
+      arch = "linux-x64";
+      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
+      hash = "sha256-L46ORW4iZnZ1GNQSU4opp1bTIh036j9JNmkATjTt/qM=";
+    };
+    "x86_64-darwin" = {
+      arch = "darwin-x64";
+      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
+      hash = "sha256-h15HMZiV/bCVgoajEBe8XLSmFD7EsU2JVlpqiN6ntjQ=";
+    };
+    "aarch64-linux" = {
+      arch = "linux-arm64";
+      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
+      hash = "sha256-1h/xBMFXtHn/QA0FpZcuUFKxU65AMvaqds6Q9aNaW3s=";
+    };
+    "aarch64-darwin" = {
+      arch = "darwin-arm64";
+      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
+      hash = "sha256-9SagMPdkB8d2GeGR/R1EmH5y6VNZtYydst9S82kAQlA=";
+    };
+  };
+in
+vscode-utils.buildVscodeMarketplaceExtension {
+  vsix = fetchurl {
+    url = sources.${stdenv.hostPlatform.system}.url;
+    hash = sources.${stdenv.hostPlatform.system}.hash;
+    name = "visualjj-visualjj-${version}.zip";
+  };
+
+  mktplcRef = {
+    inherit version;
+    name = "visualjj";
+    publisher = "visualjj";
+    arch = sources.${stdenv.hostPlatform.system}.arch;
+  };
+
+  meta = {
+    description = "Jujutsu version control integration, for simpler Git workflow";
+    downloadPage = "https://www.visualjj.com";
+    homepage = "https://www.visualjj.com";
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.drupol ];
+  };
+}
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 5e22cc9aa016..c90a372681a3 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,9 +5,16 @@
 , extraPythonPackages ? (ps: [ ])
 
 , libsForQt5
+
+# unwrapped package parameters
+, withGrass ? true
+, withWebKit ? false
 }:
 let
-  qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {  };
+  qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {
+    withGrass = withGrass;
+    withWebKit = withWebKit;
+  };
 in symlinkJoin rec {
 
   inherit (qgis-unwrapped) version;
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix
index 53e6069e8707..56a15dbd7ddb 100644
--- a/pkgs/applications/gis/qgis/ltr.nix
+++ b/pkgs/applications/gis/qgis/ltr.nix
@@ -5,9 +5,16 @@
 , extraPythonPackages ? (ps: [ ])
 
 , libsForQt5
+
+# unwrapped package parameters
+, withGrass ? true
+, withWebKit ? false
 }:
 let
-  qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {  };
+  qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {
+    withGrass = withGrass;
+    withWebKit = withWebKit;
+  };
 in symlinkJoin rec {
 
   inherit (qgis-ltr-unwrapped) version;
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 17af854eabda..98caf348ae80 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -6,8 +6,8 @@
 , wrapGAppsHook3
 , wrapQtAppsHook
 
-, withGrass ? true
-, withWebKit ? false
+, withGrass
+, withWebKit
 
 , bison
 , cmake
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 97349b31845b..49d0fd5b366e 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -6,8 +6,8 @@
 , wrapGAppsHook3
 , wrapQtAppsHook
 
-, withGrass ? true
-, withWebKit ? false
+, withGrass
+, withWebKit
 
 , bison
 , cmake
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index 48756794b94f..f5d9a9eb9207 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, unzip, jdk, makeWrapper}:
 
 stdenv.mkDerivation {
-  version = "6.0.0";
+  version = "6.0.1";
   pname = "omegat";
 
   src = fetchurl {  # their zip has repeated files or something, so no fetchzip
-    url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.0/OmegaT_6.0.0_Without_JRE.zip";
-    sha256 = "sha256-dsbT5iuZBudUL4Kw4rdvi4y98mcvnYNj9jRvC5wJoYI=";
+    url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.1/OmegaT_6.0.1_Without_JRE.zip";
+    sha256 = "sha256-Rj50bzT8k7+GWb0p/ma+zy+PzkF7tB6iV4F4UVAImJg=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index ebdf67ca7a16..ceaec16839f9 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -24,6 +24,6 @@ buildGoModule rec {
     description = "Process manager for Procfile-based applications and tmux";
     mainProgram = "overmind";
     license = with licenses; [ mit ];
-    maintainers = [ maintainers.adisbladis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 4308f9769266..f1ebdb98c1c8 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -168,7 +168,7 @@ stdenv.mkDerivation {
     '';
     homepage = "https://subsurface-divelog.org";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ mguentner adisbladis ];
+    maintainers = with maintainers; [ mguentner ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/applications/networking/browsers/av-98/default.nix
index d17dfb8e28cb..1356adff7973 100644
--- a/pkgs/applications/networking/browsers/av-98/default.nix
+++ b/pkgs/applications/networking/browsers/av-98/default.nix
@@ -1,6 +1,9 @@
-{ lib, python3Packages, fetchgit }:
-
-python3Packages.buildPythonApplication rec {
+{
+  lib,
+  python3Packages,
+  fetchgit,
+}:
+python3Packages.buildPythonApplication {
   pname = "av-98";
   version = "1.0.2dev";
 
@@ -10,7 +13,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "09iskh33hl5aaif763j1fmbz7yvf0yqsxycfd41scj7vbwdsbxl0";
   };
 
-  propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ];
+  propagatedBuildInputs = with python3Packages; [
+    ansiwrap
+    cryptography
+  ];
 
   # No tests are available
   doCheck = false;
@@ -22,5 +28,7 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "av98";
     license = licenses.bsd2;
     maintainers = with maintainers; [ ehmry ];
+
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 830ef080492b..5785c614260f 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cni-plugins";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    hash = "sha256-Veuv7DwwnSUnz2p5gemqQB9pr05nLLQ6gG4JvqFbZ/U=";
+    hash = "sha256-7jl8c/191KiQSzixDXMcSFCrSqZFs4F7ZCe9BwrFqQ8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 995284672bb8..d8f898ef11c8 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -6,7 +6,7 @@ let
 
   src = fetchurl {
     url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
-    hash = "sha256-pm4Ji1gv5vNMgB9ZWNKMLZSUE9wBklQ/MnFOKHP+Rcc=";
+    hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c=";
   };
 
   desktopItem = (makeDesktopItem {
diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix
index 6d49ef0ab3f6..8e5408d12f49 100644
--- a/pkgs/applications/science/logic/cadical/default.nix
+++ b/pkgs/applications/science/logic/cadical/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cadical";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "arminbiere";
     repo = "cadical";
     rev = "rel-${version}";
-    sha256 = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
+    sha256 = "sha256-sSvJgHxsRaJ/xHEK32fox0MFI7u+pj5ERLfNn2s8kC8=";
   };
 
   outputs = [ "out" "dev" "lib" ];
diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix
deleted file mode 100644
index b536642cbf55..000000000000
--- a/pkgs/applications/version-management/git-branchstack/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, fetchPypi
-, buildPythonApplication
-, git-revise
-}:
-
-buildPythonApplication rec {
-  pname = "git-branchstack";
-  version = "0.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
-  };
-
-  buildInputs = [
-    git-revise
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/krobelus/git-branchstack";
-    description = "Efficiently manage Git branches without leaving your local branch";
-    license = licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix
index 4d342c6bbb29..3e8678a8a76c 100644
--- a/pkgs/by-name/fa/fastcdr/package.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-R+StDJVqT0ktbr4cQBwEAPmju+pmBvxonezsIsPwmgc=";
+    hash = "sha256-bJ8/7k6+YzVsklppCoI7+pS5wVvpSDPLGrrcMejCj3g=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix
new file mode 100644
index 000000000000..e0cdfaa884df
--- /dev/null
+++ b/pkgs/by-name/gi/git-branchstack/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+
+let
+  self = python3Packages.buildPythonApplication {
+    pname = "git-branchstack";
+    version = "0.2.0";
+
+    src = fetchPypi {
+      pname = "git-branchstack";
+      inherit (self) version;
+      hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
+    };
+
+    dependencies = with python3Packages; [
+      git-revise
+    ];
+
+    meta = {
+      homepage = "https://github.com/krobelus/git-branchstack";
+      description = "Efficiently manage Git branches without leaving your local branch";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ AndersonTorres ];
+    };
+  };
+in
+self
diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix
index 3cb4665f5e48..9c1742ebc712 100644
--- a/pkgs/by-name/ht/htcondor/package.nix
+++ b/pkgs/by-name/ht/htcondor/package.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "htcondor";
-  version = "23.9.6";
+  version = "23.10.1";
 
   src = fetchFromGitHub {
     owner = "htcondor";
     repo = "htcondor";
 
     rev = "v${version}";
-    hash = "sha256-Xm1K3KESOVStOi6iyCGA8qbQ2IcyS//sF5pvnnMZAlA=";
+    hash = "sha256-5gxylfqG87dUEQT3e3vNgtTqWk0QTgWXwAdEAiIuc/E=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index 874cac3bf5d6..ece3cb1dbce3 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -5,7 +5,7 @@
 , stdenv
 }:
 let
-  pname = "immersed-vr";
+  pname = "immersed";
   version = "10.5.0";
 
   sources = rec {
diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index c894c991187a..7686ec3f13f9 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -2,14 +2,14 @@
 
 libsForQt5.mkDerivation rec {
   pname = "kgeotag";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     repo = "kgeotag";
     owner = "graphics";
     rev = "v${version}";
-    hash = "sha256-G9SyGvoSOL6nsWnMuSIUSFHFUwZUzExBJBkKN46o8GI=";
+    hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/by-name/li/libusbp/package.nix b/pkgs/by-name/li/libusbp/package.nix
index 01d061fe0dcc..d1f1a2cc3b23 100644
--- a/pkgs/by-name/li/libusbp/package.nix
+++ b/pkgs/by-name/li/libusbp/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation(finalAttrs: {
   pname = "libusbp";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "libusbp";
     rev = finalAttrs.version;
-    hash = "sha256-60xpJ97GlqEcy2+pxGNGPfWDnbIFGoPXJijaErOBXQs=";
+    hash = "sha256-hFvQceUapzlD021KIOJbSXX7qv1IQMuEudRHYeCkbS8=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix
index 3af5602ca8c9..b14e975dabd4 100644
--- a/pkgs/by-name/ma/maltego/package.nix
+++ b/pkgs/by-name/ma/maltego/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maltego";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchzip {
     url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip";
-    hash = "sha256-dPpkIoWK/mzC9wD+3QTNv3tYG27QVgCxtAymkwjIwUY=";
+    hash = "sha256-BWLdgaAO905lhFiRbpCJUa/7JyfCiRjHwq2qZw2GjgQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix
index 6f20905a3089..660230e40332 100644
--- a/pkgs/by-name/ne/newcomputermodern/package.nix
+++ b/pkgs/by-name/ne/newcomputermodern/package.nix
@@ -6,12 +6,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "newcomputermodern";
-  version = "5.1";
+  version = "6.0.0";
 
   src = fetchgit {
     url = "https://git.gnu.org.ua/newcm.git";
     rev = finalAttrs.version;
-    hash = "sha256-a6paSdF754jCp4DePbx2in9316H9EjyrAKOQpyc3hEo=";
+    hash = "sha256-AMzEytBn9PbyYFNJ2CMPg8ejsL3eFhY+eZHXShaLG9E=";
   };
 
   nativeBuildInputs = [ fontforge ];
diff --git a/pkgs/by-name/nt/ntpstat/package.nix b/pkgs/by-name/nt/ntpstat/package.nix
new file mode 100644
index 000000000000..7293cf6925fa
--- /dev/null
+++ b/pkgs/by-name/nt/ntpstat/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "ntpstat";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "mlichvar";
+    repo = "ntpstat";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-dw6Pi+aB7uK65H0HL7q1vYnM5Dp0D+kG+ZIaiv8VH5I=";
+  };
+
+  postPatch = ''
+    patchShebangs ntpstat
+  '';
+
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+
+  meta = {
+    description = "Print the ntpd or chronyd synchronisation status";
+    homepage = "https://github.com/mlichvar/ntpstat";
+    license = lib.licenses.mit;
+    mainProgram = "nptstat";
+    maintainers = with lib.maintainers; [ hzeller ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index e8ffe9f3b877..1060c148ea38 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "obsidian";
-  version = "1.6.7";
+  version = "1.7.4";
   appname = "Obsidian";
   meta = with lib; {
     description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -26,7 +26,7 @@ let
   filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
   src = fetchurl {
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8=";
+    hash = if stdenv.hostPlatform.isDarwin then "sha256-r3dSHx3y7BzjbWYJwXwyWCeTRya2jLMVhzV7NWpRDb4=" else "sha256-NRL8WHi+4ne48z7b9G6trJZiTt/lhwcF2CZjgyYmOug=";
   };
 
   icon = fetchurl {
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index f7ad046330e8..e401e72d0ff3 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -89,6 +89,7 @@ python3.pkgs.buildPythonApplication rec {
     fpdf2
     ftfy
     google-generativeai
+    googleapis-common-protos
     langchain
     langchain-chroma
     langchain-community
diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix
index 4b1b21f3823a..ad3335f6b866 100644
--- a/pkgs/by-name/sc/screego/package.nix
+++ b/pkgs/by-name/sc/screego/package.nix
@@ -10,13 +10,13 @@
 }:
 let
 
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "screego";
     repo = "server";
     rev = "v${version}";
-    hash = "sha256-PTGIcv+jgX8t37otBypuZG6DaGIeo92+w6YlRynIkZE=";
+    hash = "sha256-P8O3E7mNAqUid42XFaJBQm3ApxykYLCuHXDOFHrG9Fs=";
   };
 
   ui = stdenv.mkDerivation {
diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix
index 224150c17396..0a3d99458663 100644
--- a/pkgs/data/themes/qogir-kde/default.nix
+++ b/pkgs/data/themes/qogir-kde/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "qogir-kde";
-  version = "0-unstable-2024-09-01";
+  version = "0-unstable-2024-09-21";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "dff5c1fbbaa0b824684c65063b635cf27bcb19ce";
-    hash = "sha256-uK9lJVRdMszA0am1/E4mfIN50yNKONH85M7+e0ERtn4=";
+    rev = "9f665cc10ded4fe0a3100c9151a5bd12d1ac50ca";
+    hash = "sha256-3WdDzOKO962RykLS8P4paxEiA1keGhuah/GhAKdsuhA=";
   };
 
   # Propagate sddm theme dependencies to user env otherwise sddm does
diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix
index 8b1e24fd640e..dfef4a3a7262 100644
--- a/pkgs/desktops/gnome/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome/extensions/impatience/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-impatience";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
     rev = "refs/tags/version-${version}";
-    hash = "sha256-yBRnhdCDeA0bL+kkrmnIqyXAlhZzO2Vthc4Dnba80j4=";
+    hash = "sha256-Z+tpmmGbC1rgV4U1w6qM3g85FwpRvzHbBCmFCfcmc60=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/coq-modules/coqutil/default.nix b/pkgs/development/coq-modules/coqutil/default.nix
new file mode 100644
index 000000000000..ceac4b17b4c6
--- /dev/null
+++ b/pkgs/development/coq-modules/coqutil/default.nix
@@ -0,0 +1,30 @@
+{
+  coq,
+  findutils,
+  lib,
+  mkCoqDerivation,
+  version ? null,
+}:
+
+mkCoqDerivation {
+  pname = "coqutil";
+  owner = "mit-plv";
+
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch coq.version [
+      { case = range "8.18" "8.20"; out = "0.0.6"; }
+      { case = range "8.17" "8.20"; out = "0.0.5"; }
+    ] null;
+
+  releaseRev = v: "v${v}";
+  release."0.0.6".sha256 = "sha256-c/ddrj0ahuaj9Zu7YBqK7Q0ur+LK7Fgaa//nxQpQcm4=";
+  release."0.0.5".sha256 = "sha256-vkZIAAr82GNuCGlCVRgSCj/nqIdD8FITBiX1a8fybqw=";
+
+  nativeBuildInputs = [ findutils ];
+
+  meta = {
+    description = "Coq library for tactics, basic definitions, sets, maps";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ stepbrobd ];
+  };
+}
diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/development/libraries/mathgl/default.nix
index e2dc599c4f3b..c5cddcc46c37 100644
--- a/pkgs/development/libraries/mathgl/default.nix
+++ b/pkgs/development/libraries/mathgl/default.nix
@@ -8,11 +8,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "mathgl";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz";
-    sha256 = "sha256-yoS/lIDDntMRLpIMFs49jyiYaY9iiW86V3FBKGIqVao=";
+    sha256 = "sha256-cWYJlWhKawooI/Z49sQ4q6ukdKEVJGzfX5sLRgq/ysE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix
index f45f8c0ccaf0..48963155d0c0 100644
--- a/pkgs/development/python-modules/ansiwrap/default.nix
+++ b/pkgs/development/python-modules/ansiwrap/default.nix
@@ -9,7 +9,6 @@
   setuptools,
   textwrap3,
 }:
-
 buildPythonPackage rec {
   pname = "ansiwrap";
   version = "0.8.4";
@@ -47,5 +46,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml";
     license = licenses.asl20;
     maintainers = [ ];
+
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix
index 3125ed30624f..4ddc77de4c47 100644
--- a/pkgs/development/python-modules/bugzilla/default.nix
+++ b/pkgs/development/python-modules/bugzilla/default.nix
@@ -3,19 +3,20 @@
   buildPythonPackage,
   fetchPypi,
   requests,
+  responses,
   pytestCheckHook,
   glibcLocalesUtf8,
 }:
 
 buildPythonPackage rec {
   pname = "bugzilla";
-  version = "3.2.0";
+  version = "3.3.0";
   format = "setuptools";
 
   src = fetchPypi {
-    pname = "python-${pname}";
+    pname = "python_${pname}";
     inherit version;
-    sha256 = "TvyM+il4N8nk6rIg4ZcXZxW9Ye4zzsLBsPJ5DweGA4c=";
+    sha256 = "sha256-4YIgFx4DPrO6YAxNE5NZ0BqhrOwdrrxDCJEORQdj3kc=";
   };
 
   propagatedBuildInputs = [ requests ];
@@ -23,6 +24,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     glibcLocalesUtf8
+    responses
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
index d8429d0869ee..01ba9fd55a2a 100644
--- a/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "extension-helpers";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "astropy";
     repo = "extension-helpers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pYCSLb6uuQ9ZtMZOQH0DxLlfgFv3tgH+AL35IN71cNI=";
+    hash = "sha256-qneulhSYB2gYiCdgoU7Dqg1luLWhVouFVihcKeOA37E=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix
index 140c912543ed..16cb43c7d198 100644
--- a/pkgs/development/python-modules/findpython/default.nix
+++ b/pkgs/development/python-modules/findpython/default.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "findpython";
-  version = "0.6.1";
+  version = "0.6.2";
 in
 buildPythonPackage {
   inherit pname version;
@@ -26,7 +26,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VuUrQJqSvL1JXPmByFrPE387PlHMdptG66IZuxq3Uzw=";
+    hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM=";
   };
 
   nativeBuildInputs = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix
index 9b65a6341ced..222933a85dd6 100644
--- a/pkgs/development/python-modules/httpserver/default.nix
+++ b/pkgs/development/python-modules/httpserver/default.nix
@@ -1,30 +1,49 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
   docopt,
+  fetchPypi,
+  freezegun,
+  pytestCheckHook,
+  pythonOlder,
+  selenium,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "httpserver";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
 
-  buildInputs = [ docopt ];
-
-  # Tests pull in lots of other dependencies to emulate different web
-  # drivers.
-  doCheck = false;
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv";
+    hash = "sha256-W8Pa+CUS8vCzEcymjY6no5GMdSDSZs4bhmDtRsR4wuA=";
   };
 
+  build-system = [ setuptools ];
+
+  dependencies = [ docopt ];
+
+  nativeCheckInputs = [
+    freezegun
+    selenium
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "httpserver" ];
+
+  disabledTestPaths = [
+    # Tests want driver for Firefox
+    "tests/test_selenium.py"
+  ];
+
   meta = {
     description = "Asyncio implementation of an HTTP server";
-    mainProgram = "httpserver";
     homepage = "https://github.com/thomwiggers/httpserver";
     license = with lib.licenses; [ bsd3 ];
+    maintainers = [ ];
+    mainProgram = "httpserver";
   };
 }
diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index 2dbd6db3e0b6..d9c9002b8998 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
   pname = "open-clip-torch";
-  version = "2.27.0";
+  version = "2.27.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlfoundations";
     repo = "open_clip";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1LdxgRl72fDYdM9tZKMnHTvAY5QsWYiQSDWEGrngaOo=";
+    hash = "sha256-1wOxnpNEipA0N6o4b5JCsrAtBnGP7x+MPXmVIjfDmLI=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 9f031347d354..6356eeb9637f 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -25,17 +25,15 @@
 
 buildPythonPackage rec {
   pname = "pyqt6";
-  version = "6.7.0.dev2404081550";
+  version = "6.8.0.dev2410141303";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
+  # This is dangerous, how can we get web archive to archive the URL?
   src = fetchurl {
-    urls = [
-      "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
-      "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"
-    ];
-    hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ=";
+    url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz";
+    hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4=";
   };
 
   patches = [
@@ -55,8 +53,11 @@ buildPythonPackage rec {
     verbose = true
     EOF
 
+    # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK
     substituteInPlace pyproject.toml \
-      --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"'
+      --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \
+      --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \
+      --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix
index 841e0f91b45e..e554cf140167 100644
--- a/pkgs/development/python-modules/pystac-client/default.nix
+++ b/pkgs/development/python-modules/pystac-client/default.nix
@@ -18,15 +18,15 @@
 
 buildPythonPackage rec {
   pname = "pystac-client";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "stac-utils";
     repo = "pystac-client";
-    rev = "v${version}";
-    hash = "sha256-tzfpvNtj+KkKjA75En+OwxYQWGzxHLACLkzWT2j/ThU=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-EetS0MD5DLBR+ht9YfD+oRdfHbVONuVHdSZj3FQ5Sm8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix
index c6aacef32d32..f2b6f3d00b4c 100644
--- a/pkgs/development/python-modules/replicate/default.nix
+++ b/pkgs/development/python-modules/replicate/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "replicate";
-  version = "0.34.1";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "replicate";
     repo = "replicate-python";
-    rev = version;
-    hash = "sha256-DhmuGh0OASd4rBvizf1qx537j4RGs4eVe0jH1BrhZa4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix
index 9e4ad7c8bbcc..8e3e33cac1ed 100644
--- a/pkgs/development/python-modules/taskw/default.nix
+++ b/pkgs/development/python-modules/taskw/default.nix
@@ -2,13 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonAtLeast,
 
   # build-system
   setuptools,
 
   # native dependencies
   taskwarrior2,
+  distutils,
 
   # dependencies
   kitchen,
@@ -24,9 +24,6 @@ buildPythonPackage rec {
   version = "2.0.0";
   pyproject = true;
 
-  # ModuleNotFoundError: No module named 'distutils'
-  disabled = pythonAtLeast "3.12";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90=";
@@ -44,7 +41,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  buildInputs = [ taskwarrior2 ];
+  buildInputs = [
+    taskwarrior2
+    distutils
+  ];
 
   dependencies = [
     kitchen
diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix
index 9340132b63d9..4ec22b7dfc84 100644
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ b/pkgs/development/tools/database/sqlc/default.nix
@@ -24,6 +24,6 @@ buildGoModule {
     mainProgram = "sqlc";
     homepage = "https://sqlc.dev/";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.adisbladis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 613209b3a988..e88496ceb934 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "astyle";
-  version = "3.5.2";
+  version = "3.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-2wwKctQOZAwgHjnmRni2/jFvN+fvBfZ84rItVVwKbRI=";
+    hash = "sha256-EO18j5dOzONcF3jxYW8EypPD07/BoBeqJROWBBtnDvw=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/development/tools/rust/cargo-duplicates/default.nix
index 17c9cd7d83de..c04dc2ac571d 100644
--- a/pkgs/development/tools/rust/cargo-duplicates/default.nix
+++ b/pkgs/development/tools/rust/cargo-duplicates/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-duplicates";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "cargo-duplicates";
     rev = "v${version}";
-    hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k=";
+    hash = "sha256-VGxBmzMtev+lXGhV9pMefpgX6nPlzMaPbXq5LMdIvrE=";
   };
 
-  cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8=";
+  cargoHash = "sha256-xkPvbC/ot4U3gca57pEEze0jaQhUAZV1MEX0E6E1BmE=";
 
   nativeBuildInputs = [
     curl
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index b01d04ad8123..c49435674e44 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.33.4";
+  version = "0.33.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-V7d/lVNL7J/ErBlJUf8btrukGC+KSvk3r9AAethFNyk=";
+    hash = "sha256-wZfCk8jzTmltpmrp7QWU1uS5ct10iltNFdUCJvnrv98=";
   };
 
-  cargoHash = "sha256-Wu/F4PU02hrmiL7OaKIP59CfDVWrU5cw60TYngqJYNg=";
+  cargoHash = "sha256-5m3/5zwjDeDgPuUsTIknXwEMjQs0gtVoksQn4EdPnwM=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''
diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix
index 041f88111b00..da562f2bd549 100644
--- a/pkgs/development/tools/systemfd/default.nix
+++ b/pkgs/development/tools/systemfd/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
     mainProgram = "systemfd";
     homepage = "https://github.com/mitsuhiko/systemfd";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.adisbladis ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 
diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix
index c7bd84f17401..9c3940af4660 100644
--- a/pkgs/kde/misc/mpvqt/default.nix
+++ b/pkgs/kde/misc/mpvqt/default.nix
@@ -7,14 +7,14 @@
 }:
 mkKdeDerivation rec {
   pname = "mpvqt";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "mpvqt";
     rev = "v${version}";
-    hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4=";
+    hash = "sha256-baVTyz3sXfQC7NEO2VoN0bhXpgkKjclwrFN/CLsuoC0=";
   };
 
   extraBuildInputs = [ qtdeclarative ];
diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix
index 66212124e987..22aaaab92b8f 100644
--- a/pkgs/os-specific/linux/lenovo-legion/app.nix
+++ b/pkgs/os-specific/linux/lenovo-legion/app.nix
@@ -1,14 +1,20 @@
-{ lib, fetchFromGitHub, xorg, libsForQt5, wrapQtAppsHook, python3 }:
+{
+  lib,
+  fetchFromGitHub,
+  xorg,
+  wrapQtAppsHook,
+  python3,
+}:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "lenovo-legion-app";
-  version = "0.0.12";
+  version = "0.0.18";
 
   src = fetchFromGitHub {
     owner = "johnfanv2";
     repo = "LenovoLegionLinux";
-    rev = "v${version}-prerelease";
-    hash = "sha256-BNrRv9EBmNINQbAw+BzVxKl/XoDgH1tsNZHJxfSpNoU=";
+    rev = "e9c1d8157a7b25e4334d0b1d887338c670e39f6a";
+    hash = "sha256-6JYOTDzz9/flyEDQo1UPjWT5+Cuea5fsdbdc6AooDxU=";
   };
 
   sourceRoot = "${src.name}/python/legion_linux";
@@ -16,22 +22,24 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    pyqt5
     pyqt6
     argcomplete
     pyyaml
     darkdetect
     xorg.libxcb
-    libsForQt5.qtbase
   ];
 
   postPatch = ''
+    # only fixup application (legion-linux-gui), service (legiond) currently not installed so do not fixup
+    # version
     substituteInPlace ./setup.cfg \
       --replace-fail "_VERSION" "${version}"
-    substituteInPlace ../../extra/service/fancurve-set \
-      --replace-fail "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux"
+
+    # /etc
     substituteInPlace ./legion_linux/legion.py \
       --replace-fail "/etc/legion_linux" "$out/share/legion_linux"
+
+    # /usr
     substituteInPlace ./legion_linux/legion_gui.desktop \
       --replace-fail "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo"
   '';
@@ -47,8 +55,11 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/johnfanv2/LenovoLegionLinux";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.ulrikstrid ];
+    maintainers = with lib.maintainers; [
+      ulrikstrid
+      realsnick
+      chn
+    ];
     mainProgram = "legion_gui";
   };
 }
-
diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix
index 4835f4699835..a5f93738f690 100644
--- a/pkgs/servers/misc/virtiofsd/default.nix
+++ b/pkgs/servers/misc/virtiofsd/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "virtiofsd";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
     rev = "v${version}";
-    hash = "sha256-4GX+qqnrUuG6jsdnKU/67YOj0X8qyuPIQbPSkE3xTBo=";
+    hash = "sha256-2+PiorzYHxShatFbfQCry1bjBNL65/TxEj9MmdKmqP0=";
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-41pgoX/nGLEbMDJvdZt2HvrVMZPXqH6SWgow7A3rTBY=";
+  cargoHash = "sha256-hXQ/wDDDBV788SvZnYmjiPVrEGCPVusq0O+Uyupgfd0=";
 
   LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
   LIBCAPNG_LINK_TYPE =
diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix
index 06039d529d56..bf4deb7c5c9c 100644
--- a/pkgs/tools/filesystems/goofys/default.nix
+++ b/pkgs/tools/filesystems/goofys/default.nix
@@ -29,7 +29,7 @@ buildGoModule {
     homepage = "https://github.com/kahing/goofys";
     description = "High-performance, POSIX-ish Amazon S3 file system written in Go";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.adisbladis ];
+    maintainers = [ ];
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
     mainProgram = "goofys";
   };
diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index c2e09220a957..aaa96fdec84b 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -1,13 +1,71 @@
-{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive
-, avro-cpp, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt
-, nlohmann_json, spdlog, curl }:
+{
+  lib,
+  stdenv,
+  bzip2,
+  zlib,
+  autoconf,
+  automake,
+  cmake,
+  help2man,
+  texinfo,
+  libtool,
+  cppzmq,
+  libarchive,
+  avro-cpp,
+  boost,
+  zeromq,
+  openssl,
+  pam,
+  libiodbc,
+  libkrb5,
+  gcc,
+  libcxx,
+  which,
+  catch2,
+  nanodbc,
+  fmt,
+  nlohmann_json,
+  curl,
+  spdlog_rods,
+  bison,
+  flex
+}:
 
 # Common attributes of irods packages
 
 {
-  nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ];
-  buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp zeromq openssl pam libiodbc libkrb5 boost
-                  libcxx catch2 nanodbc fmt nlohmann_json spdlog curl ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    cmake
+    help2man
+    texinfo
+    which
+    gcc
+    bison
+    flex
+  ];
+  buildInputs = [
+    bzip2
+    zlib
+    libtool
+    cppzmq
+    libarchive
+    avro-cpp
+    zeromq
+    openssl
+    pam
+    libiodbc
+    libkrb5
+    boost
+    libcxx
+    catch2
+    nanodbc
+    fmt
+    nlohmann_json
+    spdlog_rods
+    curl
+  ];
 
   cmakeFlags = [
     "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}"
@@ -21,7 +79,7 @@
     "-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}"
     "-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}"
     "-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}"
-    "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}"
+    "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog_rods}"
     "-DIRODS_LINUX_DISTRIBUTION_NAME=nix"
     "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0"
     "-DCPACK_GENERATOR=TGZ"
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index beddb6959ba4..ca5fe7fa7329 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,89 +1,173 @@
-{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq
-, libarchive, avro-cpp_llvm, boost, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2
-, nanodbc_llvm, fmt, nlohmann_json, spdlog, curl }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  bzip2,
+  zlib,
+  autoconf,
+  automake,
+  cmake,
+  help2man,
+  texinfo,
+  libtool,
+  cppzmq,
+  libarchive,
+  avro-cpp_llvm,
+  boost,
+  zeromq,
+  openssl,
+  pam,
+  libiodbc,
+  libkrb5,
+  gcc,
+  libcxx,
+  which,
+  catch2,
+  nanodbc_llvm,
+  fmt,
+  nlohmann_json,
+  spdlog_llvm,
+  curl,
+  bison,
+  flex
+}:
 
+let
+  spdlog_rods = spdlog_llvm.overrideAttrs (attrs: {
+    inherit stdenv;
+    version = "1.10.0";
+    src = attrs.src.override {
+      rev = "v1.10.0";
+      hash = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws=";
+    };
+    postPatch = ''
+      substituteInPlace cmake/spdlog.pc.in \
+        --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
+    '';
+  });
+in
 let
   avro-cpp = avro-cpp_llvm;
   nanodbc = nanodbc_llvm;
 
   common = import ./common.nix {
-    inherit lib stdenv bzip2 zlib autoconf automake cmake
-      help2man texinfo libtool cppzmq libarchive
-      zeromq openssl pam libiodbc libkrb5 gcc libcxx
-      boost avro-cpp which catch2 nanodbc fmt nlohmann_json
-      spdlog curl;
+    inherit
+      lib
+      stdenv
+      bzip2
+      zlib
+      autoconf
+      automake
+      cmake
+      help2man
+      texinfo
+      libtool
+      cppzmq
+      libarchive
+      zeromq
+      openssl
+      pam
+      libiodbc
+      libkrb5
+      gcc
+      libcxx
+      boost
+      avro-cpp
+      which
+      catch2
+      nanodbc
+      fmt
+      nlohmann_json
+      curl
+      spdlog_rods
+      bison
+      flex
+      ;
   };
 in
 rec {
 
   # irods: libs and server package
-  irods = stdenv.mkDerivation (finalAttrs: common // {
-    version = "4.3.1";
-    pname = "irods";
+  irods = stdenv.mkDerivation (
+    finalAttrs:
+    common
+    // {
+      version = "4.3.3";
+      pname = "irods";
 
-    src = fetchFromGitHub {
-      owner = "irods";
-      repo = "irods";
-      rev = finalAttrs.version;
-      sha256 = "sha256-gWgNY8+zD2lRCV5ydOTF0qAgZ1dlQSQKxtdw+U235vg=";
-      fetchSubmodules = true;
-    };
+      src = fetchFromGitHub {
+        owner = "irods";
+        repo = "irods";
+        rev = finalAttrs.version;
+        hash = "sha256-SmN2FzeoA2/gjiDfGs2oifOVj0mK2WdQCgiSdIlENfk=";
+        fetchSubmodules = true;
+      };
 
-    # fix build with recent llvm versions
-    env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
+      # fix build with recent llvm versions
+      env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
 
-    cmakeFlags = common.cmakeFlags or [ ] ++ [
-      "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
-      "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
-      "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
-    ];
+      cmakeFlags = common.cmakeFlags or [ ] ++ [
+        "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib -D_GLIBCXX_USE_CXX11_ABI=0"
+        "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
+        "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
+      ];
 
-    postPatch = common.postPatch + ''
-      patchShebangs ./test
-      substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
-      for file in unit_tests/cmake/test_config/*.cmake
-      do
-        substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
-      done
+      postPatch =
+        common.postPatch
+        + ''
+          patchShebangs ./test
+          substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
+          for file in unit_tests/cmake/test_config/*.cmake
+          do
+            substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
+          done
 
-      substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
-    '';
-
-    meta = common.meta // {
-      longDescription = common.meta.longDescription + "This package provides the servers and libraries.";
-    };
-  });
+          substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
+        '';
 
+      meta = common.meta // {
+        longDescription = common.meta.longDescription + "This package provides the servers and libraries.";
+         mainProgram = "irodsServer";
+      };
+    }
+  );
 
   # icommands (CLI) package, depends on the irods package
-  irods-icommands = stdenv.mkDerivation (finalAttrs: common // {
-    version = "4.3.1";
-    pname = "irods-icommands";
+  irods-icommands = stdenv.mkDerivation (
+    finalAttrs:
+    common
+    // {
+      version = "4.3.3";
+      pname = "irods-icommands";
 
-    src = fetchFromGitHub {
-      owner = "irods";
-      repo = "irods_client_icommands";
-      rev = finalAttrs.version;
-      sha256 = "sha256-BjBg13KrCGRLOtGnp23qXOLudLctvu2gJ7wxHFjM5Ug=";
-    };
+      src = fetchFromGitHub {
+        owner = "irods";
+        repo = "irods_client_icommands";
+        rev = finalAttrs.version;
+        hash = "sha256-cc0V6BztJk3njobWt27VeJNmQUXyH6aBJkvYIDFEzWY=";
+      };
 
-    buildInputs = common.buildInputs ++ [ irods ];
+      buildInputs = common.buildInputs ++ [ irods ];
 
-    postPatch = common.postPatch + ''
-      patchShebangs ./bin
-    '';
+      postPatch =
+        common.postPatch
+        + ''
+          patchShebangs ./bin
+        '';
 
-    cmakeFlags = common.cmakeFlags ++ [
-      "-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
-      "-DIRODS_DIR=${irods}/lib/irods/cmake"
-      "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
-      "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
-      "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
-    ];
+      cmakeFlags = common.cmakeFlags ++ [
+        "-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
+        "-DIRODS_DIR=${irods}/lib/irods/cmake"
+        "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
+        "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
+        "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
+      ];
 
-    meta = common.meta // {
-      description = common.meta.description + " CLI clients";
-      longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'.";
-    };
-  });
+      meta = common.meta // {
+        description = common.meta.description + " CLI clients";
+        longDescription =
+          common.meta.longDescription + "This package provides the CLI clients, called 'icommands'.";
+      };
+    }
+  );
 }
diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix
index f62edf73e407..ea14221e427a 100644
--- a/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lokalise2-cli";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
     rev = "v${version}";
-    sha256 = "sha256-woRFrw51F9f+dGTkEPuN9ushGfEDwR59uqZIv78PLHE=";
+    sha256 = "sha256-1pc3XBsBQr9xBFIVOWZnA4YlgFYwJJJyV05W67hXG8k=";
   };
 
-  vendorHash = "sha256-SDI36+35yFy7Fp+VrnQMyIDUY1kM2tylwdS3I9E2vyk=";
+  vendorHash = "sha256-cN7YJDw5lOOngXJBeXa7V0Y/CjEydBMk3hvyfd0VL5I=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index 143710e3da66..eb1430fddc5f 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stow";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "mirror://gnu/stow/stow-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-p7rGc9qiRs9U/7SKET6t0gSmFWMOdrU7X2TYGidbd7M=";
+    hash = "sha256-DYWoUTZ355I2l7zkLNuzPStXr5FaveHQZx566Asu8LQ=";
   };
 
   nativeBuildInputs = [ perlPackages.perl ];
diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix
index 9f0cfb4d51b4..90017e2186a5 100644
--- a/pkgs/tools/misc/trillian/default.nix
+++ b/pkgs/tools/misc/trillian/default.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
     homepage = "https://github.com/google/trillian";
     description = "Transparent, highly scalable and cryptographically verifiable data store";
     license = [ licenses.asl20 ];
-    maintainers = [ maintainers.adisbladis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix
index d2df1709e706..ced815142e73 100644
--- a/pkgs/tools/networking/goimapnotify/default.nix
+++ b/pkgs/tools/networking/goimapnotify/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "goimapnotify";
-  version = "2.3.15";
+  version = "2.4";
 
   src = fetchFromGitLab {
     owner = "shackra";
     repo = "goimapnotify";
     rev = version;
-    hash = "sha256-da2Q+glDVWSf574pks6UzvQyzKAU+81ypy5H968Y7HE=";
+    hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk=";
   };
 
-  vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw=";
+  vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI=";
 
   postPatch = ''
     for f in command.go command_test.go; do
diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix
index 2eb15ebcfb7a..69c92320d7d0 100644
--- a/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -18,7 +18,7 @@
       ln -s nom "$out/bin/nom-build"
       ln -s nom "$out/bin/nom-shell"
       chmod a+x $out/bin/nom-build
-      installShellCompletion --zsh --name _nom-build completions/completion.zsh
+      installShellCompletion completions/*
     '';
   };
   raw-pkg = haskellPackages.callPackage ./generated-package.nix {};
diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
index 4e76a5194107..d278604484a5 100644
--- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix
+++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
@@ -9,10 +9,10 @@
 }:
 mkDerivation {
   pname = "nix-output-monitor";
-  version = "2.1.3";
+  version = "2.1.4";
   src = fetchzip {
-    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.3.tar.gz";
-    sha256 = "1xm40pp9lqj2hlwk3ds9zyjd4yqsis2a2ac5kn19z60glxvaijvx";
+    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.4.tar.gz";
+    sha256 = "0ghpbq6a1cmh0xy42ipg8l1qi4pjdjn0df5am26587w396r81n5r";
   };
   isLibrary = true;
   isExecutable = true;
@@ -36,7 +36,7 @@ mkDerivation {
     strict strict-types terminal-size text time transformers
     typed-process word8
   ];
-  homepage = "https://github.com/maralorn/nix-output-monitor";
+  homepage = "https://code.maralorn.de/maralorn/nix-output-monitor";
   description = "Processes output of Nix commands to show helpful and pretty information";
   license = lib.licenses.agpl3Plus;
   mainProgram = "nom";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b26388f2ab9c..615c4e6d59be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2187,8 +2187,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { };
-
   git-bug = callPackage ../applications/version-management/git-bug { };
 
   git-bug-migration = callPackage ../applications/version-management/git-bug-migration { };
@@ -8593,6 +8591,7 @@ with pkgs;
     fmt = fmt_8.override { inherit stdenv; };
     nanodbc_llvm = nanodbc.override { inherit stdenv; };
     avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
+    spdlog_llvm = spdlog.override { inherit stdenv fmt; };
   })
     irods
     irods-icommands;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index e4c1daf1a9df..7b6dd161bd22 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -57,6 +57,7 @@ let
       coqprime = callPackage ../development/coq-modules/coqprime {};
       coqtail-math = callPackage ../development/coq-modules/coqtail-math {};
       coquelicot = callPackage ../development/coq-modules/coquelicot {};
+      coqutil = callPackage ../development/coq-modules/coqutil {};
       corn = callPackage ../development/coq-modules/corn {};
       deriving = callPackage ../development/coq-modules/deriving {};
       dpdgraph = callPackage ../development/coq-modules/dpdgraph {};