diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/tools/typesetting/bibtex-tidy/default.nix index 6fa64d653736..2c1167fc21cd 100644 --- a/pkgs/tools/typesetting/bibtex-tidy/default.nix +++ b/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -1,30 +1,34 @@ { lib , buildNpmPackage , fetchFromGitHub +, testers +, bibtex-tidy }: buildNpmPackage rec { pname = "bibtex-tidy"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "FlamingTempura"; repo = "bibtex-tidy"; - rev = "v${version}"; - hash = "sha256-VjQuMQr3OJgjgX6FdH/C4mehf8H7XjDZ9Rxs92hyQVo="; + rev = "9658d907d990fd80d25ab37d9aee120451bf5d19"; + hash = "sha256-4TrEabxIVB0Vu/E1ClKwk7lXcnPgoVh3RjLYsPwH2yQ="; }; - patches = [ - # downloads Google fonts during `npm run build` - ./remove-google-font-loader.patch - ]; - - npmDepsHash = "sha256-u2lyG95F00S/bvsVwu0hIuUw2UZYQWFakCF31LIijSU="; + npmDepsHash = "sha256-VzzHGmW7Rb6dEdBxd84GXKSPasqfTkn+5rNw9C2lt8k="; env = { PUPPETEER_SKIP_DOWNLOAD = true; }; + passthru.tests = { + version = testers.testVersion { + package = bibtex-tidy; + version = "v${version}"; + }; + }; + meta = { changelog = "https://github.com/FlamingTempura/bibtex-tidy/blob/${src.rev}/CHANGELOG.md"; description = "Cleaner and Formatter for BibTeX files"; diff --git a/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch b/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch deleted file mode 100644 index 79c6850cf6cb..000000000000 --- a/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/build.ts b/build.ts -index ae4e350..3498ae7 100644 ---- a/build.ts -+++ b/build.ts -@@ -312,7 +312,6 @@ async function buildWebBundle() { - target: ['esnext'], - plugins: [ - sveltePlugin({ preprocess: autoPreprocess() }), -- googleFontPlugin, - regexpuPlugin, - ], - }); -@@ -344,7 +343,6 @@ async function serveWeb() { - preprocess: autoPreprocess(), - compilerOptions: { enableSourcemap: true }, - }), -- googleFontPlugin, - ], - }); - const server = await ctx.serve({ servedir: WEB_PATH }); -@@ -375,31 +373,6 @@ const regexpuPlugin: Plugin = { - }, - }; - --// Downloads google fonts and injects them as base64 urls into bundle css --const googleFontPlugin: Plugin = { -- name: 'google-font-loader', -- setup(build) { -- build.onResolve({ filter: /^https?:\/\/fonts\./ }, (args) => ({ -- path: args.path, -- namespace: 'http-url', -- })); -- build.onLoad( -- { filter: /.*/, namespace: 'http-url' }, -- async (args): Promise => { -- const res = await fetch(args.path, { -- headers: { -- // ensures google responds with woff2 fonts -- 'User-Agent': 'Mozilla/5.0 Firefox/90.0', -- }, -- }); -- const contents = Buffer.from(await res.arrayBuffer()); -- const loader = args.path.endsWith('.woff2') ? 'dataurl' : 'css'; -- return { contents, loader }; -- } -- ); -- }, --}; -- - /** - * swc converts js syntax to support older browsers. ESBuild can kinda do this - * but only for more recent browsers. swc is also far easier to configure than