From 69537e6aa64a03d027a5e98247e9df7b2f6db4c0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 22 Dec 2023 21:09:26 +0000
Subject: [PATCH 01/52] libssh2: add some key reverse-dependencies to
 passthru.tests

---
 .../development/libraries/libssh2/default.nix | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 091885a1f084..fa9115ea0070 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,4 +1,17 @@
-{ lib, stdenv, fetchurl, openssl, zlib, windows }:
+{ lib
+, stdenv
+, fetchurl
+, openssl
+, zlib
+, windows
+
+# for passthru.tests
+, aria2
+, curl
+, libgit2
+, mc
+, vlc
+}:
 
 stdenv.mkDerivation rec {
   pname = "libssh2";
@@ -15,6 +28,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ]
     ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
 
+  passthru.tests = {
+    inherit aria2 libgit2 mc vlc;
+    curl = (curl.override { scpSupport = true; }).tests.withCheck;
+  };
+
   meta = with lib; {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = "https://www.libssh2.org";

From c5c92feff79f44c85b4ed00cbc6a3e1e84840d5e Mon Sep 17 00:00:00 2001
From: Jakob Klepp <jakob.klepp@moonvision.io>
Date: Thu, 18 Jul 2024 14:29:06 +0200
Subject: [PATCH 02/52] nixos/oci-containers: document firewall bypass

Add explanation about the security impact of the
ports option.
Provide a safer example.

The problem is discussed in greater depth here:
https://github.com/NixOS/nixpkgs/issues/111852
---
 nixos/modules/virtualisation/oci-containers.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index f4fa93423179..5494b9ecf0f6 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -148,12 +148,17 @@ let
             somewhere within the specified `hostPort` range.
             Example: `1234-1236:1234/tcp`
 
+            Publishing a port bypasses the NixOS firewall. If the port is not
+            supposed to be shared on the network, make sure to publish the
+            port to localhost.
+            Example: `127.0.0.1:1234:1234`
+
             Refer to the
             [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details.
           '';
           example = literalExpression ''
             [
-              "8080:9000"
+              "127.0.0.1:8080:9000"
             ]
           '';
         };

From 588188fefce51faebe15aec1b37c68d976e067d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 08:11:27 +0000
Subject: [PATCH 03/52] renode-unstable: 1.15.1+20240627git66a08265a ->
 1.15.1+20240716gita55a3d050

---
 pkgs/by-name/re/renode-unstable/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index acec8f5c9dcb..db387982336e 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -5,11 +5,11 @@
 
 renode.overrideAttrs (finalAttrs: _: {
   pname = "renode-unstable";
-  version = "1.15.1+20240627git66a08265a";
+  version = "1.15.1+20240716gita55a3d050";
 
   src = fetchurl {
     url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
-    hash = "sha256-Np/+QydZ+temEOCPI4K+PHScCQBYeFPZ2pOlFLWYXmA=";
+    hash = "sha256-cYK/PNXy+G6Cg6oY1U13MX03d2r0hwKVMp9f3LqpTd0=";
   };
 
   passthru.updateScript =

From 6c3304da83fd1f6d6633aef878ffc6429778459b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 15:37:13 +0000
Subject: [PATCH 04/52] python312Packages.echo: 0.8.0 -> 0.9.0

---
 pkgs/development/python-modules/echo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index b72a85ea9b03..a07f10e8a4b1 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "echo";
-  version = "0.8.0";
+  version = "0.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glue-viz";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-IKd5n8+U6+0dgV4PbLcPaormXCX4srGcXmvYSrnCt60=";
   };
 
   nativeBuildInputs = [

From 8e3cf7d9b64938cca3bbc3e750dee7f8ca9e5893 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 00:11:24 +0000
Subject: [PATCH 05/52] snac2: 2.55 -> 2.56

---
 pkgs/servers/snac2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix
index fd35bb64452d..3103a51f3ccd 100644
--- a/pkgs/servers/snac2/default.nix
+++ b/pkgs/servers/snac2/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "snac2";
-  version = "2.55";
+  version = "2.56";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = pname;
     rev = version;
-    hash = "sha256-mhypzpdIr4XxsVsUhx2SGi3RiKpWiiIRNZm44Dl4FRs=";
+    hash = "sha256-/e2eUlcYvSQKrYvRAdjx6uKR7DnMipvblKZaHMr1go4=";
   };
 
   buildInputs = [ curl openssl ];

From 1ff77ae5ac102ca6d301c2be69f6168ce6eb7b0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 17:15:17 +0000
Subject: [PATCH 06/52] proto: 0.38.0 -> 0.38.3

---
 pkgs/by-name/pr/proto/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 71e26e3d57b4..0e19eb417167 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "proto";
-  version = "0.38.0";
+  version = "0.38.3";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-60PLC/5aouvUy33Qw/orEv+3/3j//3frUxZdh4chlMc=";
+    hash = "sha256-o/du9XmiS7U5ypm6osQtVTjrJY60iLCkJ4DWCYOeIoY=";
   };
 
-  cargoHash = "sha256-l6BzvJI+DimykVKYl7Gow+7f3uwfDFajmHcXKoUwcUk=";
+  cargoHash = "sha256-Z0XPouvv6eR9eKLQurI/UGSiRZyGUo/x1c/XbcJlO5A=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.SystemConfiguration

From f236dfa809494d389967e67ffc5a43dbf2a3b7a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 23:14:32 +0000
Subject: [PATCH 07/52] openpgp-ca: 0.13.1 -> 0.14.0

---
 pkgs/by-name/op/openpgp-ca/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix
index 0db67f6a22a2..e97087ccf596 100644
--- a/pkgs/by-name/op/openpgp-ca/package.nix
+++ b/pkgs/by-name/op/openpgp-ca/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-ca";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitLab {
     owner = "openpgp-ca";
     repo = "openpgp-ca";
     rev = "openpgp-ca/v${version}";
-    hash = "sha256-6K7H/d82Ge+JQykqTXAD43wlGTQl+U9D/vA+CNz4rfM=";
+    hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA=";
   };
 
