nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-02 10:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #325275 from GaetanLepage/tinymist

Browse Source 
tinymist: 0.11.13 -> 0.11.14
This commit is contained in:
Pol Dellaiera 2024-07-07 20:36:56 +02:00 committed by GitHub
commit 7ef47328dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 17 additions and 4804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -3040,8 +3040,6 @@ let
};
};
mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { };
mhutchie.git-graph = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "git-graph";
@ -5364,6 +5362,7 @@ let
jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29
jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29
matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29
mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29
ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29
rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29

38
pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix
View File

@ -1,38 +0,0 @@
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension
{
vscode-utils,
lib,
jq,
moreutils,
typst-preview,
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "typst-preview";
publisher = "mgt19937";
version = "0.11.7";
hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU=";
};
buildInputs = [ typst-preview ];
nativeBuildInputs = [
jq
moreutils
];
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json
'';
meta = {
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.drupol ];
};
}

2
pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
View File

@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE=";
hash = "sha256-e/7HAvaohATDet7ynYc34e5cbOzBL5Rcjvimggs68c4=";
};
nativeBuildInputs = [

24
pkgs/by-name/ti/tinymist/Cargo.lock generated
View File

@ -3697,7 +3697,7 @@ dependencies = [
[[package]]
name = "sync-lsp"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"anyhow",
"clap",
@ -3836,7 +3836,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"insta",
"lsp-server",
@ -3933,7 +3933,7 @@ dependencies = [
[[package]]
name = "tinymist"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"anyhow",
"async-trait",
@ -3967,7 +3967,7 @@ dependencies = [
"serde",
"serde_json",
"sync-lsp",
"tinymist-assets 0.11.12",
"tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-query",
"tinymist-render",
"tokio",
@ -3994,17 +3994,17 @@ dependencies = [
[[package]]
name = "tinymist-assets"
version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5"
version = "0.11.14"
[[package]]
name = "tinymist-assets"
version = "0.11.13"
version = "0.11.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e5159484d14f149de53df7cf5f04d9cff4a4d414688cc0cc81910162d74892"
[[package]]
name = "tinymist-query"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"anyhow",
"biblatex",
@ -4050,7 +4050,7 @@ dependencies = [
[[package]]
name = "tinymist-render"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"base64 0.22.1",
"log",
@ -4428,7 +4428,7 @@ dependencies = [
[[package]]
name = "typst-preview"
version = "0.11.13"
version = "0.11.14"
dependencies = [
"await-tree",
"clap",
@ -4440,7 +4440,7 @@ dependencies = [
"once_cell",
"serde",
"serde_json",
"tinymist-assets 0.11.12",
"tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio",
"tokio-tungstenite",
"typst",

4
pkgs/by-name/ti/tinymist/package.nix
View File

@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.11.13";
version = "0.11.14";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
rev = "refs/tags/v${version}";
hash = "sha256-aAeDeW1EiF8NqsIAQ39RaTHq6wC39QeMptvwTJ3/ZWc=";
hash = "sha256-6dUI0w9GKubK2hVK8fOkAYoUdEII9umPEZZ6uSh7XjE=";
};
cargoLock = {

4564
pkgs/by-name/ty/typst-preview/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

32
pkgs/by-name/ty/typst-preview/dom.json
View File

@ -1,32 +0,0 @@
{
"name": "typst-dom",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build && tsc",
"preview": "vite preview",
"test": "vitest",
"coverage": "vitest run --coverage",
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer",
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"peerDependencies": {
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
"@myriaddreamin/typst.ts": "0.5.0-rc4"
},
"devDependencies": {
"@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",
"vite-plugin-wasm": "^3.2.2",
"vitest": "^0.32.2"
},
"exports": {
".": "./src/index.mts",
"./*": "./src/*"
}
}

28
pkgs/by-name/ty/typst-preview/frontend.json
View File

@ -1,28 +0,0 @@
{
"name": "typst-preview-frontend",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"test": "vitest",
"coverage": "vitest run --coverage",
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer",
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"dependencies": {
"@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": {
"typescript": "^5.3.3",
"vite": "^4.3.9",
"vite-plugin-singlefile": "^0.13.5",
"vite-plugin-wasm": "^3.2.2",
"vitest": "^0.32.2"
}
}

125
pkgs/by-name/ty/typst-preview/package.nix
View File

@ -1,125 +0,0 @@
{ lib
, rustPlatform
, fetchFromGitHub
, mkYarnPackage
, fetchYarnDeps
, pkg-config
, libgit2
, openssl
, zlib
, stdenv
, darwin
}:
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.7";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typst-preview";
rev = "v${version}";
hash = "sha256-N4PK9RucuOwminikayXq9aqK9l6T6v9a6tcksMllKdM=";
fetchSubmodules = true;
postFetch = ''
cd $out
substituteInPlace addons/frontend/yarn.lock \
--replace-fail '"typst-dom@link:../typst-dom"' '"typst-dom@file:../typst-dom"'
'';
};
frontendSrc = "${src}/addons/frontend";
domSrc = "${src}/addons/typst-dom";
typst-dom = mkYarnPackage {
inherit version;
pname = "typst-dom";
src = domSrc;
packageJSON = ./dom.json;
offlineCache = fetchYarnDeps {
yarnLock = "${domSrc}/yarn.lock";
hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4=";
};
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -R deps/typst-dom $out
runHook postInstall
'';
doDist = false;
};
frontend = mkYarnPackage {
inherit version;
pname = "typst-preview-frontend";
src = frontendSrc;
packageJSON = ./frontend.json;
offlineCache = fetchYarnDeps {
yarnLock = "${frontendSrc}/yarn.lock";
hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA=";
};
packageResolutions = { inherit typst-dom; };
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -R deps/typst-preview-frontend/dist $out
runHook postInstall
'';
doDist = false;
};
in
rustPlatform.buildRustPackage {
pname = "typst-preview";
inherit version src;
cargoHash = "sha256-JDUHESH0aFIlXX61IxOXNSaTlFCgo3hFRbfoQWWq6e0=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
prePatch = ''
mkdir -p addons/vscode/out/frontend
cp -R ${frontend}/* addons/vscode/out/frontend/
cp -R ${frontend}/index.html ./src/index.html
'';
meta = {
description = "Typst preview extension for VSCode";
homepage = "https://github.com/Enter-tainer/typst-preview/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ berberman ];
mainProgram = "typst-preview";
};
}

1
pkgs/top-level/aliases.nix
View File

@ -1372,6 +1372,7 @@ mapAliases ({
trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
tvbrowser-bin = tvbrowser; # Added 2023-03-02
typst-fmt = typstfmt; # Added 2023-07-15
typst-preview = throw "The features of this program have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
### U ###