From 84182b02db07f947084997d620e9bd85b6c92dca Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 27 Aug 2021 09:49:09 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 12 +++++----- patches/135872.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 patches/135872.patch diff --git a/flake.lock b/flake.lock index 4f8241a8..f0bae23f 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1629999347, - "narHash": "sha256-wYyYCNF+eA+nXXRrKIZm69WiP4ZsiybFccwa4y/fMKc=", + "lastModified": 1630029550, + "narHash": "sha256-MfgoQnkZZUJjHAdF4QYU+4VVMKTbv8D6pYe/UZlIi+Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6c0362ccf22565d687a0cbc37ec409ca8e5eb2e4", + "rev": "721b2b046aace32aa6cb481b0327b597d83e6bf3", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1629961460, - "narHash": "sha256-t0UEf5bIJg4TKrqN3dF2rS65iyKCUTT0RfW2f5lWMQw=", + "lastModified": 1630030114, + "narHash": "sha256-t5lptbv7rtNSawdwoA2JUAiqXgLYAO+dGqp8KRtOaDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f637e145d758ab183d3dba096c9312eae8bc0c7c", + "rev": "33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8", "type": "github" }, "original": { diff --git a/patches/135872.patch b/patches/135872.patch new file mode 100644 index 00000000..5a86c7b3 --- /dev/null +++ b/patches/135872.patch @@ -0,0 +1,52 @@ +From 6e3451a6a8219ded3f124fc1a7d9e63cdc70d28e Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Fri, 27 Aug 2021 09:45:06 +0200 +Subject: [PATCH 1/2] mu: 1.6.4 -> 1.6.5 + +--- + 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 694c1f5e721f4..fe1e8e7da7360 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.6.4"; ++ version = "1.6.5"; + + src = fetchFromGitHub { + owner = "djcb"; + repo = "mu"; + rev = version; +- sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8="; ++ sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ="; + }; + + postPatch = lib.optionalString (batchSize != null) '' + +From e4591b39178324c7881239904bb45b99ee3536c2 Mon Sep 17 00:00:00 2001 +From: Charlotte Van Petegem +Date: Fri, 27 Aug 2021 09:46:59 +0200 +Subject: [PATCH 2/2] mu: add chvp as maintainer + +--- + pkgs/tools/networking/mu/default.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix +index fe1e8e7da7360..db8f9bdb9d1a5 100644 +--- a/pkgs/tools/networking/mu/default.nix ++++ b/pkgs/tools/networking/mu/default.nix +@@ -56,7 +56,7 @@ stdenv.mkDerivation rec { + license = licenses.gpl3Plus; + homepage = "https://www.djcbsoftware.nl/code/mu/"; + changelog = "https://github.com/djcb/mu/releases/tag/${version}"; +- maintainers = with maintainers; [ antono peterhoeg ]; ++ maintainers = with maintainers; [ antono chvp peterhoeg ]; + platforms = platforms.mesaPlatforms; + }; + }