-  cargoHash = "sha256-PrbepiaQbfGEqJRIcOMR6ED3BLopZLhospTzWRUoW0A=";
+  cargoHash = "sha256-L0Z+Oxov0y+PipdXz8/3Y0MKYhr/lNYurphc9s0K+Dg=";
 
   nativeBuildInputs = [
     pkg-config

From 79e55e325b48e86635a295b9c75edb39ce0ef504 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 12:24:09 +0000
Subject: [PATCH 08/52] beluga: 1.1.1 -> 1.1.2

---
 pkgs/applications/science/logic/beluga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix
index b1497e2b1dcb..d85f375f9f89 100644
--- a/pkgs/applications/science/logic/beluga/default.nix
+++ b/pkgs/applications/science/logic/beluga/default.nix
@@ -2,13 +2,13 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "beluga";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "Beluga-lang";
     repo = "Beluga";
     rev = "refs/tags/v${version}";
-    hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s=";
+    hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g=";
   };
 
   duneVersion = "3";

From e28178e6e33ebbcd0f2b56c6763eed4ca582fd13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 02:43:27 +0000
Subject: [PATCH 09/52] aiac: 5.0.1 -> 5.2.1

---
 pkgs/applications/networking/cluster/aiac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix
index 3e3730c1a42b..ac1d51ecee3a 100644
--- a/pkgs/applications/networking/cluster/aiac/default.nix
+++ b/pkgs/applications/networking/cluster/aiac/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "aiac";
-  version = "5.0.1";
+  version = "5.2.1";
   excludedPackages = [".ci"];
 
   src = fetchFromGitHub {
     owner = "gofireflyio";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-1kWXvmnfdx44HYjW3vHuj2oU1uMabeGcZutkpszWg7Y=";
+    hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw=";
   };
 
   vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";

From d5dcf82d19a5598c40fb874a25153dbd3f234dc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 12:24:25 +0000
Subject: [PATCH 10/52] seafile-shared: 9.0.6 -> 9.0.7

---
 pkgs/misc/seafile-shared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 0f9457c9aaef..e4852faeb409 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seafile-shared";
-  version = "9.0.6";
+  version = "9.0.7";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "sha256-ig22Rw9VWPqOsJS1Wxy69OjdMRcxh2fOyqMHBEky/Uo=";
+    sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s=";
   };
 
   nativeBuildInputs = [

From 087a46f14faba47ac0032fdd96d1b46a11210a57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 12:24:37 +0000
Subject: [PATCH 11/52] seafile-client: 9.0.6 -> 9.0.7

---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 0a133bb49e5e..64705c26b59b 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seafile-client";
-  version = "9.0.6";
+  version = "9.0.7";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "sha256-JjicVgDqiuIuVn7swbVekqQ+3Ly64Nd7qKu5UymTEYE=";
+    sha256 = "sha256-Q/Dimm4oJH6mh0mCbVhkqJuRI9wytGmeBGNjMWiPil4=";
   };
 
   nativeBuildInputs = [

From 67e62119072682e85be0efc0b050930d38b2815e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 18:56:32 +0000
Subject: [PATCH 12/52] caf: 1.0.0 -> 1.0.1

---
 pkgs/development/libraries/caf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 500b868edc07..854032d56157 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = version;
-    hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50=";
+    hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8=";
   };
 
   nativeBuildInputs = [ cmake ];

From ff60f2ca07e5007933e1bf2921520d2d76d607c0 Mon Sep 17 00:00:00 2001
From: Magnus Bergmark <me@mange.dev>
Date: Tue, 23 Jul 2024 23:32:09 +0200
Subject: [PATCH 13/52] maintainers: add Mange.

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af21a01d2d92..7047511ec81b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12349,6 +12349,13 @@
     githubId = 115060;
     name = "Marek Maksimczyk";
   };
+  Mange = {
+    name = "Magnus Bergmark";
+    email = "me@mange.dev";
+    github = "Mange";
+    githubId = 1599;
+    keys = [ { fingerprint = "2EA6 F4AA 110A 1BF2 2275  19A9 0443 C69F 6F02 2CDE"; } ];
+  };
   mangoiv = {
     email = "contact@mangoiv.com";
     github = "mangoiv";

From 9d67a1f61e06fe425e9ab8d23c0dc43838d5eb72 Mon Sep 17 00:00:00 2001
From: Magnus Bergmark <me@mange.dev>
Date: Tue, 23 Jul 2024 23:49:20 +0200
Subject: [PATCH 14/52] rofi-emoji: Split into v4 and v3 versions

https://github.com/Mange/rofi-emoji/releases/tag/v4.0.0

rofi-emoji now has two branches, one for the stable release of Rofi and
another for the unstable unreleased version of Rofi. A lot of Rofi forks
are based on this unstable branch, which causes some issues for users.

Having the latest release available should be helpful for those users.

The default named `rofi-emoji` version is version 3, which builds
against the current version of the `rofi` pkg.

The other version is exposed as `rofi-emoji-wayland` and is built with
version 4 against the `rofi-wayland` fork.

Other changes:

- Add Mange as maintainer.
- Update 3.4.0 to 3.4.1.
- Stop requiring xsel.
- Only require xclip with X11 support enabled.
- Only require wl-clipboard with Wayland support enabled.
---
 pkgs/applications/misc/rofi-emoji/default.nix | 89 +++++++++----------
 .../applications/misc/rofi-emoji/versions.nix | 18 ++++
 pkgs/top-level/all-packages.nix               |  7 +-
 3 files changed, 67 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/applications/misc/rofi-emoji/versions.nix

diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index 71d7ee69b1dc..39004f04945e 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -15,61 +15,58 @@
 , rofi-unwrapped
 , wl-clipboard
 , xclip
-, xsel
 , xdotool
 , wtype
 }:
 
-stdenv.mkDerivation rec {
-  pname = "rofi-emoji";
-  version = "3.4.0";
+import ./versions.nix ({ version, hash, patches}:
+  stdenv.mkDerivation rec {
+    pname = "rofi-emoji";
+    inherit version;
 
-  src = fetchFromGitHub {
-    owner = "Mange";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";
-  };
+    src = fetchFromGitHub {
+      owner = "Mange";
+      repo = "rofi-emoji";
+      rev = "v${version}";
+      inherit hash;
+    };
 
-  patches = [
-    # Look for plugin-related files in $out/lib/rofi
-    ./0001-Patch-plugindir-to-output.patch
-  ];
+    inherit patches;
 
-  postPatch = ''
-    patchShebangs clipboard-adapter.sh
-  '';
+    postPatch = ''
+      patchShebangs clipboard-adapter.sh
+    '';
 
-  postFixup = ''
-    chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
-    wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
-     --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ]
-       ++ lib.optionals waylandSupport [ wtype ]
-       ++ lib.optionals x11Support [ xdotool ])}
-  '';
+    postFixup = ''
+      chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
+      wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
+       --prefix PATH ":" ${lib.makeBinPath ([ libnotify ]
+         ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
+         ++ lib.optionals x11Support [ xclip xdotool ])}
+    '';
 
 
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    makeWrapper
-  ];
+    nativeBuildInputs = [
+      autoreconfHook
+      pkg-config
+      makeWrapper
+    ];
 
