From 7efeca1721994573434eda026eabd57435092c74 Mon Sep 17 00:00:00 2001 From: "K. Bruneau" Date: Tue, 31 Dec 2019 17:28:49 -0500 Subject: [PATCH] texlab: 1.7.0 -> 1.9.0 (#76730) This commit also removes texlab-citeproc since it was replaced with citeproc-rs and is no longer available. --- .../development/node-packages/default-v10.nix | 4 --- .../node-packages/node-packages-v10.json | 1 - .../tools/misc/texlab/citeproc/package.json | 31 ------------------- .../texlab/citeproc/update-package.json.sh | 14 --------- .../development/tools/misc/texlab/default.nix | 18 +++-------- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/tools/misc/texlab/citeproc/package.json delete mode 100755 pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 96efa720403d..8a479924d465 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -95,10 +95,6 @@ nodePackages // { ''; }; - texlab-citeproc-build-deps = nodePackages."texlab-citeproc-build-deps-../tools/misc/texlab/citeproc".override { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; - }; - webtorrent-cli = nodePackages.webtorrent-cli.override { buildInputs = [ nodePackages.node-gyp-build ]; }; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 732210d830ba..909be958724c 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -125,7 +125,6 @@ , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} , "tern" -, { "texlab-citeproc-build-deps": "../tools/misc/texlab/citeproc" } , "textlint" , "textlint-plugin-latex" , "textlint-rule-abbr-within-parentheses" diff --git a/pkgs/development/tools/misc/texlab/citeproc/package.json b/pkgs/development/tools/misc/texlab/citeproc/package.json deleted file mode 100644 index 87e7ccc1c924..000000000000 --- a/pkgs/development/tools/misc/texlab/citeproc/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "citeproc", - "version": "0.1.0", - "description": "Render BibTeX citations", - "repository": "https://github.com/latex-lsp/citeproc.git", - "author": "Eric Förster ", - "license": "MIT", - "scripts": { - "dist": "webpack", - "format": "prettier --write \"src/**/*.{js,json}\" \"*.{js,json,yml,md}\" \".vscode/**/*.{json}\"" - }, - "dependencies": { - "@babel/core": "^7.5.5", - "@babel/preset-env": "^7.5.5", - "@citation-js/core": "^0.4.8", - "@citation-js/plugin-bibtex": "^0.4.8", - "@citation-js/plugin-csl": "^0.4.8", - "@types/node": "^11.13.17", - "@types/webpack": "^4.4.35", - "babel-loader": "^8.0.6", - "babel-polyfill": "^6.26.0", - "null-loader": "^0.1.1", - "prettier": "^1.18.2", - "ts-loader": "^5.4.5", - "ts-node": "^8.3.0", - "tslint": "^5.18.0", - "tslint-config-prettier": "^1.15.0", - "webpack": "^4.35.3", - "webpack-cli": "^3.3.6" - } -} diff --git a/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh b/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh deleted file mode 100755 index b57e48e10bc6..000000000000 --- a/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p jq - -set -eu -o pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Usage: $0 " - exit 1 -fi - -TEXLAB_WEB_SRC="https://raw.githubusercontent.com/latex-lsp/texlab/$1" - -curl --silent "$TEXLAB_WEB_SRC/src/citeproc/js/package.json" | \ - jq '. + {"dependencies": .devDependencies} | del(.devDependencies)' > package.json diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index e11c288c1e99..1e8b3b2cbab2 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -3,32 +3,24 @@ , fetchFromGitHub , nodejs , Security -, texlab-citeproc-build-deps }: rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "0b9lw6cmh7gyzj0pb3ghvqc3q7lzl12bfg9pjhl31lib3mmga8yb"; + # 1.9.0 + patches for building citeproc-db, see https://github.com/latex-lsp/texlab/pull/137 + rev = "e38fe4bedc9d8094649a9d2753ca9855e0c18882"; + sha256 = "0j87gmzyqrpgxrgalvlfqj5cj8j0h23hbbv8vdz2dhc847xhhfq1"; }; - cargoSha256 = "0qnysl0ayc242dgvanqgmx8v4a2cjg0f1lhbyw16qjv61qcsx8y5"; - - nativeBuildInputs = [ nodejs ]; + cargoSha256 = "09d9r7aal1q00idv08zdw7dygyasyp5l6jrh96cdclf63h1p4fk9"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' - rm build.rs - ln -s ${texlab-citeproc-build-deps}/lib/node_modules/citeproc/node_modules src/citeproc/js - (cd src/citeproc/js && npm run dist) - ''; - meta = with stdenv.lib; { description = "An implementation of the Language Server Protocol for LaTeX"; homepage = https://texlab.netlify.com/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d37767219985..3eadd3b385a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10585,7 +10585,6 @@ in texlab = callPackage ../development/tools/misc/texlab { inherit (darwin.apple_sdk.frameworks) Security; - inherit (nodePackages) texlab-citeproc-build-deps; }; tflint = callPackage ../development/tools/analysis/tflint { };