From 04a72b1d19ea21d28522a49cf9ff8e441bcd9d3e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 31 Aug 2021 09:24:28 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 12 +++---- modules/programs/hledger/default.nix | 2 +- patches/135872.patch | 52 ---------------------------- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 patches/135872.patch diff --git a/flake.lock b/flake.lock index f2808ed8..2bdad208 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1630288376, - "narHash": "sha256-RwVCR6bUQy95gJAGo0GmMBDA3YkdRkULSBuq2CextIc=", + "lastModified": 1630377723, + "narHash": "sha256-+nx+XYRt0n33ZAbWlv/U7B75CCjyAu/CJ99zk3wlG2Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8ed671dab09f08e8079e24f9fc7800b7ce260fa2", + "rev": "a088e0d7aa691d2e2e5a4be77407168dda6c87ac", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1630074300, - "narHash": "sha256-BFM7OiXRs0RvSUZd6NCGAKWVPn3VodgYQ4TUQXxbMBU=", + "lastModified": 1630248577, + "narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28", + "rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512", "type": "github" }, "original": { diff --git a/modules/programs/hledger/default.nix b/modules/programs/hledger/default.nix index 32730281..35f294ee 100644 --- a/modules/programs/hledger/default.nix +++ b/modules/programs/hledger/default.nix @@ -5,7 +5,7 @@ let owner = "simonmichael"; repo = "hledger"; rev = "master"; - sha256 = "iRShf1vlIKIa1DzmSw8RX+BqBIoI6i81OtE7iEYIZgE="; + sha256 = "eiVxp37Gw+iYA4fvEHiW/ClHZd5WRPiODeEEZF+Gias="; }; in { diff --git a/patches/135872.patch b/patches/135872.patch deleted file mode 100644 index 5a86c7b3..00000000 --- a/patches/135872.patch +++ /dev/null @@ -1,52 +0,0 @@ -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; - }; - }