-  buildInputs = [
-    cairo
-    glib
-    libnotify
-    rofi-unwrapped
-    wl-clipboard
-    xclip
-    xsel
-  ];
+    buildInputs = [
+      cairo
+      glib
+      libnotify
+      rofi-unwrapped
+    ]
+      ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
+      ++ lib.optionals x11Support [ xclip ];
 
-  meta = with lib; {
-    description = "Emoji selector plugin for Rofi";
-    homepage = "https://github.com/Mange/rofi-emoji";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cole-h ];
-    platforms = platforms.linux;
-  };
-}
+    meta = with lib; {
+      description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
+      homepage = "https://github.com/Mange/rofi-emoji";
+      license = licenses.mit;
+      maintainers = with maintainers; [ cole-h Mange ];
+      platforms = platforms.linux;
+    };
+  }
+)
diff --git a/pkgs/applications/misc/rofi-emoji/versions.nix b/pkgs/applications/misc/rofi-emoji/versions.nix
new file mode 100644
index 000000000000..20b79d584634
--- /dev/null
+++ b/pkgs/applications/misc/rofi-emoji/versions.nix
@@ -0,0 +1,18 @@
+generic: {
+  v4 = generic {
+    version = "4.0.0";
+    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+  v3 = generic {
+    version = "3.4.1";
+    hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f6b69f82eaf..63737a263c36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32469,7 +32469,12 @@ with pkgs;
 
   rofi-calc = callPackage ../applications/science/math/rofi-calc { };
 
-  rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
+  rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
+  rofi-emoji-wayland = (
+    callPackage ../applications/misc/rofi-emoji {
+      rofi-unwrapped = rofi-wayland-unwrapped;
+    }
+  ).v4;
 
   rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
 

From 000336e4b7929475e1bb140c82e198b99f2fdf38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jul 2024 02:56:53 +0000
Subject: [PATCH 15/52] umpire: 2024.02.1 -> 2024.07.0

---
 pkgs/by-name/um/umpire/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index a56b6f9c5f23..075084affdd1 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "umpire";
-  version = "2024.02.1";
+  version = "2024.07.0";
 
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "umpire";
     rev = "v${version}";
-    hash = "sha256-cIUGlRNdbddxcC0Lj0co945RlHcPrDLo+bZIsUB9im4=";
+    hash = "sha256-T3f5zFaDri7v09/LNJE7v45Nosx9QQjTptnuFREk6PM=";
     fetchSubmodules = true;
   };
 

From 5c71c9d6b920b7c446f79b22afabc1d20a0816ca Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 26 Jul 2024 15:35:47 +0200
Subject: [PATCH 16/52] reuse: install man page and docs

---
 .../python-modules/reuse/default.nix          | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix
index 38424a22b927..277933b3c358 100644
--- a/pkgs/development/python-modules/reuse/default.nix
+++ b/pkgs/development/python-modules/reuse/default.nix
@@ -3,6 +3,11 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
+  sphinxHook,
+  furo,
+  myst-parser,
+  pbr,
+  sphinxcontrib-apidoc,
 
   # dependencies
   attrs,
@@ -30,7 +35,20 @@ buildPythonPackage rec {
     hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA=";
   };
 
-  build-system = [ poetry-core ];
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+
+  build-system = [
+    poetry-core
+    sphinxHook
+    furo
+    myst-parser
+    pbr
+    sphinxcontrib-apidoc
+  ];
 
   dependencies = [
     attrs
@@ -42,13 +60,22 @@ buildPythonPackage rec {
     tomlkit
   ];
 
-  nativeCheckInputs = [ pytestCheckHook freezegun ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    freezegun
+  ];
 
   disabledTestPaths = [
     # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError()
     "src/reuse"
   ];
 
+  sphinxBuilders = [
+    "html"
+    "man"
+  ];
+  sphinxRoot = "docs";
+
   pythonImportsCheck = [ "reuse" ];
 
   meta = with lib; {

From 849eb6fe97e50d397c931c3e02976535035e539a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Jul 2024 18:19:09 +0000
Subject: [PATCH 17/52] beeper: 3.107.2 -> 3.108.3

---
 .../networking/instant-messengers/beeper/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix
index 94e456867c47..b9ce525a9cbb 100644
--- a/pkgs/applications/networking/instant-messengers/beeper/default.nix
+++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix
@@ -10,10 +10,10 @@
 }:
 let
   pname = "beeper";
-  version = "3.107.2";
+  version = "3.108.3";
   src = fetchurl {
-    url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.107.2-build-240624c0qmp116e-x86_64.AppImage";
-    hash = "sha256-DFzPPVw8OCM7K6COQcC68ZntEZiqBW58IpiD4rpgguc=";
+    url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage";
+    hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0=";
   };
   appimage = appimageTools.wrapType2 {
     inherit version pname src;

From fdfaaae011a36b46bf192476805fc3e6464c5940 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 27 Jul 2024 11:49:07 +0100
Subject: [PATCH 18/52] libdwarf-lite: init at 0.10.1

Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
---
 pkgs/by-name/li/libdwarf-lite/package.nix | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/li/libdwarf-lite/package.nix

diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix
new file mode 100644
index 000000000000..25ea4593de2f
--- /dev/null
+++ b/pkgs/by-name/li/libdwarf-lite/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libdwarf-lite";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "jeremy-rifkin";
+    repo = "libdwarf-lite";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ouhYapiqBFPJwoUIyiuEtsezF2wR63WZL7VwvnDExoU=";
+  };
+
+  outputs = [
+    "dev"
+    "lib"
+    "out"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_DWARFDUMP" false)
+    (lib.cmakeBool "PIC_ALWAYS" true)
+  ];
+
+  meta = {
+    description = "Minimal libdwarf mirror for faster cloning and configuration";
+    homepage = "https://github.com/jeremy-rifkin/libdwarf-lite";
+    license = lib.licenses.lgpl21Only;
+    maintainers = [ ];
+    mainProgram = "libdwarf-lite";
+    platforms = lib.platforms.all;
+  };
+})

From 03f1c7eefa59ad90a77e9e08aaec21e53b252d1c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 27 Jul 2024 11:49:33 +0100
Subject: [PATCH 19/52] naja: init at 0-unstable-2024-07-21

Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
---
 pkgs/by-name/na/naja/package.nix | 69 ++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/na/naja/package.nix

diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
new file mode 100644
index 000000000000..1f724e3c63d6
--- /dev/null
+++ b/pkgs/by-name/na/naja/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  bison,
+  boost,
+  capnproto,
+  doxygen,
+  flex,
+  libdwarf-lite,
+  pkg-config,
+  python3,
+  tbb_2021_11,
+}:
+stdenv.mkDerivation {
+  pname = "naja";
+  version = "0-unstable-2024-07-21";
+
+  src = fetchFromGitHub {
+    owner = "najaeda";
+    repo = "naja";
+    rev = "8c068f3bd1bbd57b851547f191a58a375fd35cda";
+    hash = "sha256-aUYPJGr4D5n92fp0namPT6I/gMRZoF7YHnB7GoRzwYI=";
+    fetchSubmodules = true;
+  };
+
+  outputs = [
+    "dev"
+    "lib"
+    "out"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bison
+    capnproto
+    cmake
+    doxygen
+    flex
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    boost
+    capnproto # cmake modules
+    flex # include dir
+    libdwarf-lite
+    tbb_2021_11
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
+    (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true)
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Structural Netlist API (and more) for EDA post synthesis flow development";
+    homepage = "https://github.com/najaeda/naja";
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+    mainProgram = "naja_edit";
+    platforms = lib.platforms.all;
+  };
+}

