JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #217244 from SuperSandro2000/hedgedoc-1.9.7

Browse Source
This commit is contained in:
Sandro 2023-02-28 00:57:24 +01:00 committed by GitHub
commit eef1defad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/web-apps/hedgedoc/default.nix
View File

@ -12,14 +12,14 @@
mkYarnPackage rec {
pname = "hedgedoc";
version = "1.9.6";
version = "1.9.7";
# 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-NoA4mv9LyvShr4fdfBSHgDoyxY59ubRC8YC6hvOimZc=";
hash = "sha256-tPkhnnKDS5TICsW66YCOy7xWFj5usLyDMbYMYQ3Euoc=";
};
nativeBuildInputs = [ which makeWrapper ];
@ -30,7 +30,7 @@ mkYarnPackage rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "1xxq02mgys3bp7ivgsr9hyafd866ygw2bp3rbld2500afvayz89v";
sha256 = "0qkc26ks33vy00jgpv4445wzgxx1mzi70pkm1l8y9amgd9wf9aig";
};
configurePhase = ''
@ -78,7 +78,7 @@ mkYarnPackage rec {
description = "Realtime collaborative markdown notes on all platforms";
license = licenses.agpl3;
homepage = "https://hedgedoc.org";
maintainers = with maintainers; [ willibutz SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
platforms = platforms.linux;
};
}

26
pkgs/servers/web-apps/hedgedoc/package.json
View File

@ -1,6 +1,6 @@
{
"name": "HedgeDoc",
"version": "1.9.6",
"version": "1.9.7",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",
@ -27,6 +27,7 @@
"body-parser": "^1.15.2",
"chance": "^1.0.4",
"cheerio": "^0.22.0",
"clean-webpack-plugin": "^4.0.0",
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^7.1.2",
@ -68,7 +69,7 @@
"minio": "7.0.32",
"moment": "^2.17.1",
"morgan": "^1.7.0",
"mysql2": "^2.0.0",
"mysql2": "^3.0.0",
"node-fetch": "^2.6.1",
"passport": "^0.6.0",
"passport-dropbox-oauth2": "^1.1.0",
@ -89,7 +90,8 @@
"prometheus-api-metrics": "^3.2.0",
"randomcolor": "^0.6.0",
"readline-sync": "^1.4.7",
"rimraf": "^3.0.2",
"rimraf": "^4.0.0",
"sanitize-filename": "^1.6.3",
"scrypt-kdf": "^2.0.1",
"sequelize": "^5.21.1",
"shortid": "2.2.16",
@ -134,7 +136,7 @@
"url": "https://github.com/hedgedoc/hedgedoc.git"
},
"devDependencies": {
"abcjs": "6.1.6",
"abcjs": "6.1.9",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-loader": "7.1.5",
@ -144,16 +146,16 @@
"babel-runtime": "6.26.0",
"bootstrap": "3.4.1",
"bootstrap-validator": "0.11.9",
"codemirror": "git+https://github.com/hedgedoc/CodeMirror.git",
"codemirror": "git+https://github.com/hedgedoc/CodeMirror.git#hedgedoc/1.9.7",
"copy-webpack-plugin": "6.4.1",
"css-loader": "5.2.7",
"emojify.js": "1.1.0",
"esbuild-loader": "2.20.0",
"esbuild-loader": "3.0.1",
"escape-html": "1.0.3",
"eslint": "8.27.0",
"eslint": "8.34.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.5.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-n": "15.6.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-standard": "4.1.0",
@ -168,7 +170,7 @@
"html-webpack-plugin": "4.5.2",
"imports-loader": "1.2.0",
"ionicons": "2.0.1",
"jquery": "3.6.1",
"jquery": "3.6.3",
"jquery-mousewheel": "3.1.13",
"jquery-ui": "1.13.2",
"js-cookie": "3.0.1",
@ -182,7 +184,7 @@
"mathjax": "2.7.9",
"mermaid": "9.1.7",
"mini-css-extract-plugin": "1.6.2",
"mocha": "10.1.0",
"mocha": "10.2.0",
"mock-require": "3.0.3",
"optimize-css-assets-webpack-plugin": "6.0.1",
"prismjs": "1.29.0",
@ -206,6 +208,6 @@
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
"utf-8-validate": "^5.0.1"
"utf-8-validate": "^6.0.0"
}
}