alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #58096 from pacien/tedicross-init

Browse source 
tedicross: init at 0.8.7
This commit is contained in:
Silvan Mosberger 2019-04-23 23:14:22 +02:00 committed by GitHub
parent 9a8d764486 d3423dd5c2
commit ca37c23f91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1726 additions and 1647 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -673,6 +673,7 @@
./services/networking/syncthing-relay.nix
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tedicross.nix
./services/networking/tinc.nix
./services/networking/tinydns.nix
./services/networking/tftpd.nix

100
nixos/modules/services/networking/tedicross.nix Normal file
View file

@ -0,0 +1,100 @@
{ config, pkgs, lib, ... }:
with lib;
let
dataDir = "/var/lib/tedicross";
cfg = config.services.tedicross;
configJSON = pkgs.writeText "tedicross-settings.json" (builtins.toJSON cfg.config);
configYAML = pkgs.runCommand "tedicross-settings.yaml" { preferLocalBuild = true; } ''
${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out
'';
in {
options = {
services.tedicross = {
enable = mkEnableOption "the TediCross Telegram-Discord bridge service";
config = mkOption {
type = types.attrs;
# from https://github.com/TediCross/TediCross/blob/master/example.settings.yaml
example = literalExample ''
{
telegram = {
useFirstNameInsteadOfUsername = false;
colonAfterSenderName = false;
skipOldMessages = true;
sendEmojiWithStickers = true;
};
discord = {
useNickname = false;
skipOldMessages = true;
displayTelegramReplies = "embed";
replyLength = 100;
};
bridges = [
{
name = "Default bridge";
direction = "both";
telegram = {
chatId = -123456789;
relayJoinMessages = true;
relayLeaveMessages = true;
sendUsernames = true;
ignoreCommands = true;
};
discord = {
serverId = "DISCORD_SERVER_ID";
channelId = "DISCORD_CHANNEL_ID";
relayJoinMessages = true;
relayLeaveMessages = true;
sendUsernames = true;
crossDeleteOnTelegram = true;
};
}
];
debug = false;
}
'';
description = ''
<filename>settings.yaml</filename> configuration as a Nix attribute set.
Secret tokens should be specified using <option>environmentFile</option>
instead of this world-readable file.
'';
};
environmentFile = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
File containing environment variables to be passed to the TediCross service,
in which secret tokens can be specified securely using the
<literal>TELEGRAM_BOT_TOKEN</literal> and <literal>DISCORD_BOT_TOKEN</literal>
keys.
'';
};
};
};
config = mkIf cfg.enable {
# from https://github.com/TediCross/TediCross/blob/master/guides/autostart/Linux.md
systemd.services.tedicross = {
description = "TediCross Telegram-Discord bridge service";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.nodePackages.tedicross}/bin/tedicross --config='${configYAML}' --data-dir='${dataDir}'";
Restart = "always";
DynamicUser = true;
StateDirectory = baseNameOf dataDir;
EnvironmentFile = cfg.environmentFile;
};
};
};
meta.maintainers = with maintainers; [ pacien ];
}

8
pkgs/development/node-packages/default-v10.nix
View file

@ -91,6 +91,14 @@ nodePackages // {
buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
};
tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
--add-flags "$out/lib/node_modules/tedicross/main.js"
'';
};
webtorrent-cli = nodePackages.webtorrent-cli.override {
buildInputs = [ nodePackages.node-gyp-build ];
};

1
pkgs/development/node-packages/node-packages-v10.json
View file

@ -108,6 +108,7 @@
, "stackdriver-statsd-backend"
, "svgo"
, "swagger"
, { "tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7" }
, "tern"
, "textlint"
, "three"

3147
pkgs/development/node-packages/node-packages-v10.nix
View file

File diff suppressed because it is too large Load diff

116
pkgs/development/node-packages/node-packages-v8.nix
View file

