Update flake inputs (nixpkgs, home-manager, claude-code-nix)
Remove obsolete libreoffice-noto-fonts-subset.patch — upstream nixpkgs removed the noto-fonts-subset code from the libreoffice derivation.
This commit is contained in:
18
flake.lock
generated
18
flake.lock
generated
@@ -53,11 +53,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772252645,
|
"lastModified": 1772587858,
|
||||||
"narHash": "sha256-SVP3BYv/tY19P7mh0aG2Pgq4M/CynQEnV4y+57Ed91g=",
|
"narHash": "sha256-w0/XBU20BdBeEIJ9i3ecr9Lc6c8uQaXUn/ri+aOsyJk=",
|
||||||
"owner": "sadjow",
|
"owner": "sadjow",
|
||||||
"repo": "claude-code-nix",
|
"repo": "claude-code-nix",
|
||||||
"rev": "42c9207e79f1e6b8b95b54a64c10452275717466",
|
"rev": "0a5fc14be38fabfcfff18db749b63c9c15726765",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -228,11 +228,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772380461,
|
"lastModified": 1772569491,
|
||||||
"narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=",
|
"narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961",
|
"rev": "924e61f5c2aeab38504028078d7091077744ab17",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -301,11 +301,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772198003,
|
"lastModified": 1772542754,
|
||||||
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
|
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
|
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -139,7 +139,6 @@
|
|||||||
src = nixpkgs;
|
src = nixpkgs;
|
||||||
patches = [
|
patches = [
|
||||||
./patches/dont-break-nix-serve.patch
|
./patches/dont-break-nix-serve.patch
|
||||||
./patches/libreoffice-noto-fonts-subset.patch
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
|
patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });
|
||||||
|
|||||||
@@ -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}
|
|
||||||
'';
|
|
||||||
Reference in New Issue
Block a user