From 99f6c0b130dd37673ebc94901db2db19d9a4655a Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 9 Jul 2023 15:48:36 +0900 Subject: chore(flake): bump --- overlays/mjolnir-package/default.nix | 80 ----------------------------------- overlays/mjolnir-package/package.json | 69 ------------------------------ overlays/mjolnir-package/pin.json | 5 --- overlays/mjolnir-package/update.sh | 36 ---------------- 4 files changed, 190 deletions(-) delete mode 100644 overlays/mjolnir-package/default.nix delete mode 100644 overlays/mjolnir-package/package.json delete mode 100644 overlays/mjolnir-package/pin.json delete mode 100755 overlays/mjolnir-package/update.sh (limited to 'overlays/mjolnir-package') diff --git a/overlays/mjolnir-package/default.nix b/overlays/mjolnir-package/default.nix deleted file mode 100644 index 833124b..0000000 --- a/overlays/mjolnir-package/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, nixosTests -, mkYarnPackage -, fetchYarnDeps -, fetchFromGitHub -, makeWrapper -, nodejs -, pkgs -, matrix-sdk-crypto-nodejs -}: - -let - pin = lib.importJSON ./pin.json; -in -mkYarnPackage rec { - pname = "mjolnir"; - inherit (pin) version; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "mjolnir"; - rev = "v${version}"; - sha256 = pin.srcSha256; - }; - - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - sha256 = pin.yarnSha256; - }; - - packageResolutions = { - "@matrix-org/matrix-sdk-crypto-nodejs" = "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs"; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - postInstall = '' - makeWrapper ${nodejs}/bin/node $out/bin/mjolnir \ - --add-flags $out/libexec/mjolnir/deps/mjolnir/lib/index.js - ''; - - doDist = false; - - passthru = { - tests = { - inherit (nixosTests) mjolnir; - }; - updateScript = ./update.sh; - }; - - meta = with lib; { - description = "A moderation tool for Matrix"; - homepage = "https://github.com/matrix-org/mjolnir"; - longDescription = '' - As an all-in-one moderation tool, it can protect your server from - malicious invites, spam messages, and whatever else you don't want. - In addition to server-level protection, Mjolnir is great for communities - wanting to protect their rooms without having to use their personal - accounts for moderation. - - The bot by default includes support for bans, redactions, anti-spam, - server ACLs, room directory changes, room alias transfers, account - deactivation, room shutdown, and more. - - A Synapse module is also available to apply the same rulesets the bot - uses across an entire homeserver. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/overlays/mjolnir-package/package.json b/overlays/mjolnir-package/package.json deleted file mode 100644 index f7ed5ab..0000000 --- a/overlays/mjolnir-package/package.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "mjolnir", - "version": "1.6.3", - "description": "A moderation tool for Matrix", - "main": "lib/index.js", - "repository": "git@github.com:matrix-org/mjolnir.git", - "author": "The Matrix.org Foundation C.I.C.", - "license": "Apache-2.0", - "private": true, - "scripts": { - "build": "tsc", - "postbuild": "rm -rf lib/test/ && cp -r lib/src/* lib/ && rm -rf lib/src/", - "lint": "tslint --project ./tsconfig.json -t stylish", - "start:dev": "yarn build && node --async-stack-traces lib/index.js", - "test": "ts-mocha --project ./tsconfig.json test/commands/**/*.ts", - "test:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"", - "test:integration:single": "NODE_ENV=harness npx ts-mocha --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json", - "test:appservice:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --timeout 300000 --project ./tsconfig.json \"test/appservice/integration/**/*Test.ts\"", - "test:appservice:integration:single": "NODE_ENV=harness npx ts-mocha --timeout 300000 --project ./tsconfig.json", - "test:manual": "NODE_ENV=harness ts-node test/integration/manualLaunchScript.ts", - "version": "sed -i '/# version automated/s/[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*/'$npm_package_version'/' synapse_antispam/setup.py && git add synapse_antispam/setup.py && cat synapse_antispam/setup.py" - }, - "devDependencies": { - "@types/config": "^3.3.0", - "@types/crypto-js": "^4.0.2", - "@types/express": "^4.17.13", - "@types/html-to-text": "^8.0.1", - "@types/humanize-duration": "^3.27.1", - "@types/js-yaml": "^4.0.5", - "@types/jsdom": "^16.2.11", - "@types/mocha": "^9.0.0", - "@types/nedb": "^1.8.12", - "@types/node": "^16.7.10", - "@types/pg": "^8.6.5", - "@types/request": "^2.48.8", - "@types/shell-quote": "1.7.1", - "crypto-js": "^4.1.1", - "eslint": "^7.32", - "expect": "^27.0.6", - "mocha": "^9.0.1", - "ts-mocha": "^9.0.2", - "tslint": "^6.1.3", - "typescript": "^4.8.4", - "typescript-formatter": "^7.2" - }, - "dependencies": { - "@sentry/node": "^7.17.2", - "@sentry/tracing": "^7.17.2", - "await-lock": "^2.2.2", - "body-parser": "^1.20.1", - "config": "^3.3.8", - "express": "^4.17", - "html-to-text": "^8.0.0", - "humanize-duration": "^3.27.1", - "humanize-duration-ts": "^2.1.1", - "js-yaml": "^4.1.0", - "jsdom": "^16.6.0", - "matrix-appservice-bridge": "8.0.0", - "parse-duration": "^1.0.2", - "pg": "^8.8.0", - "prom-client": "^14.1.0", - "shell-quote": "^1.7.3", - "ulidx": "^0.3.0", - "yaml": "^2.1.1" - }, - "engines": { - "node": ">=16.0.0" - } -} diff --git a/overlays/mjolnir-package/pin.json b/overlays/mjolnir-package/pin.json deleted file mode 100644 index 2ff9e4d..0000000 --- a/overlays/mjolnir-package/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "v1.6.4", - "srcSha256": "/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w=", - "yarnSha256": "00x5vx6qdvhmplb8ykq4ngh5nhygfw396709w8hil8pri84k92q7" -} diff --git a/overlays/mjolnir-package/update.sh b/overlays/mjolnir-package/update.sh deleted file mode 100755 index 548de93..0000000 --- a/overlays/mjolnir-package/update.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github - -if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for mjolnir." - echo "Usage: $0 [git release tag]" - exit 1 -fi - -version=$1 - -set -euo pipefail - -if [ -z "$version" ]; then - version=$(curl "https://api.github.com/repos/matrix-org/mjolnir/releases/latest" | jq -r '.tag_name') -fi - -src="https://raw.githubusercontent.com/matrix-org/mjolnir/$version" -src_hash=$(nix-prefetch-github matrix-org mjolnir --rev ${version} | jq -r .sha256) - -tmpdir=$(mktemp -d) -trap 'rm -rf "$tmpdir"' EXIT - -pushd $tmpdir -curl -O "$src/yarn.lock" -yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd - -curl -O "$src/package.json" -cat > pin.json << EOF -{ - "version": "$version", - "srcSha256": "$src_hash", - "yarnSha256": "$yarn_hash" -} -EOF -- cgit 1.4.1