Update dependencies

flake.lock

@@ -176,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1680167433,
+        "lastModified": 1680199993,
-        "narHash": "sha256-QEgA0Hu8/E7KQl3iXrXmp50Splg9uLiRWokJvzUq4Dc=",
+        "narHash": "sha256-Tvcz9gBjiijgB1EeUffpASPNhrDDn4HRpZkoLgkrWrc=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "a549967dc06b94333892c335f48658fece6a6574",
+        "rev": "fe007ea85bdbf5f188467fd019a64632ab0dbe41",
         "type": "github"
       },
       "original": {
@@ -291,11 +291,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679944645,
+        "lastModified": 1680125544,
-        "narHash": "sha256-e5Qyoe11UZjVfgRfwNoSU57ZeKuEmjYb77B9IVW7L/M=",
+        "narHash": "sha256-mlqo1r+TZUOuypWdrZHluxWL+E5WzXlUXNZ9Y0WLDFU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4bb072f0a8b267613c127684e099a70e1f6ff106",
+        "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658",
         "type": "github"
       },
       "original": {

modules/base/emacs/default.nix

@@ -16,7 +16,7 @@
       readOnly = true;
       default = pkgs.emacsWithPackagesFromUsePackage {
         config = config.chvp.base.emacs.fullConfig;
-        package = pkgs.emacsPgtk.override { nativeComp = false; };
+        package = pkgs.emacsPgtk;
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
         extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;

patches/223547.patch

@@ -1,55 +0,0 @@
-From 27b738188ccf62e19911ab581245545715d0d055 Mon Sep 17 00:00:00 2001
-From: Izorkin <izorkin@elven.pw>
-Date: Tue, 28 Mar 2023 13:19:25 +0300
-Subject: [PATCH] mastodon: update ruby package
-
----
- pkgs/servers/mastodon/gemset.nix | 5 ++---
- pkgs/servers/mastodon/source.nix | 9 +++++++--
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
-index 5c1a1e3d985ee..3e1632860b56e 100644
---- a/pkgs/servers/mastodon/gemset.nix
-+++ b/pkgs/servers/mastodon/gemset.nix
-@@ -353,15 +353,14 @@
-     version = "1.0.0";
-   };
-   blurhash = {
--    dependencies = ["ffi"];
-     groups = ["default"];
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1rs61mwdiyriq8mb8na2sfrqzz8igls04md63ajyhk4yj8d2j0sz";
-+      sha256 = "057afgqy73n8vm7k3cr4pbwm1hhqnm58lp4x7bgm5wzbs39m7xf8";
-       type = "gem";
-     };
--    version = "0.1.6";
-+    version = "0.1.7";
-   };
-   bootsnap = {
-     dependencies = ["msgpack"];
-diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
-index b51afb602c2bf..eced26d6f8a03 100644
---- a/pkgs/servers/mastodon/source.nix
-+++ b/pkgs/servers/mastodon/source.nix
-@@ -1,5 +1,5 @@
- # This file was generated by pkgs.mastodon.updateScript.
--{ fetchgit, applyPatches }: let
-+{ fetchgit, applyPatches, fetchpatch }: let
-   src = fetchgit {
-     url = "https://github.com/mastodon/mastodon.git";
-     rev = "v4.1.1";
-@@ -7,5 +7,10 @@
-   };
- in applyPatches {
-   inherit src;
--  patches = [];
-+  patches = [
-+    (fetchpatch {
-+      url = "https://github.com/mastodon/mastodon/commit/e7b81d7d9625893b1323e12215a2a98c0f19f58f.patch";
-+      hash = "sha256-cF0wtbjTNbsyqHb3uy5zYFaACIcziJ2ulJpOT5VoDO0=";
-+    })
-+  ];
- }