From 1d40ea3b24615d492ac59e48ec77f6d498cc7b2c Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 22 Oct 2024 14:00:51 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 12 +++++----- modules/nixos/graphical/theme/default.nix | 2 +- patches/349492.patch | 27 ----------------------- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 patches/349492.patch diff --git a/flake.lock b/flake.lock index 7d76a9db..f7dc0127 100644 --- a/flake.lock +++ b/flake.lock @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nur": { "locked": { - "lastModified": 1729590526, - "narHash": "sha256-YSz9Ng/9O4R770vKBOD4TIZZMMk9bbh7WdgE+oNSYWA=", + "lastModified": 1729594179, + "narHash": "sha256-ULi0pRAElnHKFKgQSajUQn2Ki8n5qhdLRLin7i5M0C4=", "owner": "nix-community", "repo": "NUR", - "rev": "8fb246ddebad951fc4f237d0716b941a18405d50", + "rev": "715ee6f5810e4fa24e8974aa21eef99efd083efb", "type": "github" }, "original": { diff --git a/modules/nixos/graphical/theme/default.nix b/modules/nixos/graphical/theme/default.nix index 03b8fe07..57dc2667 100644 --- a/modules/nixos/graphical/theme/default.nix +++ b/modules/nixos/graphical/theme/default.nix @@ -27,7 +27,7 @@ hack-font font-awesome noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji noto-fonts-extra roboto diff --git a/patches/349492.patch b/patches/349492.patch deleted file mode 100644 index be5ab83c..00000000 --- a/patches/349492.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix -index b66dad00dad55..5c13215e2ad94 100644 ---- a/pkgs/servers/mautrix-whatsapp/default.nix -+++ b/pkgs/servers/mautrix-whatsapp/default.nix -@@ -13,19 +13,19 @@ - - buildGoModule rec { - pname = "mautrix-whatsapp"; -- version = "0.10.9"; -+ version = "0.11.0"; - - src = fetchFromGitHub { - owner = "mautrix"; - repo = "whatsapp"; - rev = "v${version}"; -- hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4="; -+ hash = "sha256-D9ed2/3ymUmZotnD8AZngPGQtzr8+R7xfbcdQLb3EKU="; - }; - - buildInputs = lib.optional (!withGoolm) olm; - tags = lib.optional withGoolm "goolm"; - -- vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk="; -+ vendorHash = "sha256-qd8dGJe3h6JG6B9pZbJXHk3NwYddfHXzprSH20jn9Bk="; - - doCheck = false; -