Unverified Commit bd8166f0 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #312787 from r-ryantm/auto-update/vscode-extensions.mgt19937.typst-preview

vscode-extensions.mgt19937.typst-preview: 0.11.4 -> 0.11.6
parents 63af8c02 27ce0d6e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "typst-preview";
    publisher = "mgt19937";
    version = "0.11.4";
    hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs=";
    version = "0.11.6";
    hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU=";
  };

  buildInputs = [ typst-preview ];
+4 −4
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@
    "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
  },
  "peerDependencies": {
    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
    "@myriaddreamin/typst.ts": "0.4.2-rc10"
    "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
    "@myriaddreamin/typst.ts": "0.5.0-rc4"
  },
  "devDependencies": {
    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
    "@myriaddreamin/typst.ts": "0.4.2-rc10",
    "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
    "@myriaddreamin/typst.ts": "0.5.0-rc4",
    "typescript": "^5.0.2",
    "vite": "^4.3.9",
    "vite-plugin-singlefile": "^0.13.5",
+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@
    "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
  },
  "dependencies": {
    "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
    "@myriaddreamin/typst.ts": "0.4.2-rc10",
    "typst-dom": "file:../typst-dom",
    "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
    "@myriaddreamin/typst.ts": "0.5.0-rc4",
    "typst-dom": "link:../typst-dom",
    "rxjs": "^7.8.1"
  },
  "devDependencies": {
+5 −5
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@
let
  # Keep the vscode "mgt19937.typst-preview" extension in sync when updating
  # this package at pkgs/applications/editors/vscode/extensions/default.nix
  version = "0.11.4";
  version = "0.11.6";

  src = fetchFromGitHub {
    owner = "Enter-tainer";
    repo = "typst-preview";
    rev = "v${version}";
    hash = "sha256-5MbKp6j4+61Do8YH0xPIQPHEjU/kCKsMUUQDJDXzSMw=";
    hash = "sha256-z01Xm2NLWGn0/jEiVmoJKqcEXT5gqLs3H805LPUMDJw=";
    fetchSubmodules = true;

    postFetch = ''
@@ -41,7 +41,7 @@ let

    offlineCache = fetchYarnDeps {
      yarnLock = "${domSrc}/yarn.lock";
      hash = "sha256-QIGwHG0n6vYfAPA/+CdvK1c+QxM3XyoQdS/T4+TdsKs=";
      hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4=";
    };

    buildPhase = ''
@@ -67,7 +67,7 @@ let

    offlineCache = fetchYarnDeps {
      yarnLock = "${frontendSrc}/yarn.lock";
      hash = "sha256-QFiyUky/0BdB5vS9KX5xBOvBCEtJ+zZG4f7ai5j6V4U=";
      hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA=";
    };

    packageResolutions = { inherit typst-dom; };
@@ -92,7 +92,7 @@ rustPlatform.buildRustPackage {
  pname = "typst-preview";
  inherit version src;

  cargoHash = "sha256-xj8Xvbz0NUy0BFoVS8ONiYZZQWIJu1FZxJkBEuABDOw=";
  cargoHash = "sha256-Ay9YKTLks3ly0hftP7jHr7C1L5vuj1aK5lFWZiWlzNc=";

  nativeBuildInputs = [
    pkg-config
+3 −18
Original line number Diff line number Diff line
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, pkg-config
, libgit2
, zlib
@@ -11,30 +10,16 @@

rustPlatform.buildRustPackage rec {
  pname = "typstyle";
  version = "0.11.16";
  version = "0.11.21";

  src = fetchFromGitHub {
    owner = "Enter-tainer";
    repo = "typstyle";
    rev = "v${version}";
    hash = "sha256-ZmGrdAHbU4PQgd9haoVEZ8Wn8Scujm9bJAtvO2+aPoQ=";
    hash = "sha256-dmHacYUL0Pig3SxSlRU4ddKzZmBJKDq/ulV3GDW7O1k=";
  };

  patches = [
    (fetchpatch {
      # Trim whitespace patch
      name = "whitespace-trim.patch";
      url = "https://github.com/Enter-tainer/typstyle/commit/127b7362f5938e091e2e5a33976ad3f63b6e4ee3.patch";
      hash = "sha256-Xzo51bgpEUKP7WDQ7BFNAZsyofPcPDIJMWOf4S+GGvI=";
    })
  ];

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "typst-syntax-0.11.0" = "sha256-BezpRq5O89gLbpRtte539vlJ4G5yJ6VPJ8AaC7rQNc0=";
    };
  };
  cargoHash = "sha256-D1IabmWlPwWnSdltDN+DViVpm4ue+ZFIQZrhL+YNeUU=";

  nativeBuildInputs = [
    pkg-config