From 76c7c2dd88be617a8a9fdda78f2845eafbb40088 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 19 Oct 2024 06:56:32 +0000 Subject: [PATCH] nodePackages.shout: drop shout has been deprecated since 2016: https://github.com/erming/shout/commit/90a62c56af4412c6b0e0ae51fe84f3825f49e226 Also, move the top-level `shout` alias to `pkgs/top-level/aliases.nix`. Part of #229475 --- .../manual/release-notes/rl-2411.section.md | 4 + nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/networking/shout.nix | 115 -------- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 247 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 10 files changed, 8 insertions(+), 367 deletions(-) delete mode 100644 nixos/modules/services/networking/shout.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 929017a5e550..4b5d70c03ab6 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -509,6 +509,10 @@ - `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured. +- The `nodePackages.shout` package has been removed because it was deprecated upstream in favor of `thelounge`. + The `shout` top-level attribute was an alias to this package. + The associated `services.shout` module has also been removed. + - The `indi-full` package no longer contains non-free drivers. To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers. E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}` diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8b0127dc29f7..ab3568c4d992 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -236,7 +236,7 @@ in riemanntools = 203; subsonic = 204; # riak = 205; # unused, remove 2022-07-22 - #shout = 206; # dynamically allocated as of 2021-09-18 + #shout = 206; # dynamically allocated as of 2021-09-18, module removed 2024-10-19 gateone = 207; namecoin = 208; #lxd = 210; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6ac03cca94e9..54d9e8a104ea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1204,7 +1204,6 @@ ./services/networking/shellhub-agent.nix ./services/networking/shorewall.nix ./services/networking/shorewall6.nix - ./services/networking/shout.nix ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 762c3ddbae9a..9fdcf7c7281a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -102,6 +102,7 @@ in (mkRemovedOptionModule [ "services" "railcar" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "replay-sorcery" ] "the corresponding package has been removed from nixpkgs as it is unmaintained upstream. Consider using `gpu-screen-recorder` or `obs-studio` instead.") (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "shout" ] "shout was removed because it was deprecated upstream in favor of thelounge.") (mkRemovedOptionModule [ "services" "ssmtp" ] '' The ssmtp package and the corresponding module have been removed due to the program being unmaintained. The options `programs.msmtp.*` can be diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix deleted file mode 100644 index 017b8590197a..000000000000 --- a/nixos/modules/services/networking/shout.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - cfg = config.services.shout; - shoutHome = "/var/lib/shout"; - - defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } '' - EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD - mv config.js $out - ''; - - finalConfigFile = if (cfg.configFile != null) then cfg.configFile else '' - var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash') - - module.exports = _.merge( - {}, - require('${defaultConfig}'), - ${builtins.toJSON cfg.config} - ) - ''; - -in { - options.services.shout = { - enable = mkEnableOption "Shout web IRC client"; - - private = mkOption { - type = types.bool; - default = false; - description = '' - Make your shout instance private. You will need to configure user - accounts by adding entries in {file}`${shoutHome}/users`. - ''; - }; - - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "IP interface to listen on for http connections."; - }; - - port = mkOption { - type = types.port; - default = 9000; - description = "TCP port to listen on for http connections."; - }; - - configFile = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Contents of Shout's {file}`config.js` file. - - Used for backward compatibility, recommended way is now to use - the `config` option. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - - config = mkOption { - default = {}; - type = types.attrs; - example = { - displayNetwork = false; - defaults = { - name = "Your Network"; - host = "localhost"; - port = 6697; - }; - }; - description = '' - Shout {file}`config.js` contents as attribute set (will be - converted to JSON to generate the configuration file). - - The options defined here will be merged to the default configuration file. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.shout = { - isSystemUser = true; - group = "shout"; - description = "Shout daemon user"; - home = shoutHome; - createHome = true; - }; - users.groups.shout = {}; - - systemd.services.shout = { - description = "Shout web IRC client"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - preStart = "ln -sf ${pkgs.writeText "config.js" finalConfigFile} ${shoutHome}/config.js"; - script = concatStringsSep " " [ - "${pkgs.shout}/bin/shout" - (if cfg.private then "--private" else "--public") - "--port" (toString cfg.port) - "--host" (toString cfg.listenAddress) - "--home" shoutHome - ]; - serviceConfig = { - User = "shout"; - ProtectHome = "true"; - ProtectSystem = "full"; - PrivateTmp = "true"; - }; - }; - }; -} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 648d045ffd05..c0ac63577954 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -158,6 +158,7 @@ mapAliases { inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 inherit (pkgs) serverless; # Added 2023-11-29 + shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19 inherit (pkgs) snyk; # Added 2023-08-30 inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ad85e2054447..446c0d4fe6cb 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -174,7 +174,6 @@ , "sass" , "semver" , "serve" -, "shout" , "sloc" , "smartdc" , "socket.io" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 726b4bd7e1c5..0d5ce792d47b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -79540,253 +79540,6 @@ in bypassCache = true; reconstructLock = true; }; - shout = nodeEnv.buildNodePackage { - name = "shout"; - packageName = "shout"; - version = "0.53.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shout/-/shout-0.53.0.tgz"; - sha512 = "WX6Be8BtHxMskOZkxEx96cy7Qs+DTsasvmITJDa28OMkGQS59EuR7LPVq4BB1O5uvvjxvIi1rF1WqZwbF/PfKQ=="; - }; - dependencies = [ - sources."CSSselect-0.4.1" - sources."CSSwhat-0.4.7" - sources."accepts-1.3.8" - sources."after-0.8.1" - sources."ajv-6.12.6" - sources."array-flatten-1.1.1" - sources."arraybuffer.slice-0.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."base64-arraybuffer-0.1.2" - sources."base64id-0.1.0" - sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."blob-0.0.2" - sources."body-parser-1.20.3" - sources."bytes-3.1.2" - sources."call-bind-1.0.7" - sources."callsite-1.0.0" - sources."caseless-0.12.0" - sources."cheerio-0.17.0" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."component-inherit-0.0.3" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."define-data-property-1.1.4" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - (sources."dom-serializer-0.0.1" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.2.1" - sources."domutils-1.4.3" - sources."duplexer-0.1.2" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."encodeurl-2.0.0" - (sources."engine.io-1.3.1" // { - dependencies = [ - sources."debug-0.6.0" - ]; - }) - (sources."engine.io-client-1.3.1" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."engine.io-parser-1.0.6" - sources."entities-1.1.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."event-stream-3.3.5" - sources."express-4.21.0" - 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."finalhandler-1.3.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."from-0.1.7" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."getpass-0.1.7" - sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" - sources."gopd-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-binary-data-0.1.1" - sources."has-cors-1.0.3" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" - (sources."htmlparser2-3.7.3" // { - dependencies = [ - sources."domutils-1.5.1" - sources."entities-1.0.0" - ]; - }) - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."irc-replies-2.0.1" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - 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."json3-3.2.6" - sources."jsprim-1.4.2" - sources."linewise-0.0.3" - sources."lodash-2.4.2" - sources."map-stream-0.0.7" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.7.0" - sources."ms-2.0.0" - sources."mute-stream-0.0.8" - sources."nan-0.3.2" - sources."negotiator-0.6.3" - sources."oauth-sign-0.9.0" - sources."object-component-0.0.3" - sources."object-inspect-1.13.2" - sources."on-finished-2.4.1" - sources."options-0.0.6" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" - sources."parseuri-0.0.2" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.10" - sources."pause-stream-0.0.11" - sources."performance-now-2.1.0" - sources."proxy-addr-2.0.7" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."read-1.0.7" - sources."readable-stream-1.1.14" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.16.2" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.6" - sources."slate-irc-0.7.3" - (sources."slate-irc-parser-0.0.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-adapter-0.2.0" // { - dependencies = [ - sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."socket.io-parser-2.1.2" - ]; - }) - (sources."socket.io-client-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-parser-2.2.0" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."statuses-2.0.1" - sources."stream-combiner-0.2.2" - sources."string_decoder-0.10.31" - sources."through-2.3.8" - sources."tinycolor-0.0.1" - sources."to-array-0.1.3" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."utf8-2.0.0" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - (sources."ws-0.4.31" // { - dependencies = [ - sources."commander-0.6.1" - ]; - }) - sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The self-hosted Web IRC client"; - homepage = "https://github.com/erming/shout#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87cec31134e5..e2c7787e0381 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1489,6 +1489,7 @@ mapAliases { inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 + shout = nodePackages.shout; # Added unknown; moved 2024-10-19 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c09f725ab1..cefdfa0b311e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12175,8 +12175,6 @@ with pkgs; shotwell = callPackage ../applications/graphics/shotwell { }; - shout = nodePackages.shout; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { };