diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2022-10-31 08:40:53 +0100 |
---|---|---|
committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2022-10-31 13:39:21 +0100 |
commit | 31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833 (patch) | |
tree | 690d4d463e38caba8f15d8b406c23b3b8602082d | |
parent | 5c4ca40f94258515b1835d40756c3004a81f7c31 (diff) | |
download | nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar.gz nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar.bz2 nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar.lz nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar.xz nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.tar.zst nixpkgs-31b3bf55fcc6b64209f3ee39ccab1ca5dc52b833.zip |
hedgedoc: 1.9.4 -> 1.9.5
-rw-r--r-- | pkgs/servers/web-apps/hedgedoc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/web-apps/hedgedoc/package.json | 32 | ||||
-rwxr-xr-x | pkgs/servers/web-apps/hedgedoc/update.sh | 13 |
3 files changed, 28 insertions, 23 deletions
diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index dd72cd7f097..f6c8a8c47d5 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -12,14 +12,14 @@ mkYarnPackage rec { pname = "hedgedoc"; - version = "1.9.4"; + version = "1.9.5"; # we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies # in development and production and the web assets muts be compiled with js-yaml 3 while development # uses js-yaml 4 which breaks the text editor src = fetchzip { url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz"; - hash = "sha256-YBPxL1/2bj+8cemSBZSNqSlD/DYJRxSG5UuyUipf3R8="; + hash = "sha256-dcqCc4UUI1knRlDfQlXq3cpTRTh+kbgFynbypDzw9y8="; }; nativeBuildInputs = [ which makeWrapper ]; @@ -30,7 +30,7 @@ mkYarnPackage rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - sha256 = "sha256-tnxubtu2lv5DKYY4rwQzNwvsFu3pD3NF4VUN/xieqpc="; + sha256 = "18k2q2llngdk0gsyjrwpirhvwmkwgzhx8nw1rx7g7v2nfzyz189b"; }; configurePhase = '' diff --git a/pkgs/servers/web-apps/hedgedoc/package.json b/pkgs/servers/web-apps/hedgedoc/package.json index fcf8c6d68c1..588bca89168 100644 --- a/pkgs/servers/web-apps/hedgedoc/package.json +++ b/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.9.4", + "version": "1.9.5", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -21,7 +21,7 @@ "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", "archiver": "^5.0.2", "async": "^3.0.0", - "aws-sdk": "^2.987.0", + "aws-sdk": "^2.1243.0", "azure-storage": "^2.7.0", "base64url": "^3.0.0", "body-parser": "^1.15.2", @@ -37,7 +37,7 @@ "ejs": "^3.0.0", "express": ">=4.14", "express-session": "^1.14.2", - "file-type": "^17.0.0", + "file-type": "^18.0.0", "formidable": "^2.0.0", "graceful-fs": "^4.1.11", "helmet": "^4.5.0", @@ -47,7 +47,7 @@ "lodash": "^4.17.20", "lutim": "^1.0.2", "lz-string": "git+https://github.com/hackmdio/lz-string.git", - "mariadb": "^3.0.0", + "mariadb": "^3.0.2", "markdown-it": "^13.0.0", "markdown-it-abbr": "^1.0.4", "markdown-it-container": "^3.0.0", @@ -65,7 +65,7 @@ "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^3.0.0", "minimist": "^1.2.0", - "minio": "7.0.29", + "minio": "7.0.32", "moment": "^2.17.1", "morgan": "^1.7.0", "mysql2": "^2.0.0", @@ -99,7 +99,7 @@ "string": "^3.3.3", "toobusy-js": "^0.5.1", "umzug": "^2.3.0", - "uuid": "^8.0.0", + "uuid": "^9.0.0", "validator": "^13.0.0", "winston": "^3.1.0", "xss": "^1.0.3" @@ -134,7 +134,7 @@ "url": "https://github.com/hedgedoc/hedgedoc.git" }, "devDependencies": { - "abcjs": "6.0.3", + "abcjs": "6.1.6", "babel-cli": "6.26.0", "babel-core": "6.26.3", "babel-loader": "7.1.5", @@ -148,14 +148,14 @@ "copy-webpack-plugin": "6.4.1", "css-loader": "5.2.7", "emojify.js": "1.1.0", - "esbuild-loader": "2.19.0", + "esbuild-loader": "2.20.0", "escape-html": "1.0.3", - "eslint": "8.19.0", + "eslint": "8.26.0", "eslint-config-standard": "17.0.0", "eslint-plugin-import": "2.26.0", - "eslint-plugin-n": "15.2.4", + "eslint-plugin-n": "15.3.0", "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.0.0", + "eslint-plugin-promise": "6.1.1", "eslint-plugin-standard": "4.1.0", "exports-loader": "1.1.1", "expose-loader": "1.0.3", @@ -168,9 +168,9 @@ "html-webpack-plugin": "4.5.2", "imports-loader": "1.2.0", "ionicons": "2.0.1", - "jquery": "3.6.0", + "jquery": "3.6.1", "jquery-mousewheel": "3.1.13", - "jquery-ui": "1.13.1", + "jquery-ui": "1.13.2", "js-cookie": "3.0.1", "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", "js-yaml": "3.14.1", @@ -180,12 +180,12 @@ "less-loader": "7.3.0", "list.js": "2.3.1", "mathjax": "2.7.9", - "mermaid": "9.1.3", + "mermaid": "9.1.7", "mini-css-extract-plugin": "1.6.2", - "mocha": "10.0.0", + "mocha": "10.1.0", "mock-require": "3.0.3", "optimize-css-assets-webpack-plugin": "6.0.1", - "prismjs": "1.28.0", + "prismjs": "1.29.0", "raphael": "2.3.0", "remark-cli": "11.0.0", "remark-preset-lint-markdown-style-guide": "5.1.2", diff --git a/pkgs/servers/web-apps/hedgedoc/update.sh b/pkgs/servers/web-apps/hedgedoc/update.sh index 02f9a159831..fc6c30e9e55 100755 --- a/pkgs/servers/web-apps/hedgedoc/update.sh +++ b/pkgs/servers/web-apps/hedgedoc/update.sh @@ -16,11 +16,16 @@ if [ -z "$version" ]; then fi src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version" + wget "$src/package.json" -O package.json +wget "$src/yarn.lock" -O yarn.lock -src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev "${version}" | jq -r .sha256) +src_old_hash=$(nix-prefetch-url --unpack "https://github.com/hedgedoc/hedgedoc/releases/download/$version/hedgedoc-$version.tar.gz") +src_hash=$(nix hash to-sri --type sha256 $src_old_hash) yarn_hash=$(prefetch-yarn-deps yarn.lock) -sed -i "s/version = \".*\"/version = \"$version\"/" default.nix -sed -i "s/hash = \".*\"/hash = \"$src_hash\"/" default.nix -sed -i "s/sha256 = \".*\"/sha256 = \"$yarn_hash\"/" default.nix +sed -i "s|version = \".*\"|version = \"$version\"|" default.nix +sed -i "s|hash = \".*\"|hash = \"$src_hash\"|" default.nix +sed -i "s|sha256 = \".*\"|sha256 = \"$yarn_hash\"|" default.nix + +rm yarn.lock |