mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 04:50:21 +00:00
bulwark: 1.10.0 -> 1.12.0
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
|
||||
index a8af157f..9d54eb7b 100644
|
||||
index 445e20cb..c05cc89e 100644
|
||||
--- a/app/(main)/layout.tsx
|
||||
+++ b/app/(main)/layout.tsx
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { Metadata, Viewport } from "next";
|
||||
import { getLocaleDirection } from "@/i18n/direction";
|
||||
-import { Geist, Geist_Mono } from "next/font/google";
|
||||
-import { Geist, Geist_Mono, Hanken_Grotesk } from "next/font/google";
|
||||
+import localFont from "next/font/local";
|
||||
import { headers } from "next/headers";
|
||||
import { getLocale, getTranslations } from "next-intl/server";
|
||||
import { ServiceWorkerRegistration } from "@/components/service-worker-registration";
|
||||
@@ -26,14 +26,14 @@ async function resolveRequestLocale(): Promise<string> {
|
||||
@@ -30,22 +30,22 @@ async function resolveRequestLocale(): Promise<string> {
|
||||
return seg ?? (await getLocale());
|
||||
}
|
||||
|
||||
@@ -28,4 +28,14 @@ index a8af157f..9d54eb7b 100644
|
||||
- subsets: ["latin"],
|
||||
});
|
||||
|
||||
export const viewport: Viewport = {
|
||||
// The "Flat fields" theme's family. Not preloaded and no metric-adjusted
|
||||
// fallback: the file is only fetched once that theme renders text in it, and
|
||||
// scripts Hanken does not cover fall through to the theme's system stack.
|
||||
-const hankenGrotesk = Hanken_Grotesk({
|
||||
+const hankenGrotesk = localFont({
|
||||
+ src: '../fonts/HankenGrotesk.ttf',
|
||||
variable: "--font-hanken",
|
||||
- subsets: ["latin", "latin-ext"],
|
||||
display: "swap",
|
||||
preload: false,
|
||||
adjustFontFallback: false,
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "bulwark";
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bulwarkmail";
|
||||
repo = "webmail";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ppTn1VKIzMgqaozMmoc/33EKpbJu/LCk1mp5qCjr40E=";
|
||||
hash = "sha256-Lt25tZBtxhqMiSM8lYP3M3MIQEItRC3L360WOEYTL84=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
npmDepsHash = "sha256-AFT6y6LVRhsezmEbjw095nrF8dkuRuf93IjBGyQjNtM=";
|
||||
npmDepsHash = "sha256-9p9Dn20U//UpFrDV/dksjWkfTD8almHR07lHF5Vtm8g=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -40,6 +40,9 @@ buildNpmPackage (finalAttrs: {
|
||||
cp "${
|
||||
google-fonts.override { fonts = [ "GeistMono" ]; }
|
||||
}/share/fonts/truetype/GeistMono[wght].ttf" app/fonts/GeistMono.ttf
|
||||
cp "${
|
||||
google-fonts.override { fonts = [ "HankenGrotesk" ]; }
|
||||
}/share/fonts/truetype/HankenGrotesk[wght].ttf" app/fonts/HankenGrotesk.ttf
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user