diff --git a/flake.lock b/flake.lock index 39a7c250..99ed718e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1627374720, - "narHash": "sha256-c5LpdjbhA+7mz2JDs8ObrMV38pydAavpMCE6qCG3ktY=", + "lastModified": 1627407312, + "narHash": "sha256-gb6LEEa4adXR5pzuj1vU/x/Vc1DH2S4ZjrcsWA/Xp8s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fafc66d018902666d53f20d1a04e1a824cdfcbb0", + "rev": "054abca26f9cf416701c880792b564019d528566", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1627312560, - "narHash": "sha256-h2mpDJIu/rd4nZX4i5U1AFA/3MGXrmFRFy04FDxnvhE=", + "lastModified": 1627422633, + "narHash": "sha256-9UvA3wn0xap6WLjhE7+90JwCD+PNj630qt721XRC3TQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6f6990fc811454cb3082ba3662b711488fd0554", + "rev": "ae8cb242f2e450c525274732af58b3050399f5bd", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627128856, - "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", + "lastModified": 1627391865, + "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", "type": "github" }, "original": { diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix index 195bd825..f1b6e333 100644 --- a/modules/base/emacs/default.nix +++ b/modules/base/emacs/default.nix @@ -25,19 +25,6 @@ }; config = { - nixpkgs.overlays = [ - (self: super: { - mu = super.mu.overrideAttrs (old: { - version = "1.5.13"; - src = self.fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = "6d67e146fecb5aa512a7eff4b8044225af0dc5ce"; - sha256 = "0ip7nd7z2l60a3dc1aic34hpab4alb0rmxlk9778nz3v88735iik"; - }; - }); - }) - ]; chvp.base.zfs.homeLinks = [ { path = ".emacs.d"; type = "cache"; } ]; diff --git a/patches/131745.patch b/patches/131745.patch new file mode 100644 index 00000000..f80db615 --- /dev/null +++ b/patches/131745.patch @@ -0,0 +1,29 @@ +From 2d1dbaa617424f17f8daa7ec4a25ab3489afdd95 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Wed, 28 Jul 2021 00:58:59 +0200 +Subject: [PATCH] mu: 1.4.15 -> 1.6.0 + +--- + pkgs/tools/networking/mu/default.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix +index 4553063929fdf7..da7ef58f199442 100644 +--- a/pkgs/tools/networking/mu/default.nix ++++ b/pkgs/tools/networking/mu/default.nix +@@ -7,13 +7,13 @@ + + stdenv.mkDerivation rec { + pname = "mu"; +- version = "1.4.15"; ++ version = "1.6.0"; + + src = fetchFromGitHub { + owner = "djcb"; + repo = "mu"; + rev = version; +- sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; ++ sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; + }; + + postPatch = lib.optionalString (batchSize != null) ''