Update dependencies

patches/321446.patch

@@ -1,48 +0,0 @@
-diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix
-index 32b7cfcc9bbcd6..6d9338dbc1b90e 100644
---- a/pkgs/development/python-modules/pymilter/default.nix
-+++ b/pkgs/development/python-modules/pymilter/default.nix
-@@ -3,9 +3,8 @@
-   python,
-   buildPythonPackage,
-   fetchFromGitHub,
--  fetchpatch,
-   libmilter,
--  bsddb3,
-+  berkeleydb,
-   pydns,
-   iana-etc,
-   libredirect,
-@@ -14,29 +13,22 @@
- 
- buildPythonPackage rec {
-   pname = "pymilter";
--  version = "1.0.5";
-+  version = "1.0.6";
-   format = "setuptools";
- 
-   src = fetchFromGitHub {
-     owner = "sdgathman";
-     repo = pname;
-     rev = "${pname}-${version}";
--    hash = "sha256-gZUWEDVZfDRiOOdG3lpiQldHxm/93l8qYVOHOEpHhzQ=";
-+    hash = "sha256-plaWXwDAIsVzEtrabZuZj7T4WNfz2ntQHgcMCVf5S70=";
-   };
- 
-   buildInputs = [ libmilter ];
-   nativeCheckInputs = [ pyasyncore ];
-   propagatedBuildInputs = [
--    bsddb3
-+    berkeleydb
-     pydns
-   ];
--  patches = [
--    (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57
--      name = "Remove-calls-to-the-deprecated-method-assertEquals";
--      url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch";
--      hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg=";
--    })
--  ];
- 
-   preBuild = ''
-     sed -i 's/import thread/import _thread as thread/' Milter/greylist.py

patches/322721.patch

@@ -0,0 +1,26 @@
+diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+index 9550969adbbe22..192320fab674d5 100644
+--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
++++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+@@ -66,7 +66,7 @@ self: let
+ 
+       org = super.org.overrideAttrs (old: {
+         dontUnpack = false;
+-        patches = old.patches or [ ] ++ [
++        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
+           # security fix backported from 9.7.5
+           (pkgs.fetchpatch {
+             url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
+diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+index a3d729b636eee1..3e8ab4625fec25 100644
+--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
++++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+@@ -143,7 +143,7 @@ self: let
+ 
+       org = super.org.overrideAttrs (old: {
+         dontUnpack = false;
+-        patches = old.patches or [ ] ++ [
++        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
+           # security fix backported from 9.7.5
+           (pkgs.fetchpatch {
+             url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";