Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prayer: remove #266532

Merged
merged 1 commit into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2311.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@

- The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option.

- The `prayer` package as well as `services.prayer` have been removed because it's been unmaintained for several years and the author's website has vanished.

## Other Notable Changes {#sec-release-23.11-notable-changes}

- A new option `system.switch.enable` was added. By default, this is option is
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/misc/ids.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ in
#rtkit = 45; # dynamically allocated 2021-09-03
dovecot2 = 46;
dovenull2 = 47;
prayer = 49;
# prayer = 49; # dropped in 23.11
mpd = 50;
tu-maurice marked this conversation as resolved.
Show resolved Hide resolved
clamav = 51;
#fprot = 52; # unused
Expand Down Expand Up @@ -411,7 +411,7 @@ in
#rtkit = 45; # unused
dovecot2 = 46;
dovenull2 = 47;
prayer = 49;
# prayer = 49; # dropped in 23.11
mpd = 50;
tu-maurice marked this conversation as resolved.
Show resolved Hide resolved
clamav = 51;
#fprot = 52; # unused
Expand Down
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,6 @@
./services/networking/powerdns.nix
./services/networking/pppd.nix
./services/networking/pptpd.nix
./services/networking/prayer.nix
./services/networking/privoxy.nix
./services/networking/prosody.nix
./services/networking/quassel.nix
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ in
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.")
(mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.")

(mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead")
(mkRemovedOptionModule [ "services" "dhcpd4" ] ''
Expand Down
90 changes: 0 additions & 90 deletions nixos/modules/services/networking/prayer.nix

This file was deleted.

56 changes: 0 additions & 56 deletions pkgs/servers/prayer/default.nix

This file was deleted.

170 changes: 0 additions & 170 deletions pkgs/servers/prayer/install.patch

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ mapAliases ({
pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10
pinentry_qt5 = pinentry-qt; # Added 2020-02-11
poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26
prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09
privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31
probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03
processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28566,8 +28566,6 @@ with pkgs;

pps-tools = callPackage ../os-specific/linux/pps-tools { };

prayer = callPackage ../servers/prayer { };

procps = if stdenv.isLinux
then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
Expand Down