Unverified Commit 66bf805d authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

typst: 0.13.0 -> 0.13.1 (#387877)

parents decbece9 9773a03a

pkgs/by-name/ty/typst/package.nix

+8 −19
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  rustPlatform,

  fetchFromGitHub,

  fetchpatch,

  installShellFiles,

  pkg-config,

  openssl,
@@ -11,29 +10,19 @@ 
  versionCheckHook,

}:



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "typst";

  version = "0.13.0";

  version = "0.13.1";



  src = fetchFromGitHub {

    owner = "typst";

    repo = "typst";

    tag = "v${version}";

    hash = "sha256-3YLdHwDgQDQyW4R3BpZAEL49BBpgigev/5lbnhDIFgI=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-vbBwIQt4xWZaKpXgFwDsRQIQ0mmsQPRR39m8iZnnuj0=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-ey5pFGLgj17+RZGjpLOeN7Weh29jJyvuRrJ8wsIlC58=";



  patches = [

    (fetchpatch {

      # typst 0.13.0 has a regression regarding usage of inotify when running `typst watch`

      # also affects NixOS: https://github.com/typst/typst/issues/5903#issuecomment-2680985045

      name = "fix-high-cpu-in-watch-mode.patch";

      url = "https://patch-diff.githubusercontent.com/raw/typst/typst/pull/5905.patch";

      hash = "sha256-qq5Dj5kKSjdlHp8FOH+gQtzZGqzBscvG8ufSrL94tsY=";

    })

  ];

  cargoHash = "sha256-4kVj2BODEFjLcrh5sxfcgsdLF2Zd3K1GnhA4DEz1Nl4=";



  nativeBuildInputs = [

    installShellFiles
@@ -50,8 +39,8 @@ rustPlatform.buildRustPackage rec { 
    OPENSSL_NO_VENDOR = true;

  };



  postPatch = ''

  # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"

  postPatch = ''

    substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'

    substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'

  '';
@@ -74,7 +63,7 @@ rustPlatform.buildRustPackage rec { 
  passthru.updateScript = nix-update-script { };



  meta = {

    changelog = "https://github.com/typst/typst/releases/tag/v${version}";

    changelog = "https://github.com/typst/typst/releases/tag/v${finalAttrs.version}";

    description = "New markup-based typesetting system that is powerful and easy to learn";

    homepage = "https://github.com/typst/typst";

    license = lib.licenses.asl20;
@@ -85,4 +74,4 @@ rustPlatform.buildRustPackage rec { 
      kanashimia

    ];

  };

}
 
})