From f728dd56afcc6355e50238db7beacb1cd11adb9c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 1 Aug 2024 14:54:39 +0200
Subject: [PATCH 20/52] naja: Mark broken on Darwin, add temporary note about
 maintenance

---
 pkgs/by-name/na/naja/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
index 1f724e3c63d6..dd0903a21f29 100644
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@@ -62,8 +62,12 @@ stdenv.mkDerivation {
     description = "Structural Netlist API (and more) for EDA post synthesis flow development";
     homepage = "https://github.com/najaeda/naja";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = [
+      # maintained by the team working on NGI-supported software, no group for this yet
+    ];
     mainProgram = "naja_edit";
     platforms = lib.platforms.all;
+    # "aligned deallocation function of type [...] is only available on macOS 10.13 or newer" even with 11.0 SDK
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 812a66dbd67455c83db78fb76fb439a01669ee26 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@rrcomtech.com>
Date: Thu, 1 Aug 2024 21:04:34 +0200
Subject: [PATCH 21/52] libjson-rpc-cpp: 1.3.0 -> 1.4.1

---
 .../libraries/libjson-rpc-cpp/default.nix     | 43 +++++--------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 4e97ff2f4d5d..f132a66560be 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,47 +1,22 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, pkg-config
-, cmake
-, argtable
-, catch2
-, curl
-, doxygen
-, hiredis
-, jsoncpp
-, libmicrohttpd
-}:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, argtable, catch2
+, curl, doxygen, hiredis, jsoncpp, libmicrohttpd }:
 
 stdenv.mkDerivation rec {
   pname = "libjson-rpc-cpp";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "cinemast";
     repo = "libjson-rpc-cpp";
-    sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w=";
+    sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ=";
     rev = "v${version}";
   };
 
   env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2";
 
-  patches = [
-    (fetchpatch {
-      name = "int-to-MHD_Result.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch";
-      sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM=";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config cmake doxygen ];
-  buildInputs = [
-    argtable
-    catch2
-    curl
-    hiredis
-    jsoncpp
-    libmicrohttpd
-  ];
+
+  buildInputs = [ argtable catch2 curl hiredis jsoncpp libmicrohttpd ];
 
   postPatch = ''
     for f in cmake/FindArgtable.cmake \
@@ -71,7 +46,9 @@ stdenv.mkDerivation rec {
   preInstall = ''
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
-      q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
+      q="$p:${
+        lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]
+      }:$out/lib"
       patchelf --set-rpath $q $1
     }
 
@@ -98,5 +75,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cinemast/libjson-rpc-cpp";
     license = licenses.mit;
     platforms = platforms.linux;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with maintainers; [ robertrichter ];
   };
 }

From 4a7c396766098b2f2f756dc477d2821d2e9efd57 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:21:10 +0300
Subject: [PATCH 22/52] koboldcpp: 1.71.1 -> 1.72

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.72
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.71.1...v1.72
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index aecb24f217f3..1b3e89c11be4 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.71.1";
+  version = "1.72";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-69iqpXzG9NXrqv08lJ36hlHWXwXUJs6yqcaGr32cHPw=";
+    hash = "sha256-DePcBVNXIWIlOXyNeNMUFFIQxQuwqG8KBUh2/X7R6X8=";
   };
 
   enableParallelBuilding = true;

From 77a4902508ec390c891a10299fb7be953b450d84 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Fri, 2 Aug 2024 16:41:05 +0200
Subject: [PATCH 23/52] pixelfed: drop raitobezarius as a maintainer

I'm not using seriously Pixelfed those days, this software is
non-trivial and the NixOS module seems to have some sharp edges.

Change-Id: Ie93df9dcb00d0a58bd5e4165e377979c489af0b0
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 nixos/tests/web-apps/pixelfed/standard.nix | 2 +-
 pkgs/servers/web-apps/pixelfed/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/web-apps/pixelfed/standard.nix b/nixos/tests/web-apps/pixelfed/standard.nix
