packages.x86_64-linux.bulwark: 1.7.2 -> 1.7.4

Diff: https://github.com/bulwarkmail/webmail/compare/1.7.2...1.7.4

2 files changed, 9 insertions, 34 deletions

diff --git a/packages/bulwark/0001-use-local-google-fonts.patch b/packages/bulwark/0001-use-local-google-fonts.patch
index 3d166b5..855c0bf 100644
--- a/packages/bulwark/0001-use-local-google-fonts.patch
+++ b/packages/bulwark/0001-use-local-google-fonts.patch
@@ -1,5 +1,5 @@
 diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
-index ac5c3b4..de8b039 100644
+index 65d4bba..994727f 100644
 --- a/app/(main)/layout.tsx
 +++ b/app/(main)/layout.tsx
 @@ -1,5 +1,5 @@
@@ -7,11 +7,11 @@ index ac5c3b4..de8b039 100644
 -import { Geist, Geist_Mono } from "next/font/google";
 +import localFont from "next/font/local";
  import { headers } from "next/headers";
- import { getLocale } from "next-intl/server";
- import { PWAInstallPrompt } from "@/components/pwa-install-prompt";
-@@ -8,15 +8,8 @@ import { configManager } from "@/lib/admin/config-manager";
- import { withBasePath } from "@/lib/browser-navigation";
- import "../globals.css";
+ import { getLocale, getTranslations } from "next-intl/server";
+ import { ServiceWorkerRegistration } from "@/components/service-worker-registration";
+@@ -20,15 +20,8 @@ async function resolveRequestLocale(): Promise<string> {
+   return seg ?? (await getLocale());
+ }
  
 -const geistSans = Geist({
 -  variable: "--font-geist-sans",
@@ -27,28 +27,3 @@ index ac5c3b4..de8b039 100644
  
  export const viewport: Viewport = {
    width: "device-width",
-diff --git a/app/(sandbox)/layout.tsx b/app/(sandbox)/layout.tsx
-index 9813c79..0e91d4a 100644
---- a/app/(sandbox)/layout.tsx
-+++ b/app/(sandbox)/layout.tsx
-@@ -1,17 +1,10 @@
- import type { Metadata } from 'next';
- import type { ReactNode } from 'react';
--import { Geist, Geist_Mono } from 'next/font/google';
-+import localFont from "next/font/local";
- import '../globals.css';
- 
--const geistSans = Geist({
--  variable: '--font-geist-sans',
--  subsets: ['latin'],
--});
--
--const geistMono = Geist_Mono({
--  variable: '--font-geist-mono',
--  subsets: ['latin'],
--});
-+const geistSans = localFont({src: '../Geist-Regular.otf', variable: "--font-geist-sans"})
-+const geistMono = localFont({src: '../GeistMono-Regular.otf', variable: "--font-geist-mono"})
- 
- export const metadata: Metadata = {
-   title: 'Plugin sandbox',
diff --git a/packages/bulwark/package.nix b/packages/bulwark/package.nix
index 7ffebc9..4ccaa10 100644
--- a/packages/bulwark/package.nix
+++ b/packages/bulwark/package.nix
@@ -10,16 +10,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "bulwark";
-  version = "1.7.2";
+  version = "1.7.4";
   nativeBuildInputs = [ git ];
   src = fetchFromGitHub {
     owner = "bulwarkmail";
     repo = "webmail";
     tag = "${finalAttrs.version}";
-    hash = "sha256-M5EgANzzBAVqQ+XdOQnoXlD3CyYCRcO0PiC6INrnqq8=";
+    hash = "sha256-acNnUW+Jc8q6SZiGbyWBpkWWt/citXcvF0f5mJbYfKM=";
   };
 
-  npmDepsHash = "sha256-9yBNDbgq5C//tnWH4itx3AHaDW892G/KmBZ+R9J64Zw=";
+  npmDepsHash = "sha256-F6V9Gnpn9wrdyuS3Oabm9driPB9SfI2+QS7MM2ntYtg=";
   npmPackFlags = [ "--ignore-scripts" ];
   NODE_OPTIONS = [ "--openssl-legacy-provider" ];