diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index bb9df1978dbd..f95843409dac 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "karakeep"; - version = "0.23.2"; + version = "0.24.1"; src = fetchFromGitHub { owner = "karakeep-app"; repo = "karakeep"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cm6e1XEmMHzQ3vODxa9+Yuwt+9zLvQ9S7jmwAozjA/k="; + hash = "sha256-eiDTNMB/CipAR3FkUqPUGYdTAC6lSxT9gRXPQJLx5YE="; }; patches = [ @@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ./patches/dont-lock-pnpm-version.patch ]; postPatch = '' - ln -s ${inter}/share/fonts/truetype ./apps/landing/app/fonts ln -s ${inter}/share/fonts/truetype ./apps/web/app/fonts ''; @@ -52,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - hash = "sha256-HZb11CAbnlGSmP/Gxyjncd/RuIWkPv3GvwYs9QZ12Ss="; + hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY="; }; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch index 5f56dff81d35..52463f9b0ad2 100644 --- a/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch +++ b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch @@ -5,10 +5,10 @@ version to nixpkgs, we override this requirement and use the latest v9 release. --- --- a/package.json +++ b/package.json -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ "turbo": "^2.1.2" }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", - "packageManager": "pnpm@9.0.0-alpha.8+sha256.a433a59569b00389a951352956faf25d1fdf43b568213fbde591c36274d4bc30", + "packageManager": "pnpm", "pnpm": { diff --git a/pkgs/by-name/ka/karakeep/patches/use-local-font.patch b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch index e1092cba3ac7..74ae897beb0f 100644 --- a/pkgs/by-name/ka/karakeep/patches/use-local-font.patch +++ b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch @@ -7,25 +7,6 @@ See similar patches: pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch --- ---- a/apps/landing/app/layout.tsx -+++ b/apps/landing/app/layout.tsx -@@ -1,11 +1,14 @@ - import type { Metadata } from "next"; --import { Inter } from "next/font/google"; -+import localFont from 'next/font/local'; - - import "@hoarder/tailwind-config/globals.css"; - - import React from "react"; - --const inter = Inter({ subsets: ["latin"] }); -+const inter = localFont({ -+ subsets: ["latin"], -+ src: "./fonts/InterVariable.ttf", -+}); - - export const metadata: Metadata = { - title: "Hoarder", --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -1,5 +1,5 @@ @@ -33,15 +14,15 @@ See similar patches: -import { Inter } from "next/font/google"; +import localFont from 'next/font/local'; - import "@hoarder/tailwind-config/globals.css"; + import "@karakeep/tailwind-config/globals.css"; -@@ -13,7 +13,8 @@ +@@ -13,9 +13,10 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; - import { clientConfig } from "@hoarder/shared/config"; + import { clientConfig } from "@karakeep/shared/config"; -const inter = Inter({ +const inter = localFont({ -+ src: "./fonts/InterVariable.ttf", subsets: ["latin"], fallback: ["sans-serif"], ++ src: "./fonts/InterVariable.ttf", });