index 9260e27af960..3e56dda8f07c 100644
--- a/nixos/tests/web-apps/pixelfed/standard.nix
+++ b/nixos/tests/web-apps/pixelfed/standard.nix
@@ -1,7 +1,7 @@
 import ../../make-test-python.nix ({pkgs, ...}:
 {
   name = "pixelfed-standard";
-  meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
+  meta.maintainers = [ ];
 
   nodes = {
     server = { pkgs, ... }: {
diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix
index 0d696b33a639..0243b05f6df0 100644
--- a/pkgs/servers/web-apps/pixelfed/default.nix
+++ b/pkgs/servers/web-apps/pixelfed/default.nix
@@ -43,7 +43,7 @@ php.buildComposerProject (finalAttrs: {
     description = "Federated image sharing platform";
     license = licenses.agpl3Only;
     homepage = "https://pixelfed.org/";
-    maintainers = with maintainers; [ raitobezarius ];
+    maintainers = [ ];
     platforms = php.meta.platforms;
   };
 })

From 6b5fd20954150d2b8c58264897e41fb066e993f2 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Fri, 2 Aug 2024 13:01:25 -0400
Subject: [PATCH 24/52] cargo-hakari: 0.9.28 -> 0.9.30

---
 pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix
index 6ae5123da7cf..e9edf5f8228e 100644
--- a/pkgs/development/tools/rust/cargo-hakari/default.nix
+++ b/pkgs/development/tools/rust/cargo-hakari/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hakari";
-  version = "0.9.28";
+  version = "0.9.30";
 
   src = fetchFromGitHub {
     owner = "guppy-rs";
     repo = "guppy";
     rev = "cargo-hakari-${version}";
-    sha256 = "sha256-mTemccM/C9M2kso9PNpd0UGEZJd/tBd1PjCpbDFFtNo=";
+    sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw=";
   };
 
-  cargoHash = "sha256-UaSW9PZMUhqjvRM0/URHaOfofG5Ap3bvKgAHa+H+MFw=";
+  cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY=";
 
   cargoBuildFlags = [ "-p" "cargo-hakari" ];
   cargoTestFlags = [ "-p" "cargo-hakari" ];

From 9d80cddfbe4995436af8946c17d54d3e0afeda54 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Fri, 2 Aug 2024 13:24:19 -0400
Subject: [PATCH 25/52] cargo-hakari: rfc style formatting

---
 .../tools/rust/cargo-hakari/default.nix       | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix
index e9edf5f8228e..c8429896be45 100644
--- a/pkgs/development/tools/rust/cargo-hakari/default.nix
+++ b/pkgs/development/tools/rust/cargo-hakari/default.nix
@@ -1,4 +1,8 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hakari";
@@ -13,8 +17,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY=";
 
-  cargoBuildFlags = [ "-p" "cargo-hakari" ];
-  cargoTestFlags = [ "-p" "cargo-hakari" ];
+  cargoBuildFlags = [
+    "-p"
+    "cargo-hakari"
+  ];
+  cargoTestFlags = [
+    "-p"
+    "cargo-hakari"
+  ];
 
   meta = with lib; {
     description = "Manage workspace-hack packages to speed up builds in large workspaces";
@@ -26,7 +36,13 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://crates.io/crates/cargo-hakari";
     changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ figsoda macalinao ];
+    license = with licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with maintainers; [
+      figsoda
+      macalinao
+    ];
   };
 }

From 5cbe9df983e107f96fab9f2227527eae6e2b78e1 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 3 Aug 2024 01:20:45 +0200
Subject: [PATCH 26/52] fzf-make: 0.35.0 -> 0.36.0

---
 pkgs/by-name/fz/fzf-make/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 0061ad81bbcd..0dd3feaa7caf 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fzf-make";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
     rev = "v${version}";
-    hash = "sha256-hrPBuNCtwYOynv0JUcEq0lVZ9k3iVPNyn04l8zVbkN4=";
+    hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE=";
   };
 
-  cargoHash = "sha256-O7rQp70ukw7LiC+m7rlqEGHVJw3Lo93WEmL3PFD7kBM=";
+  cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 1a3d77522d8b995851ca07b59ebb5d068eab0d69 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 16:11:30 +0800
Subject: [PATCH 27/52] =?UTF-8?q?cambalache:=200.90.2=20=E2=86=92=200.90.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/jpu/cambalache/-/compare/0.90.2...0.90.4

buildPythonApplication appends pythonPath to buildInputs so dependency('pygobject-3.0') works here without changes.
---
 pkgs/development/tools/cambalache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix
index f25d7247369c..6af8672e03e3 100644
--- a/pkgs/development/tools/cambalache/default.nix
+++ b/pkgs/development/tools/cambalache/default.nix
@@ -21,7 +21,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cambalache";
-  version = "0.90.2";
+  version = "0.90.4";
 
   format = "other";
 
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "jpu";
     repo = "cambalache";
     rev = version;
-    hash = "sha256-m3rearoCFQUzdZMXY2xyKf4dgdq7G4QlUbetrIqW83U=";
+    hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4=";
   };
 
   nativeBuildInputs = [

From 9c9107c7cb4e54cea7edf909e044586f6c32a075 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:37:30 +0000
Subject: [PATCH 28/52] =?UTF-8?q?eog:=2045.3=20=E2=86=92=2045.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/eog/-/compare/45.3...45.4
---
 pkgs/by-name/eo/eog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index ec1e7f61ee51..27aa4149e6c5 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eog";
-  version = "45.3";
+  version = "45.4";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-hlD2YtSSHYOnkE9rucokW69zX3F7R/rFs38NkOXokag=";
+    sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4=";
   };
 
   patches = [

From 0c3b6fc89870b2a6787469a97014608e6c093a27 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:39:20 +0000
Subject: [PATCH 29/52] =?UTF-8?q?evince:=2046.3=20=E2=86=92=2046.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evince/-/compare/46.3...46.3.1
---
 pkgs/by-name/ev/evince/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix
index a9192f33d000..d9a4d4337db5 100644
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evince";
-  version = "46.3";
+  version = "46.3.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vA0dQbnX/8di6Z0qv6+sv3RRgvCzHYbbXuyMZ/XzAGs=";
+    hash = "sha256-lFwgpvI4ObDVMycpFxRY6QaA2oJk6Zxvn0HCGcfu7nw=";
   };
 
   depsBuildBuild = [

From 3d46ea7eaa3cf40a0d9c78c59f2a7fe7db3e6370 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 18:06:12 +0800
Subject: [PATCH 30/52] evince, papers: Remove broken supportXPS option

I don't see a reason to override this and with -Dauto_features=enabled (from
our meson setup-hook) the build breaks without explicitly passing -Dxps=disabled.
---
 pkgs/by-name/ev/evince/package.nix | 6 ++----
 pkgs/by-name/pa/papers/package.nix | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix
index d9a4d4337db5..065613a6d7af 100644
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -21,6 +21,7 @@
 , djvulibre
 , libspectre
 , libarchive
+, libgxps
 , libhandy
 , libsecret
 , wrapGAppsHook3
@@ -35,8 +36,6 @@
 , gst_all_1
 , gi-docgen
 , supportMultimedia ? true # PDF multimedia
-, libgxps
-, supportXPS ? true # Open XML Paper Specification via libgxps
 , withLibsecret ? true
 }:
 
@@ -81,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     gspell
     gtk3
     libarchive
