diff --git a/flake.lock b/flake.lock index 93a98705..5610ad0e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1639915649, - "narHash": "sha256-8ygMVY2AgS7R0/yGUyolmzdFgj6LGZ5fJyKzR1orRGI=", + "lastModified": 1640055816, + "narHash": "sha256-W0OWBjkyQMkcxtHDjn3QOOfMudJasPaTv5aeIPQgAc0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1d40515d8ca7bb3bac4b7405c4bd19b2a41f200c", + "rev": "78bbc5bf6840ef8c64c6f3856d3c77b3e904050e", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1639891275, - "narHash": "sha256-2IMLVTtOHV9kBsirGPRpo8NE48Mjq20iXN7l7uy0YjE=", + "lastModified": 1640037534, + "narHash": "sha256-lbD5EEqu2tXq3qo6UN3cZkWZA0hEWQkhluctivMtLZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3db603677509eb0b8c396a3234b1d4b70d023894", + "rev": "aef97988dac0541747de8bcc85c7e27726eea4af", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639699734, - "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", + "lastModified": 1639966735, + "narHash": "sha256-FmVGFiyqE+pjQUTCTY0H75hqrnBnbEf3VVRB4dsd4KI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c", + "rev": "d87b72206aadebe6722944f541f55d33fd7046fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 13671aba..f21204f6 100644 --- a/flake.nix +++ b/flake.nix @@ -57,12 +57,12 @@ inputs; nix.nixPath = [ "/etc/channels" ]; }) + ({ config._module.args = { nixosConfigurations = self.nixosConfigurations; }; }) accentor.nixosModule agenix.nixosModules.age home-manager.nixosModules.home-manager ./modules ]; - extraArgs = { nixosConfigurations = self.nixosConfigurations; }; }; hosts = { kharbranth.modules = [ ./machines/kharbranth ]; diff --git a/patches/151068.patch b/patches/151068.patch deleted file mode 100644 index 48f09278..00000000 --- a/patches/151068.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2593fe10f78ca27d534c118d173ace4b54552bc1 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 17 Dec 2021 09:57:59 +0100 -Subject: [PATCH] mautrix-whatsapp: 0.2.1 -> 0.2.2 - ---- - pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index 5a84b87900120..42f7f5938fd3b 100644 ---- a/pkgs/servers/mautrix-whatsapp/default.nix -+++ b/pkgs/servers/mautrix-whatsapp/default.nix -@@ -2,18 +2,18 @@ - - buildGo117Module rec { - pname = "mautrix-whatsapp"; -- version = "0.2.1"; -+ version = "0.2.2"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- sha256 = "sha256-gCbZGlZDwHw+OAlTx3rHlbd4Ntw+RaCEDTiP/1q0oJs="; -+ sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw="; - }; - - buildInputs = [ olm ]; - -- vendorSha256 = "sha256-4KDLL9FY3DrkGBDlu6G8Fp7XJfXjwLTELspyW+FBGfo="; -+ vendorSha256 = "sha256-Fr7yVTl8PIdr+SxXhUKG9DS18762HqL9ap6sUM3ziCQ="; - - doCheck = false; -