BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #254306 from dotlambda/tedicross-drop

Browse source 
nodePackages.tedicross: drop
This commit is contained in:
Robert Schütz 2023-09-15 17:23:54 +00:00 committed by GitHub
commit 1f832ad576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1069,7 +1069,6 @@
./services/networking/tayga.nix
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tedicross.nix
./services/networking/teleport.nix
./services/networking/tetrd.nix
./services/networking/tftpd.nix

3
nixos/modules/rename.nix
View file

@ -124,6 +124,9 @@ in
See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
Please switch to a different implementation like kea or dnsmasq.
'')
(mkRemovedOptionModule [ "services" "tedicross" ] ''
The corresponding package was broken and removed from nixpkgs.
'')
# Do NOT add any option renames here, see top of the file
];

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

@ -1,100 +0,0 @@
{ 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 (lib.mdDoc "the TediCross Telegram-Discord bridge service");
config = mkOption {
type = types.attrs;
# from https://github.com/TediCross/TediCross/blob/master/example.settings.yaml
example = literalExpression ''
{
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 = lib.mdDoc ''
{file}`settings.yaml` configuration as a Nix attribute set.
Secret tokens should be specified using {option}`environmentFile`
instead of this world-readable file.
'';
};
environmentFile = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
File containing environment variables to be passed to the TediCross service,
in which secret tokens can be specified securely using the
`TELEGRAM_BOT_TOKEN` and `DISCORD_BOT_TOKEN`
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 ];
}

1
pkgs/development/node-packages/aliases.nix
View file