+    libgxps
     libhandy
     librsvg
     libspectre
@@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
     texlive.bin.core # kpathsea for DVI support
   ] ++ lib.optionals withLibsecret [
     libsecret
-  ] ++ lib.optionals supportXPS [
-    libgxps
   ] ++ lib.optionals supportMultimedia (with gst_all_1; [
     gstreamer
     gst-plugins-base
diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index c0de8348e838..efab205c5a8b 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -27,7 +27,6 @@
 , dbus
 , gi-docgen
 , libgxps
-, supportXPS ? true # Open XML Paper Specification via libgxps
 , withLibsecret ? true
 , supportNautilus ? (!stdenv.isDarwin)
 , libadwaita
@@ -87,14 +86,13 @@ stdenv.mkDerivation (finalAttrs: {
     gsettings-desktop-schemas
     libadwaita
     libarchive
+    libgxps
     librsvg
     libspectre
     pango
     poppler
   ] ++ lib.optionals withLibsecret [
     libsecret
-  ] ++ lib.optionals supportXPS [
-    libgxps
   ] ++ lib.optionals supportNautilus [
     nautilus
   ] ++ lib.optionals stdenv.isDarwin [

From 54d521ee09e55d2948948d6a2be9ce7c0e857f92 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:40:35 +0000
Subject: [PATCH 31/52] =?UTF-8?q?evolution:=203.52.3=20=E2=86=92=203.52.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution/-/compare/3.52.3...3.52.4
---
 .../networking/mailreaders/evolution/evolution/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index dbebc978d209..fd8d214d5ea6 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.52.3";
+  version = "3.52.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU=";
+    hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk=";
   };
 
   nativeBuildInputs = [

From 57cc14d39080659f219ed468792e567ee0288c4d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:46:06 +0000
Subject: [PATCH 32/52] =?UTF-8?q?evolution-data-server:=203.52.3=20?=
 =?UTF-8?q?=E2=86=92=203.52.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.52.3...3.52.4
---
 .../ev/evolution-data-server/hardcode-gsettings.patch       | 6 +++---
 pkgs/by-name/ev/evolution-data-server/package.nix           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
index dad575c05bbf..a98612382f1f 100644
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -152,10 +152,10 @@ index 5b4debf..77c8d9c 100644
  	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
  		GPowerProfileMonitor *power_monitor;
 diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-index 43bd383..4dce824 100644
+index 047fb97..960f44c 100644
 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
 +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
+@@ -1333,7 +1333,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
  		(GDestroyNotify) g_free,
  		(GDestroyNotify) contact_record_free);
  
@@ -202,7 +202,7 @@ index 2525856..7ecc1a8 100644
  				g_clear_object (&settings);
  			}
 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
-index 44ba49c..dfac2a2 100644
+index a83d3d3..dc7acac 100644
 --- a/src/calendar/libecal/e-reminder-watcher.c
 +++ b/src/calendar/libecal/e-reminder-watcher.c
 @@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 4fb4c39bad6f..fce52129f0ac 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,13 +50,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.52.3";
+  version = "3.52.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ=";
+    hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc=";
   };
 
   patches = [

From 6e97411a7a63cecdf75cc363af6522bee93e45d3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:48:32 +0000
Subject: [PATCH 33/52] =?UTF-8?q?evolution-ews:=203.52.3=20=E2=86=92=203.5?=
 =?UTF-8?q?2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.52.3...3.52.4
---
 .../mailreaders/evolution/evolution-ews/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index 5cd6608cbb6d..3ad8b21567b0 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-ews";
-  version = "3.52.3";
+  version = "3.52.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA=";
+    hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o=";
   };
 
   patches = [

From c17e6425756167ab3e960e20419beb912545e5ad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 03:49:59 +0000
Subject: [PATCH 34/52] =?UTF-8?q?gnome.gnome-bluetooth:=2046.0=20=E2=86=92?=
 =?UTF-8?q?=2046.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/46.0...46.1
---
 pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
index 8b1fd59d3f8c..f06954aec2fd 100644
--- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-bluetooth";
-  version = "46.0";
+  version = "46.1";
 
   # TODO: split out "lib"
   outputs = [ "out" "dev" "devdoc" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-E/4edfMXrNvfXoDJAp0uBjLWCpzPcqQ64263VFAh++8=";
+    hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw=";
   };
 
   nativeBuildInputs = [

From b56b289f6185ba05c72cfc2c2ebf5aeb31b5f785 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 04:01:36 +0000
Subject: [PATCH 35/52] =?UTF-8?q?gnome-builder:=2046.2=20=E2=86=92=2046.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/46.2...46.3
---
 pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 9bcbbe32d1c1..769d5c68cbf7 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-builder";
-  version = "46.2";
+  version = "46.3";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM=";
+    hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI=";
   };
 
   patches = [

From 637051873183ce529d60308e8606ac5ed0837c9b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 04:16:12 +0000
Subject: [PATCH 36/52] =?UTF-8?q?gnome.gnome-music:=2046.0=20=E2=86=92=204?=
 =?UTF-8?q?6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-music/-/compare/46.0...46.1
---
 pkgs/desktops/gnome/apps/gnome-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix
index 7def9a535d86..8808d5f32186 100644
--- a/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "46.0";
+  version = "46.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-pFDVzgFokvavL4q3H8fDlDguIse2ILqSpuFc9mvF7F8=";
+    hash = "sha256-Eb4tbCib5NxDOwxPtZo9rDvtAcf1oorualRBl6NTv/0=";
   };
 
   nativeBuildInputs = [

From 5adfa811afa06876b3653beedf7a5bad88ae8c38 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 3 Aug 2024 04:17:24 +0000
Subject: [PATCH 37/52] =?UTF-8?q?libshumate:=201.2.2=20=E2=86=92=201.2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.2.2...1.2.3
---
 pkgs/development/libraries/libshumate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix
index d0e6e95ad0c7..17783999b53c 100644
--- a/pkgs/development/libraries/libshumate/default.nix
+++ b/pkgs/development/libraries/libshumate/default.nix
@@ -22,14 +22,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.2.2";
+  version = "1.2.3";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # demo app
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs=";
+    hash = "sha256-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw=";
   };
 
   depsBuildBuild = [

From dee748da8648d7d84331cd0b6553ea544f560059 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 3 Aug 2024 22:17:43 +0800
Subject: [PATCH 38/52] deepin.deepin-pw-check: fix build for cracklib 2.10

---
 pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
index fd50f71ac201..44c52c31a8e4 100644
--- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
@@ -23,6 +23,10 @@ buildGoModule rec {
     hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
   };
 
+  patches = [
+    "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch"
+  ];
+
   vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY=";
 
   nativeBuildInputs = [

From 8a67aa85343fbacb073bb61184f47d035d9a6051 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 1 Aug 2024 13:03:45 +0200
Subject: [PATCH 39/52] python312Packages.ale-py: 0.9.0 -> 0.9.1

Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/refs/tags/v0.9.0...v0.9.1

Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.9.1
---
 .../ale-py/cmake-pybind11.patch               | 18 -----------
 .../python-modules/ale-py/default.nix         | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ale-py/cmake-pybind11.patch

diff --git a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch b/pkgs/development/python-modules/ale-py/cmake-pybind11.patch
deleted file mode 100644
index 5bcf5b1d9b2f..000000000000
--- a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 911e280..d484943 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -1,12 +1,6 @@
- find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
- 
--include(FetchContent)
--FetchContent_Declare(
--    pybind11
--    GIT_REPOSITORY https://github.com/pybind/pybind11
--    GIT_TAG v2.10.0)
--FetchContent_MakeAvailable(pybind11)
--
-+find_package(pybind11 REQUIRED)
- add_library(ale-py MODULE ale_python_interface.cpp)
- # Depend on the ALE and pybind11 module
- target_link_libraries(ale-py PUBLIC ale ale-lib)
diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index 14c3e7b939a6..cdf2363a52f1 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -3,25 +3,34 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   cmake,
   ninja,
   pybind11,
   setuptools,
   wheel,
+
+  # buildInputs
   SDL2,
   zlib,
+
+  # dependencies
   importlib-resources,
   numpy,
   typing-extensions,
   importlib-metadata,
+
+  # checks
   gymnasium,
   pytestCheckHook,
+
   stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "ale-py";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,14 +39,9 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "Arcade-Learning-Environment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-obZfNQ0+ppnq/BD4IFeMFAqJnCVV3X/2HeRwbdSKRFk=";
+    hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY=";
   };
 
-  patches = [
-    # don't download pybind11, use local pybind11
-    ./cmake-pybind11.patch
-  ];
-
   build-system = [
     cmake
     ninja
@@ -57,10 +61,16 @@ buildPythonPackage rec {
     typing-extensions
   ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
-  '';
+  postPatch =
+    # Relax the pybind11 version
+    ''
+      substituteInPlace src/python/CMakeLists.txt \
+        --replace-fail 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' 'find_package(pybind11 QUIET)'
+    ''
+    + ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+    '';
 
   dontUseCmakeConfigure = true;
 

From 2a4d620d6b6213fb17921e6a8acf60027c226ab7 Mon Sep 17 00:00:00 2001
From: Stephen Stubbs <stephen.stubbs@vanqor.com>
Date: Sat, 3 Aug 2024 18:33:27 +0100
Subject: [PATCH 40/52] zotero-beta: 7.0.0-83 -> 7.0.0-111

---
 pkgs/by-name/zo/zotero-beta/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix
index 2aca01589119..e8da30471190 100644
--- a/pkgs/by-name/zo/zotero-beta/package.nix
+++ b/pkgs/by-name/zo/zotero-beta/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "zotero";
-  version = "7.0.0-beta.83+066eda731";
+  version = "7.0.0-beta.111+b4f6c050e";
 
   src =
     let
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     in
     fetchurl {
       url = "https://download.zotero.org/client/beta/${escapedVersion}/Zotero-${escapedVersion}_linux-x86_64.tar.bz2";
-      hash = "sha256-wqew12/Icv4XS+IJRVcf1Rh/ipqBhe8QGkP8ErfS4J0=";
+      hash = "sha256-pZsmS4gKCT8UAjz9IJg5C7n4kk7bWT/7H5ONF20CzPM=";
     };
 
   dontPatchELF = true;

From 7ff715f93ddea6564e1ce5ab36c307fdd6634b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2024 19:46:16 +0000
Subject: [PATCH 41/52] python312Packages.glean-parser: 14.3.0 -> 14.5.0

---
 pkgs/development/python-modules/glean-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index c36ca579afe9..9fc995c3270a 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "14.3.0";
+  version = "14.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-tI1kMCn7gksLdq2ytKAOiKSd5OxHmsnFrdUsUR6b5IE=";
+    hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA=";
   };
 
   postPatch = ''

From 5a628e6349afe0e9843463418a3585cbfe85023e Mon Sep 17 00:00:00 2001
From: DariusChit <darius.chitoroaga@proton.me>
Date: Sat, 3 Aug 2024 15:50:42 +0100
Subject: [PATCH 42/52] tmux: add patch for hanging on shutdown

---
 pkgs/tools/misc/tmux/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index aa72ecb5d980..af381a062259 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -54,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch";
       hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4=";
     })
+    # https://github.com/tmux/tmux/issues/3905
+    # fix tmux hanging on shutdown
+    (fetchpatch {
+      url = "https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248.patch";
+      hash = "sha256-FZDy/ZgVdwUAam8g5SfGBSnMhp2nlHHfrO9eJNIhVPo=";
+    })
   ];
 
   nativeBuildInputs = [

From 072406a37f418489472abd6c39d852f2fe1cd5e3 Mon Sep 17 00:00:00 2001
From: Spencer Pogorzelski <34356756+Scoder12@users.noreply.github.com>
Date: Thu, 1 Aug 2024 19:16:23 -0700
Subject: [PATCH 43/52] ida-free: add openssl dependency to libida64

The cloud decompiler is currently not working because it tries to
dlopen() openssl. openssl is added to the RUNPATH of the main ida64
binary, but not of this helper library. Tell autoPatchelf to add it by
adding a reference to it.
---
 pkgs/by-name/id/ida-free/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix
index 87d7457280ef..237080eced38 100644
--- a/pkgs/by-name/id/ida-free/package.nix
+++ b/pkgs/by-name/id/ida-free/package.nix
@@ -121,6 +121,10 @@ stdenv.mkDerivation rec {
       ln -s $IDADIR/$bb $out/bin/$bb
     done
 
+    # runtimeDependencies don't get added to non-executables, and openssl is needed
+    #  for cloud decompilation
+    patchelf --add-needed libcrypto.so $IDADIR/libida64.so
+
     runHook postInstall
   '';
 

From c65a037bd5e54003f5d1d4245fff9467d1fa7b07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2024 01:39:07 +0000
Subject: [PATCH 44/52] gmid: 2.0.5 -> 2.1

---
 pkgs/by-name/gm/gmid/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix
index 40670bd5fbd5..09a8a33d828b 100644
--- a/pkgs/by-name/gm/gmid/package.nix
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmid";
-  version = "2.0.5";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = pname;
     rev = version;
-    hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc=";
+    hash = "sha256-C9CheVP0ZFf44J26KKa3+fkp8MB1sNVHnsHiNuNPKwQ=";
   };
 
   nativeBuildInputs = [ bison ];

From d005a72f3d9feb8dd5b2c687ece5bda6668eda8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2024 02:09:13 +0000
Subject: [PATCH 45/52] mpop: 1.4.19 -> 1.4.20

---
 pkgs/applications/networking/mpop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index 7132eca55913..7370ddd6e201 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"];
 
 stdenv.mkDerivation rec {
   pname = "mpop";
-  version = "1.4.19";
+  version = "1.4.20";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo=";
+    sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s=";
   };
 
   nativeBuildInputs = [

From 941d89514cd0522b9283678819ab82acf1b415fc Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Sat, 3 Aug 2024 21:30:19 -0400
Subject: [PATCH 46/52] serie: fixed rust check failures, added version test

---
 pkgs/by-name/se/serie/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 62937e9b1597..3a46cd2e6c58 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   rustPlatform,
   darwin,
+  testers,
+  gitMinimal,
+  serie,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,8 +30,9 @@ rustPlatform.buildRustPackage rec {
     ]
   );
 
-  # requires a git repository
-  doCheck = false;
+  nativeCheckInputs = [ gitMinimal ];
+
+  passthru.tests.version = testers.testVersion { package = serie; };
 
   meta = with lib; {
     description = "A rich git commit graph in your terminal, like magic";

From 729e7d5af2fc796bc8c7da3511d1534a53e60682 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2024 03:22:40 +0000
Subject: [PATCH 47/52] ttyplot: 1.6.5 -> 1.7.0

---
 pkgs/tools/misc/ttyplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index d9f4ac565514..535d374bf2b7 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ttyplot";
-  version = "1.6.5";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = "ttyplot";
     rev = version;
-    hash = "sha256-DLFEnEo+EQuq4ziqo9qfyHGD1Zosk9Kb/80QjnI2aXk=";
+    hash = "sha256-B95pd0hoesBDQwzN0h3kMBVcUFJVWQrpOKizKpdoiok=";
   };
 
   nativeBuildInputs = [

From 84eed40b9c455350dd256e8055f35e5bc04a5d78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2024 03:55:42 +0000
Subject: [PATCH 48/52] gh-dash: 4.4.0 -> 4.5.0

---
 pkgs/tools/misc/gh-dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix
index 9fd5298abf29..904a010e0b5e 100644
--- a/pkgs/tools/misc/gh-dash/default.nix
+++ b/pkgs/tools/misc/gh-dash/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gh-dash";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${version}";
-    hash = "sha256-HNGg3e6QoAkcio/78u2U1u0EhX707yXmA4fyGIqJHX0=";
+    hash = "sha256-zLKQbw9d20KKuK5j9RhZPLSDRrw5SQ8vycIEfRmUEzI=";
   };
 
   vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY=";

From 959058c2c87978acd350227692151e4a0316c72b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 4 Aug 2024 10:21:24 +0300
Subject: [PATCH 49/52] linuxManualConfig: remove "$src is not a directory"
 logspam

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9c30f1fd70d0..5544409a74d6 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -207,6 +207,10 @@ let
         for i in $(find arch -name install.sh); do
             patchShebangs "$i"
         done
+
+        # unset $src because the build system tries to use it and spams a bunch of warnings
+        # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0
+        unset src
       '';
 
       configurePhase = ''

From 5e763e941ced878490c6c9f5dccdc346237b360c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2024 08:22:02 +0000
Subject: [PATCH 50/52] networkmanager: 1.48.4 -> 1.48.6

---
 pkgs/tools/networking/networkmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 3cb389e0bd97..9a3e039267b6 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -60,11 +60,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager";
-  version = "1.48.4";
+  version = "1.48.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    hash = "sha256-8l81/i6hpHP30YTMxyyNStyXBZJv5POno8hUmUH1awM=";
+    hash = "sha256-5lxJbgZjGkl3x5XA8khZjDnDQOVjXXz1TsMHKsyZiZU=";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From 96f5069dd04003ad40c9e08747317336642386d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2024 22:11:49 +0000
Subject: [PATCH 51/52] planify: 4.9.0 -> 4.10.5

---
 pkgs/applications/office/planify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix
index b50bc9bb4e2c..f9227354deea 100644
--- a/pkgs/applications/office/planify/default.nix
+++ b/pkgs/applications/office/planify/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.9.0";
+  version = "4.10.5";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-zNQe0w8Vbe+ZIYTer1ISwJ6yA4dOdDtuWme5txcbY3w=";
+    hash = "sha256-tjU7/JZjJqH9H/EWMoAbRurJtIDv8BTT938EnJicTv4=";
   };
 
   nativeBuildInputs = [

From a2424528a569987f39d38742454c09d2f4f6aa6f Mon Sep 17 00:00:00 2001
From: Aleksana <alexander.huang.y@gmail.com>
Date: Sun, 4 Aug 2024 17:52:17 +0800
Subject: [PATCH 52/52] nixosTests.pixelfed: remove unused function argument

---
 nixos/tests/web-apps/pixelfed/standard.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/web-apps/pixelfed/standard.nix b/nixos/tests/web-apps/pixelfed/standard.nix
index 3e56dda8f07c..c575ee0b0f76 100644
--- a/nixos/tests/web-apps/pixelfed/standard.nix
+++ b/nixos/tests/web-apps/pixelfed/standard.nix
@@ -1,5 +1,4 @@
-import ../../make-test-python.nix ({pkgs, ...}:
-{
+import ../../make-test-python.nix {
   name = "pixelfed-standard";
   meta.maintainers = [ ];
 
@@ -35,4 +34,4 @@ import ../../make-test-python.nix ({pkgs, ...}:
     # server.succeed("pixelfed-manage passport:client --personal")
     # server.succeed("curl -H 'Host: pixefed.local' -H 'Accept: application/json' -H 'Authorization: Bearer secret' -F'status'='test' http://localhost/api/v1/statuses")
   '';
-})
+}