@ -4,13 +4,13 @@
let
sources = {
"@types/node-8.10.45" = {
"@types/node-8.10.46" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "8.10.45";
version = "8.10.46";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz";
sha512 = "tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==";
url = "https://registry.npmjs.org/@types/node/-/node-8.10.46.tgz";
sha512 = "PfnRbk836fFs9T9QnZh0G1k9oC6YXCqIK3LX6vU/6oiXtEBSFCiJFj6UnLZtqIIHTsgMn8Dojq3yhmpwY7QWcw==";
};
};
"JSV-4.0.2" = {
@ -688,13 +688,13 @@ let
sha512 = "b+rxF8esa1Cm+bnJLs6a+hO/7U9QwvQzg0bSR1rKP9NTKjZji3GxdndcPVkHqFv28QiLo9ifyR/FaJMA0cDcTw==";
};
};
"azure-storage-2.10.2" = {
"azure-storage-2.10.3" = {
name = "azure-storage";
packageName = "azure-storage";
version = "2.10.2";
version = "2.10.3";
src = fetchurl {
url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz";
sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA==";
url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.3.tgz";
sha512 = "IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ==";
};
};
"babel-code-frame-6.26.0" = {
@ -1084,13 +1084,13 @@ let
sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
};
};
"component-emitter-1.2.1" = {
"component-emitter-1.3.0" = {
name = "component-emitter";
packageName = "component-emitter";
version = "1.2.1";
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
};
};
"concat-map-0.0.1" = {
@ -1219,6 +1219,15 @@ let
sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
};
};
"debug-4.1.1" = {
name = "debug";
packageName = "debug";
version = "4.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
};
};
"decode-uri-component-0.2.0" = {
name = "decode-uri-component";
packageName = "decode-uri-component";
@ -1561,13 +1570,13 @@ let
sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
};
};
"fined-1.1.1" = {
"fined-1.2.0" = {
name = "fined";
packageName = "fined";
version = "1.1.1";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz";
sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==";
url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz";
sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==";
};
};
"flagged-respawn-1.0.1" = {
@ -2704,22 +2713,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
"mime-db-1.38.0" = {
"mime-db-1.40.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.38.0";
version = "1.40.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
};
};
"mime-types-2.1.22" = {
"mime-types-2.1.24" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.22";
version = "2.1.24";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
};
};
"minimatch-3.0.4" = {
@ -2830,6 +2839,15 @@ let
sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
};
};
"ms-2.1.1" = {
name = "ms";
packageName = "ms";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
};
};
"ms-rest-1.15.7" = {
name = "ms-rest";
packageName = "ms-rest";
@ -2893,13 +2911,13 @@ let
sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
};
};
"needle-2.2.4" = {
"needle-2.3.0" = {
name = "needle";
packageName = "needle";
version = "2.2.4";
version = "2.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz";
sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==";
url = "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz";
sha512 = "QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==";
};
};
"node-appc-0.2.49" = {
@ -3757,13 +3775,13 @@ let
sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
};
};
"source-map-support-0.5.11" = {
"source-map-support-0.5.12" = {
name = "source-map-support";
packageName = "source-map-support";
version = "0.5.11";
version = "0.5.12";
src = fetchurl {
url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz";
sha512 = "//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==";
url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz";
sha512 = "4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==";
};
};
"source-map-url-0.4.0" = {
@ -4641,7 +4659,7 @@ in
sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
};
dependencies = [
sources."@types/node-8.10.45"
sources."@types/node-8.10.46"
sources."JSV-4.0.2"
sources."adal-node-0.1.28"
sources."ajv-6.10.0"
@ -4743,7 +4761,7 @@ in
];
})
sources."azure-servicefabric-2.2.0"
(sources."azure-storage-2.10.2" // {
(sources."azure-storage-2.10.3" // {
dependencies = [
sources."readable-stream-2.0.6"
sources."underscore-1.8.3"
@ -4879,8 +4897,8 @@ in
sources."lodash-4.17.11"
sources."map-stream-0.1.0"
sources."md5.js-1.3.4"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@ -5116,7 +5134,7 @@ in
];
})
sources."collection-visit-1.0.0"
sources."component-emitter-1.2.1"
sources."component-emitter-1.3.0"
sources."copy-descriptor-0.1.1"
sources."debug-2.6.9"
sources."decode-uri-component-0.2.0"
@ -5159,7 +5177,7 @@ in
];
})
sources."findup-sync-2.0.0"
sources."fined-1.1.1"
sources."fined-1.2.0"
sources."flagged-respawn-1.0.1"
sources."for-in-1.0.2"
sources."for-own-1.0.0"
@ -5400,8 +5418,8 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@ -5494,7 +5512,7 @@ in
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
sources."debug-2.6.9"
sources."debug-4.1.1"
sources."deep-extend-0.6.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
@ -5515,8 +5533,8 @@ in
sources."minipass-2.3.5"
sources."minizlib-1.2.1"
sources."mkdirp-0.5.1"
sources."ms-2.0.0"
sources."needle-2.2.4"
sources."ms-2.1.1"
sources."needle-2.3.0"
sources."nopt-4.0.1"
sources."npm-bundled-1.0.6"
sources."npm-packlist-1.4.1"
@ -5564,10 +5582,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "3.1.0";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz";
sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA==";
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.1.tgz";
sha512 = "MqSWfZXft1cQ6rFgpGpl8JIY3O8w8TnTplvjuCPMl4zRxAUAz0Gzr7ARYH6czoiTxBIbbhu41GfbsBfgMSGTwA==";
};
buildInputs = globalBuildInputs;
meta = {
@ -5644,8 +5662,8 @@ in
sources."keypress-0.2.1"
sources."lodash-4.17.11"
sources."longjohn-0.2.12"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.10"
sources."moment-2.22.2"
@ -5671,7 +5689,7 @@ in
sources."safer-buffer-2.1.2"
sources."semver-5.6.0"
sources."source-map-0.6.1"
sources."source-map-support-0.5.11"
sources."source-map-support-0.5.12"
sources."sprintf-0.1.5"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"