From 88cfad2a6962bb4a63623e0bd7c5c5d087d7ffb4 Mon Sep 17 00:00:00 2001 From: Zuckerberg Date: Tue, 3 Mar 2026 22:54:45 -0800 Subject: [PATCH] Update flake inputs (nixpkgs, home-manager, claude-code-nix) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove obsolete libreoffice-noto-fonts-subset.patch — upstream nixpkgs removed the noto-fonts-subset code from the libreoffice derivation. --- flake.lock | 18 +++++++++--------- flake.nix | 1 - patches/libreoffice-noto-fonts-subset.patch | 16 ---------------- 3 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 patches/libreoffice-noto-fonts-subset.patch diff --git a/flake.lock b/flake.lock index 6b79b90..503f1f5 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1772252645, - "narHash": "sha256-SVP3BYv/tY19P7mh0aG2Pgq4M/CynQEnV4y+57Ed91g=", + "lastModified": 1772587858, + "narHash": "sha256-w0/XBU20BdBeEIJ9i3ecr9Lc6c8uQaXUn/ri+aOsyJk=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "42c9207e79f1e6b8b95b54a64c10452275717466", + "rev": "0a5fc14be38fabfcfff18db749b63c9c15726765", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1772380461, - "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", + "lastModified": 1772569491, + "narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=", "owner": "nix-community", "repo": "home-manager", - "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", + "rev": "924e61f5c2aeab38504028078d7091077744ab17", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9fb199..3f6473d 100644 --- a/flake.nix +++ b/flake.nix @@ -139,7 +139,6 @@ src = nixpkgs; patches = [ ./patches/dont-break-nix-serve.patch - ./patches/libreoffice-noto-fonts-subset.patch ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; }); diff --git a/patches/libreoffice-noto-fonts-subset.patch b/patches/libreoffice-noto-fonts-subset.patch deleted file mode 100644 index 6914ba8..0000000 --- a/patches/libreoffice-noto-fonts-subset.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix notoSubset glob for noto-fonts >= 2026.02.01. - -noto-fonts switched from variable fonts (NotoSansArabic[wdth,wght].ttf) -to static fonts (NotoSansArabic.ttf). The old glob pattern only matched -files with brackets in the name, causing the cp to fail. - ---- a/pkgs/applications/office/libreoffice/default.nix -+++ b/pkgs/applications/office/libreoffice/default.nix -@@ -191,7 +191,7 @@ - runCommand "noto-fonts-subset" { } '' - mkdir -p "$out/share/fonts/noto/" - ${concatMapStrings (x: '' -- cp "${noto-fonts}/share/fonts/noto/NotoSans${x}["*.[ot]tf "$out/share/fonts/noto/" -+ cp "${noto-fonts}/share/fonts/noto/NotoSans${x}"*.[ot]tf "$out/share/fonts/noto/" - '') suffixes} - '';