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

codimd: 1.6.0 -> 1.7.0, rename to hedgedoc

Browse Source 
CodiMD was renamed to HedgeDoc and is now built with nodejs-14_x.

https://github.com/hedgedoc/hedgedoc/releases/tag/1.7.0
This commit is contained in:
WilliButz 2020-11-29 18:47:34 +01:00
parent 583470209f
commit e19995e43b
No known key found for this signature in database
GPG Key ID: 92582A10F1179CB2
6 changed files with 6261 additions and 4127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/servers/web-apps/codimd/default.nix → pkgs/servers/web-apps/hedgedoc/default.nix
View File

@ -2,14 +2,14 @@
, which, nodejs, mkYarnPackage, python2, nixosTests }: , which, nodejs, mkYarnPackage, python2, nixosTests }:
mkYarnPackage rec { mkYarnPackage rec {
name = "codimd"; name = "hedgedoc";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codimd"; owner = "hedgedoc";
repo = "server"; repo = "hedgedoc";
rev = version; rev = version;
sha256 = "1208a24v664ha9qzr7ky6i3ynphkaj0xi5l3rsw743i22nv5aj33"; sha256 = "1zz5ni9cp1dhcvcrzks13pww5qm2wna2hh0k59pfz7c897rs1l7v";
}; };
nativeBuildInputs = [ which makeWrapper ]; nativeBuildInputs = [ which makeWrapper ];
@ -20,19 +20,15 @@ mkYarnPackage rec {
packageJSON = ./package.json; packageJSON = ./package.json;
postConfigure = '' postConfigure = ''
rm deps/CodiMD/node_modules rm deps/HedgeDoc/node_modules
cp -R "$node_modules" deps/CodiMD cp -R "$node_modules" deps/HedgeDoc
chmod -R u+w deps/CodiMD chmod -R u+w deps/HedgeDoc
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
cd deps/CodiMD cd deps/HedgeDoc
pushd node_modules/codemirror
npm run install
popd
pushd node_modules/sqlite3 pushd node_modules/sqlite3
export CPPFLAGS="-I${nodejs}/include/node" export CPPFLAGS="-I${nodejs}/include/node"
@ -52,23 +48,23 @@ mkYarnPackage rec {
mkdir -p $out mkdir -p $out
cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out
cat > $out/bin/codimd <<EOF cat > $out/bin/hedgedoc <<EOF
#!${stdenv.shell}/bin/sh #!${stdenv.shell}/bin/sh
${nodejs}/bin/node $out/app.js ${nodejs}/bin/node $out/app.js
EOF EOF
chmod +x $out/bin/codimd chmod +x $out/bin/hedgedoc
wrapProgram $out/bin/codimd \ wrapProgram $out/bin/hedgedoc \
--set NODE_PATH "$out/lib/node_modules" --set NODE_PATH "$out/lib/node_modules"
runHook postDist runHook postDist
''; '';
passthru.tests = { inherit (nixosTests) codimd; }; passthru.tests = { inherit (nixosTests) hedgedoc; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Realtime collaborative markdown notes on all platforms"; description = "Realtime collaborative markdown notes on all platforms";
license = licenses.agpl3; license = licenses.agpl3;
homepage = "https://github.com/codimd/server"; homepage = "https://hedgedoc.org";
maintainers = with maintainers; [ willibutz ma27 globin ]; maintainers = with maintainers; [ willibutz ma27 globin ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

133
pkgs/servers/web-apps/codimd/package.json → pkgs/servers/web-apps/hedgedoc/package.json
View File

@ -1,13 +1,14 @@
{ {
"name": "CodiMD", "name": "HedgeDoc",
"version": "1.6.0", "version": "1.7.0",
"description": "Realtime collaborative markdown notes on all platforms.", "description": "The best platform to write and share markdown.",
"main": "app.js", "main": "app.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
"test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite", "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
"eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js", "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js",
"jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
"markdownlint": "remark .",
"mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit", "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
"standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
"dev": "webpack --config webpack.dev.js --progress --colors --watch", "dev": "webpack --config webpack.dev.js --progress --colors --watch",
@ -18,9 +19,9 @@
"dependencies": { "dependencies": {
"@passport-next/passport-openid": "^1.0.0", "@passport-next/passport-openid": "^1.0.0",
"Idle.Js": "git+https://github.com/shawnmclean/Idle.js", "Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
"archiver": "^2.1.1", "archiver": "^5.0.2",
"async": "^2.1.4", "async": "^2.1.4",
"aws-sdk": "^2.345.0", "aws-sdk": "^2.521.0",
"azure-storage": "^2.7.0", "azure-storage": "^2.7.0",
"base64url": "^3.0.0", "base64url": "^3.0.0",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
@ -28,16 +29,16 @@
"bootstrap-validator": "^0.11.8", "bootstrap-validator": "^0.11.8",
"chance": "^1.0.4", "chance": "^1.0.4",
"cheerio": "^0.22.0", "cheerio": "^0.22.0",
"codemirror": "git+https://github.com/hackmdio/CodeMirror.git", "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git",
"compression": "^1.6.2", "compression": "^1.6.2",
"connect-flash": "^0.1.1", "connect-flash": "^0.1.1",
"connect-session-sequelize": "^6.0.0", "connect-session-sequelize": "^6.0.0",
"cookie": "0.3.1", "cookie": "^0.4.0",
"cookie-parser": "1.4.3", "cookie-parser": "^1.4.3",
"deep-freeze": "^0.0.1", "deep-freeze": "^0.0.1",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^2.5.5", "ejs": "^2.5.5",
"emojify.js": "~1.1.0", "emojify.js": "^1.1.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"express": ">=4.14", "express": ">=4.14",
"express-session": "^1.14.2", "express-session": "^1.14.2",
@ -45,24 +46,24 @@
"flowchart.js": "^1.6.4", "flowchart.js": "^1.6.4",
"fork-awesome": "^1.1.3", "fork-awesome": "^1.1.3",
"formidable": "^1.0.17", "formidable": "^1.0.17",
"gist-embed": "~2.6.0", "gist-embed": "^2.6.0",
"graceful-fs": "^4.1.11", "graceful-fs": "^4.1.11",
"handlebars": "^4.5.2", "handlebars": "^4.5.2",
"helmet": "^3.21.1", "helmet": "^3.21.1",
"highlight.js": "~9.12.0", "highlight.js": "^9.12.0",
"i18n": "^0.8.3", "i18n": "^0.13.0",
"imgur": "git+https://github.com/hackmdio/node-imgur.git", "imgur": "git+https://github.com/hackmdio/node-imgur.git",
"ionicons": "~2.0.1", "ionicons": "^2.0.1",
"jquery": "^3.4.1", "jquery": "^3.5.1",
"jquery-mousewheel": "^3.1.13", "jquery-mousewheel": "^3.1.13",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"js-cookie": "^2.1.3", "js-cookie": "^2.1.3",
"js-sequence-diagrams": "git+https://github.com/codimd/js-sequence-diagrams.git", "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"jsdom-nogyp": "^0.8.3", "jsdom-nogyp": "^0.8.3",
"keymaster": "^1.6.2", "keymaster": "^1.6.2",
"list.js": "^1.5.0", "list.js": "^1.5.0",
"lodash": "^4.17.11", "lodash": "^4.17.20",
"lutim": "^1.0.2", "lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git", "lz-string": "git+https://github.com/hackmdio/lz-string.git",
"mariadb": "^2.1.2", "mariadb": "^2.1.2",
@ -79,11 +80,10 @@
"markdown-it-regexp": "^0.4.0", "markdown-it-regexp": "^0.4.0",
"markdown-it-sub": "^1.0.0", "markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0", "markdown-it-sup": "^1.0.0",
"markdown-pdf": "^10.0.0", "mathjax": "^2.7.6",
"mathjax": "~2.7.6",
"mattermost": "^3.4.0", "mattermost": "^3.4.0",
"mermaid": "~8.4.6", "mermaid": "^8.5.1",
"meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5", "meta-marked": "git+https://github.com/hedgedoc/meta-marked",
"method-override": "^2.3.7", "method-override": "^2.3.7",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"minio": "^6.0.0", "minio": "^6.0.0",
@ -103,22 +103,22 @@
"passport-twitter": "^1.0.4", "passport-twitter": "^1.0.4",
"passport.socketio": "^3.7.0", "passport.socketio": "^3.7.0",
"pdfobject": "^2.0.201604172", "pdfobject": "^2.0.201604172",
"pg": "^7.12.1", "pg": "^8.2.1",
"pg-hstore": "^2.3.3", "pg-hstore": "^2.3.3",
"prismjs": "^1.6.0", "prismjs": "^1.21.0",
"randomcolor": "^0.5.3", "randomcolor": "^0.6.0",
"raphael": "git+https://github.com/dmitrybaranovskiy/raphael", "raphael": "^2.3.0",
"readline-sync": "^1.4.7", "readline-sync": "^1.4.7",
"request": "^2.88.0", "request": "^2.88.0",
"reveal.js": "~3.9.2", "reveal.js": "^3.9.2",
"scrypt-async": "^2.0.1", "scrypt-async": "^2.0.1",
"scrypt-kdf": "^2.0.1", "scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify", "select2": "^3.5.2-browserify",
"sequelize": "^5.21.1", "sequelize": "^5.21.1",
"sequelize-cli": "^5.5.1", "sequelize-cli": "^5.5.1",
"shortid": "2.2.8", "shortid": "2.2.16",
"socket.io": "~2.1.1", "socket.io": "^2.1.1",
"socket.io-client": "~2.1.1", "socket.io-client": "^2.1.1",
"spin.js": "^2.3.2", "spin.js": "^2.3.2",
"sqlite3": "^4.1.0", "sqlite3": "^4.1.0",
"store": "^2.0.12", "store": "^2.0.12",
@ -137,20 +137,20 @@
"xss": "^1.0.3" "xss": "^1.0.3"
}, },
"resolutions": { "resolutions": {
"**/tough-cookie": "~2.4.0", "**/tough-cookie": "~2.5.0",
"**/minimatch": "^3.0.2", "**/minimatch": "^3.0.2",
"**/request": "^2.88.0" "**/request": "^2.88.0"
}, },
"engines": { "engines": {
"node": ">=8.x" "node": ">=10.13"
}, },
"bugs": "https://github.com/codimd/server/issues", "bugs": "https://github.com/hedgedoc/hedgedoc/issues",
"keywords": [ "keywords": [
"Collaborative", "Collaborative",
"Markdown", "Markdown",
"Notes" "Notes"
], ],
"homepage": "https://codimd.org", "homepage": "https://hedgedoc.org",
"maintainers": [ "maintainers": [
{ {
"name": "Claudius Coenen", "name": "Claudius Coenen",
@ -164,42 +164,43 @@
], ],
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/codimd/server.git" "url": "https://github.com/hedgedoc/hedgedoc.git"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "^6.26.0", "babel-cli": "6.26.0",
"babel-core": "^6.26.3", "babel-core": "6.26.3",
"babel-loader": "^7.1.4", "babel-loader": "7.1.5",
"babel-plugin-transform-runtime": "^6.23.0", "babel-plugin-transform-runtime": "6.23.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "6.26.0",
"babel-preset-env": "^1.7.0", "babel-preset-env": "1.7.0",
"babel-runtime": "^6.26.0", "babel-runtime": "6.26.0",
"copy-webpack-plugin": "^5.0.5", "copy-webpack-plugin": "6.4.1",
"css-loader": "^3.2.0", "css-loader": "3.6.0",
"eslint": "^5.9.0", "eslint": "5.16.0",
"eslint-config-standard": "^12.0.0", "eslint-config-standard": "12.0.0",
"eslint-plugin-import": "^2.14.0", "eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "^8.0.0", "eslint-plugin-node": "8.0.1",
"eslint-plugin-promise": "^4.0.1", "eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "^4.0.0", "eslint-plugin-standard": "4.1.0",
"expose-loader": "^0.7.5", "expose-loader": "0.7.5",
"file-loader": "^4.3.0", "file-loader": "4.3.0",
"html-webpack-plugin": "^4.0.0-beta.11", "html-webpack-plugin": "4.5.0",
"imports-loader": "^0.8.0", "imports-loader": "0.8.0",
"jsonlint": "^1.6.2", "jsonlint": "1.6.3",
"less": "^3.10.3", "less": "3.13.1",
"less-loader": "^5.0.0", "less-loader": "5.0.0",
"mini-css-extract-plugin": "^0.8.0", "mini-css-extract-plugin": "0.12.0",
"mocha": "^5.2.0", "mocha": "5.2.0",
"mock-require": "^3.0.3", "mock-require": "3.0.3",
"optimize-css-assets-webpack-plugin": "^5.0.3", "optimize-css-assets-webpack-plugin": "5.0.4",
"script-loader": "^0.7.2", "remark-cli": "8.0.1",
"string-loader": "^0.0.1", "remark-preset-lint-markdown-style-guide": "3.0.1",
"style-loader": "^1.0.0", "script-loader": "0.7.2",
"url-loader": "^2.3.0", "string-loader": "0.0.1",
"webpack": "^4.41.2", "url-loader": "2.3.0",
"webpack-cli": "^3.3.10", "webpack": "4.44.2",
"webpack-merge": "^4.2.2" "webpack-cli": "3.3.12",
"webpack-merge": "4.2.2"
}, },
"optionalDependencies": { "optionalDependencies": {
"bufferutil": "^4.0.0", "bufferutil": "^4.0.0",

5352
pkgs/servers/web-apps/codimd/yarn.lock → pkgs/servers/web-apps/hedgedoc/yarn.lock
View File

File diff suppressed because it is too large Load Diff

4866
pkgs/servers/web-apps/codimd/yarn.nix → pkgs/servers/web-apps/hedgedoc/yarn.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -88,6 +88,7 @@ mapAliases ({
clangAnalyzer = clang-analyzer; # added 2015-02-20 clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29 clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25 clutter_gtk = clutter-gtk; # added 2018-02-25
codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02 compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20 compton-git = compton; # added 2019-05-20
conntrack_tools = conntrack-tools; # added 2018-05 conntrack_tools = conntrack-tools; # added 2018-05

4
pkgs/top-level/all-packages.nix
View File

@ -2961,9 +2961,7 @@ in
cmt = callPackage ../applications/audio/cmt {}; cmt = callPackage ../applications/audio/cmt {};
codimd = callPackage ../servers/web-apps/codimd { hedgedoc = callPackage ../servers/web-apps/hedgedoc { };
nodejs = nodejs-12_x;
};
colord = callPackage ../tools/misc/colord { }; colord = callPackage ../tools/misc/colord { };