@ -111,6 +111,7 @@ mapAliases {
inherit (pkgs) stylelint; # added 2023-09-13
surge = pkgs.surge-cli; # Added 2023-09-08
swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09
inherit (pkgs) terser; # Added 2023-08-31
thelounge = pkgs.thelounge; # Added 2023-05-22
three = throw "three was removed because it was no longer needed"; # Added 2023-09-08

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

@ -237,7 +237,6 @@
, "svelte-language-server"
, "svgo"
, "tailwindcss"
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
, "teck-programmer"
, "tern"
, "textlint"

252
pkgs/development/node-packages/node-packages.nix generated
View file

@ -105874,258 +105874,6 @@ in
bypassCache = true;
reconstructLock = true;
};
"tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7" = nodeEnv.buildNodePackage {
name = "tedicross";
packageName = "tedicross";
version = "0.8.7";
src = fetchgit {
url = "https://github.com/TediCross/TediCross.git";
rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38";
sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
};
dependencies = [
sources."@discordjs/opus-0.1.0"
sources."@discordjs/uws-10.149.0"
sources."abbrev-1.1.1"
sources."ajv-6.12.6"
sources."ansi-regex-2.1.1"
sources."ansi-styles-3.2.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.7"
sources."argparse-1.0.10"
sources."asn1-0.2.6"
sources."assert-plus-1.0.0"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.12.0"
sources."balanced-match-1.0.2"
(sources."bcrypt-pbkdf-1.0.2" // {
dependencies = [
sources."tweetnacl-0.14.5"
];
})
sources."bindings-1.5.0"
sources."brace-expansion-1.1.11"
sources."bufferutil-4.0.7"
sources."camelcase-5.3.1"
sources."caseless-0.12.0"
sources."chownr-1.1.4"
(sources."cliui-5.0.0" // {
dependencies = [
sources."ansi-regex-4.1.1"
sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
})
sources."code-point-at-1.1.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.3"
sources."dashdash-1.14.1"
sources."debug-3.2.7"
sources."decamelize-1.2.0"
sources."deep-extend-0.6.0"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
sources."discord.js-11.6.4"
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-7.0.3"
(sources."encoding-0.1.13" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."erlpack-git+https://github.com/discordapp/erlpack"
sources."esprima-4.0.1"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."file-uri-to-path-1.0.0"
sources."find-up-3.0.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
sources."gauge-2.7.4"
sources."get-caller-file-2.0.5"
sources."getpass-0.1.7"
sources."glob-7.2.3"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-unicode-2.0.1"
sources."http-signature-1.2.0"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-fullwidth-code-point-1.0.0"
sources."is-typedarray-1.0.0"
sources."isarray-1.0.0"
sources."isstream-0.1.2"
sources."js-yaml-3.14.1"
sources."jsbn-0.1.1"
sources."json-schema-0.4.0"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.2"
sources."libsodium-0.7.11"
sources."libsodium-wrappers-0.7.11"
sources."locate-path-3.0.0"
sources."long-4.0.0"
sources."mime-2.6.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.6"
sources."module-alias-2.2.3"
sources."moment-2.29.4"
sources."ms-2.1.3"
sources."nan-2.17.0"
sources."needle-2.9.1"
sources."node-addon-api-2.0.2"
sources."node-fetch-2.6.13"
sources."node-gyp-build-4.6.0"
(sources."node-opus-0.2.9" // {
dependencies = [
sources."bindings-1.2.1"
];
})
sources."node-pre-gyp-0.14.0"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.2"
sources."npm-normalize-package-bin-1.0.1"
sources."npm-packlist-1.4.8"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
sources."ogg-packet-1.0.1"
sources."once-1.4.0"
sources."opusscript-0.0.6"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."p-limit-2.3.0"
sources."p-locate-3.0.0"
sources."p-try-2.2.0"
sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
sources."performance-now-2.1.0"
sources."prism-media-0.0.4"
sources."process-nextick-args-2.0.1"
sources."psl-1.9.0"
sources."punycode-2.3.0"
sources."qs-6.5.3"
sources."ramda-0.25.0"
sources."rc-1.2.8"
sources."readable-stream-2.3.8"
(sources."ref-1.3.5" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
(sources."ref-struct-1.1.0" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
sources."request-2.88.2"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sandwich-stream-2.0.2"
sources."sax-1.2.4"
sources."semver-5.7.2"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.7"
sources."simple-markdown-0.4.4"
sources."snekfetch-3.6.4"
sources."sodium-2.0.3"
sources."sprintf-js-1.0.3"
(sources."sshpk-1.17.0" // {
dependencies = [
sources."tweetnacl-0.14.5"
];
})
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
(sources."tar-4.4.19" // {
dependencies = [
sources."safe-buffer-5.2.1"
];
})
(sources."telegraf-3.40.0" // {
dependencies = [
sources."debug-4.3.4"
sources."ms-2.1.2"
];
})
sources."tough-cookie-2.5.0"
sources."tr46-0.0.3"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-1.0.3"
sources."typegram-3.12.0"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
(sources."verror-1.10.0" // {
dependencies = [
sources."core-util-is-1.0.2"
];
})
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
sources."which-module-2.0.1"
sources."wide-align-1.1.5"
(sources."wrap-ansi-5.1.0" // {
dependencies = [
sources."ansi-regex-4.1.1"
sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
})
sources."wrappy-1.0.2"
sources."ws-6.2.2"
sources."y18n-4.0.3"
sources."yallist-3.1.1"
(sources."yargs-13.3.2" // {
dependencies = [
sources."ansi-regex-4.1.1"
sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
})
sources."yargs-parser-13.1.2"
];
buildInputs = globalBuildInputs;
meta = {
description = "Better DiteCross";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
teck-programmer = nodeEnv.buildNodePackage {
name = "teck-programmer";
packageName = "teck-programmer";

8
pkgs/development/node-packages/overrides.nix
View file

@ -352,14 +352,6 @@ final: prev: {
buildInputs = [ pkgs.libusb1 ];
};
tedicross = prev."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
nativeBuildInputs = with pkgs; [ makeWrapper libtool autoconf ];
postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
--add-flags "$out/lib/node_modules/tedicross/main.js"
'';
};
thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override {
nativeBuildInputs = [ final.node-pre-gyp ];
};