commit 40c06a143fc487b93987740454bf0af646f9c2d4 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2311.section.md

···

       363
       363
        
       

     

       364
       364
        
       - 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.

     

       365
       365
        
       

     

       366
       366
       +
       - 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.

     

       367
       367
       +
       

     

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

     

       367
       369
        
       

     

       368
       370
        
       - A new option `system.switch.enable` was added. By default, this is option is

+2 -2

nixos/modules/misc/ids.nix

···

       86
       86
        
             #rtkit = 45; # dynamically allocated 2021-09-03

     

       87
       87
        
             dovecot2 = 46;

     

       88
       88
        
             dovenull2 = 47;

     

       89
       89
       -
             prayer = 49;

     

       89
       89
       +
             # prayer = 49; # dropped in 23.11

     

       90
       90
        
             mpd = 50;

     

       91
       91
        
             clamav = 51;

     

       92
       92
        
             #fprot = 52; # unused

     
···

       411
       411
        
             #rtkit = 45; # unused

     

       412
       412
        
             dovecot2 = 46;

     

       413
       413
        
             dovenull2 = 47;

     

       414
       414
       -
             prayer = 49;

     

       414
       414
       +
             # prayer = 49; # dropped in 23.11

     

       415
       415
        
             mpd = 50;

     

       416
       416
        
             clamav = 51;

     

       417
       417
        
             #fprot = 52; # unused

-1

nixos/modules/module-list.nix

···

       1041
       1041
        
         ./services/networking/powerdns.nix

     

       1042
       1042
        
         ./services/networking/pppd.nix

     

       1043
       1043
        
         ./services/networking/pptpd.nix

     

       1044
       1044
       -
         ./services/networking/prayer.nix

     

       1045
       1044
        
         ./services/networking/privoxy.nix

     

       1046
       1045
        
         ./services/networking/prosody.nix

     

       1047
       1046
        
         ./services/networking/quassel.nix

nixos/modules/rename.nix

···

       111
       111
        
           (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")

     

       112
       112
        
           (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")

     

       113
       113
        
           (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.")

     

       114
       114
       +
           (mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.")

     

       114
       115
        
       

     

       115
       116
        
           (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead")

     

       116
       117
        
           (mkRemovedOptionModule [ "services" "dhcpd4" ] ''

-90

nixos/modules/services/networking/prayer.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
       

     

       7
       7
       -
         inherit (pkgs) prayer;

     

       8
       8
       -
       

     

       9
       9
       -
         cfg = config.services.prayer;

     

       10
       10
       -
       

     

       11
       11
       -
         stateDir = "/var/lib/prayer";

     

       12
       12
       -
       

     

       13
       13
       -
         prayerUser = "prayer";

     

       14
       14
       -
         prayerGroup = "prayer";

     

       15
       15
       -
       

     

       16
       16
       -
         prayerExtraCfg = pkgs.writeText "extraprayer.cf" ''

     

       17
       17
       -
           prefix = "${prayer}"

     

       18
       18
       -
           var_prefix = "${stateDir}"

     

       19
       19
       -
           prayer_user = "${prayerUser}"

     

       20
       20
       -
           prayer_group = "${prayerGroup}"

     

       21
       21
       -
           sendmail_path = "/run/wrappers/bin/sendmail"

     

       22
       22
       -
       

     

       23
       23
       -
           use_http_port ${cfg.port}

     

       24
       24
       -
       

     

       25
       25
       -
           ${cfg.extraConfig}

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } ''

     

       29
       29
       -
           # We have to remove the http_port 80, or it will start a server there

     

       30
       30
       -
           cat ${prayer}/etc/prayer.cf | grep -v http_port > $out

     

       31
       31
       -
           cat ${prayerExtraCfg} >> $out

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
       in

     

       35
       35
       -
       

     

       36
       36
       -
       {

     

       37
       37
       -
       

     

       38
       38
       -
         ###### interface

     

       39
       39
       -
       

     

       40
       40
       -
         options = {

     

       41
       41
       -
       

     

       42
       42
       -
           services.prayer = {

     

       43
       43
       -
       

     

       44
       44
       -
             enable = mkEnableOption (lib.mdDoc "the prayer webmail http server");

     

       45
       45
       -
       

     

       46
       46
       -
             port = mkOption {

     

       47
       47
       -
               default = 2080;

     

       48
       48
       -
               type = types.port;

     

       49
       49
       -
               description = lib.mdDoc ''

     

       50
       50
       -
                 Port the prayer http server is listening to.

     

       51
       51
       -
               '';

     

       52
       52
       -
             };

     

       53
       53
       -
       

     

       54
       54
       -
             extraConfig = mkOption {

     

       55
       55
       -
               type = types.lines;

     

       56
       56
       -
               default = "" ;

     

       57
       57
       -
               description = lib.mdDoc ''

     

       58
       58
       -
                 Extra configuration. Contents will be added verbatim to the configuration file.

     

       59
       59
       -
               '';

     

       60
       60
       -
             };

     

       61
       61
       -
           };

     

       62
       62
       -
       

     

       63
       63
       -
         };

     

       64
       64
       -
       

     

       65
       65
       -
       

     

       66
       66
       -
         ###### implementation

     

       67
       67
       -
       

     

       68
       68
       -
         config = mkIf config.services.prayer.enable {

     

       69
       69
       -
           environment.systemPackages = [ prayer ];

     

       70
       70
       -
       

     

       71
       71
       -
           users.users.${prayerUser} =

     

       72
       72
       -
             { uid = config.ids.uids.prayer;

     

       73
       73
       -
               description = "Prayer daemon user";

     

       74
       74
       -
               home = stateDir;

     

       75
       75
       -
             };

     

       76
       76
       -
       

     

       77
       77
       -
           users.groups.${prayerGroup} =

     

       78
       78
       -
             { gid = config.ids.gids.prayer; };

     

       79
       79
       -
       

     

       80
       80
       -
           systemd.services.prayer = {

     

       81
       81
       -
             wantedBy = [ "multi-user.target" ];

     

       82
       82
       -
             serviceConfig.Type = "forking";

     

       83
       83
       -
             preStart = ''

     

       84
       84
       -
               mkdir -m 0755 -p ${stateDir}

     

       85
       85
       -
               chown ${prayerUser}:${prayerGroup} ${stateDir}

     

       86
       86
       -
             '';

     

       87
       87
       -
             script = "${prayer}/sbin/prayer --config-file=${prayerCfg}";

     

       88
       88
       -
           };

     

       89
       89
       -
         };

     

       90
       90
       -
       }

-56

pkgs/servers/prayer/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         ssl = lib.optionals uwimap.withSSL

     

       5
       5
       -
           "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";

     

       6
       6
       -
       in

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       8
       8
       -
         pname = "prayer";

     

       9
       9
       -
         version = "1.3.5";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz";

     

       13
       13
       -
           sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         patches = [

     

       17
       17
       -
           ./install.patch

     

       18
       18
       -
       

     

       19
       19
       -
           # fix build errors which result from openssl changes

     

       20
       20
       -
           (fetchpatch {

     

       21
       21
       -
             url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch";

     

       22
       22
       -
             sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd";

     

       23
       23
       -
           })

     

       24
       24
       -
           (fetchpatch {

     

       25
       25
       -
             url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch";

     

       26
       26
       -
             sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1";

     

       27
       27
       -
           })

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         postPatch = ''

     

       31
       31
       -
           sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \

     

       32
       32
       -
             ${ssl} \

     

       33
       33
       -
             -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \

     

       34
       34
       -
             -e 's,^PREFIX .*,PREFIX='$out, \

     

       35
       35
       -
             -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \

     

       36
       36
       -
             Config

     

       37
       37
       -
           sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \

     

       38
       38
       -
             templates/src/*.pl

     

       39
       39
       -
           sed -i -e '/<stropts.h>/d' lib/os_linux.h

     

       40
       40
       -
         '' + /* html-tidy updates */ ''

     

       41
       41
       -
           substituteInPlace ./session/html_secure_tidy.c \

     

       42
       42
       -
             --replace buffio.h tidybuffio.h

     

       43
       43
       -
         '';

     

       44
       44
       -
       

     

       45
       45
       -
         buildInputs = [ openssl db zlib uwimap html-tidy pam ];

     

       46
       46
       -
         nativeBuildInputs = [ perl ];

     

       47
       47
       -
       

     

       48
       48
       -
         NIX_LDFLAGS = "-lpam";

     

       49
       49
       -
       

     

       50
       50
       -
         meta = {

     

       51
       51
       -
           homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/";

     

       52
       52
       -
           description = "Yet another Webmail interface for IMAP servers on Unix systems written in C";

     

       53
       53
       -
           license = lib.licenses.gpl2Plus;

     

       54
       54
       -
           platforms = lib.platforms.linux;

     

       55
       55
       -
         };

     

       56
       56
       -
       }

-170

pkgs/servers/prayer/install.patch

···

       1
       1
       -
       diff --git a/accountd/Makefile b/accountd/Makefile

     

       2
       2
       -
       index c3e8107..7946776 100644

     

       3
       3
       -
       --- a/accountd/Makefile

     

       4
       4
       -
       +++ b/accountd/Makefile

     

       5
       5
       -
       @@ -75,6 +75,6 @@ clean:

     

       6
       6
       -
        	-rm -f prayer-accountd test core *.o *~ \#*\# 

     

       7
       7
       -
        

     

       8
       8
       -
        install:

     

       9
       9
       -
       -	$(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \

     

       10
       10
       -
       +	$(INSTALL) -m 755 \

     

       11
       11
       -
        	prayer-accountd ${BROOT}${BIN_DIR}

     

       12
       12
       -
        

     

       13
       13
       -
       diff --git a/files/Makefile b/files/Makefile

     

       14
       14
       -
       index 743d0ed..7eff064 100644

     

       15
       15
       -
       --- a/files/Makefile

     

       16
       16
       -
       +++ b/files/Makefile

     

       17
       17
       -
       @@ -52,20 +52,20 @@ distclean:

     

       18
       18
       -
        

     

       19
       19
       -
        install-cert:

     

       20
       20
       -
        	if [ -f certs/prayer.pem ]; then \

     

       21
       21
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \

     

       22
       22
       -
       +	$(INSTALL) \

     

       23
       23
       -
        	-m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \

     

       24
       24
       -
        	fi

     

       25
       25
       -
        

     

       26
       26
       -
        install-config: etc/prayer.cf

     

       27
       27
       -
       -	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \

     

       28
       28
       -
       +	$(INSTALL) -D -m $(PUBLIC_FILE) \

     

       29
       29
       -
        	etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}

     

       30
       30
       -
        

     

       31
       31
       -
        install-aconfig:

     

       32
       32
       -
       -	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \

     

       33
       33
       -
       +	$(INSTALL) -D -m $(PUBLIC_FILE) \

     

       34
       34
       -
        	etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}

     

       35
       35
       -
        

     

       36
       36
       -
        install-motd:

     

       37
       37
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \

     

       38
       38
       -
       +	$(INSTALL) -m $(PUBLIC_FILE) \

     

       39
       39
       -
        	etc/motd.html ${BROOT}${PREFIX}/etc

     

       40
       40
       -
        

     

       41
       41
       -
        install:

     

       42
       42
       -
       @@ -83,6 +83,6 @@ install:

     

       43
       43
       -
        	if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi

     

       44
       44
       -
        

     

       45
       45
       -
        redhat-install-init.d:

     

       46
       46
       -
       -	install -D -o root -g root -m 755 \

     

       47
       47
       -
       +	install -D -m 755 \

     

       48
       48
       -
        		./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer

     

       49
       49
       -
        	#chkconfig prayer --level 2345 on

     

       50
       50
       -
       diff --git a/files/install.sh b/files/install.sh

     

       51
       51
       -
       index 8d1d1f4..0804a08 100755

     

       52
       52
       -
       --- a/files/install.sh

     

       53
       53
       -
       +++ b/files/install.sh

     

       54
       54
       -
       @@ -2,8 +2,6 @@

     

       55
       55
       -
        #

     

       56
       56
       -
        # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $

     

       57
       57
       -
        

     

       58
       58
       -
       -PATH=/bin:/sbin/:/usr/bin:/usr/sbin

     

       59
       59
       -
       -

     

       60
       60
       -
        error=0

     

       61
       61
       -
        

     

       62
       62
       -
        if [ "x$PREFIX" = "x" ]; then

     

       63
       63
       -
       @@ -55,24 +53,20 @@ if [ $error != 0 ]; then

     

       64
       64
       -
            exit 1

     

       65
       65
       -
        fi

     

       66
       66
       -
        

     

       67
       67
       -
       -if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then

     

       68
       68
       -
       -    ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}

     

       69
       69
       -
       -fi

     

       70
       70
       -
       -

     

       71
       71
       -
        if [ ! -d ${PREFIX} ]; then

     

       72
       72
       -
       -    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}

     

       73
       73
       -
       +    ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}

     

       74
       74
       -
        fi

     

       75
       75
       -
        

     

       76
       76
       -
        if [ ! -d ${PREFIX}/etc ]; then

     

       77
       77
       -
       -    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc

     

       78
       78
       -
       +    ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc

     

       79
       79
       -
        fi

     

       80
       80
       -
        

     

       81
       81
       -
        if [ ! -d ${PREFIX}/certs ]; then

     

       82
       82
       -
       -    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs

     

       83
       83
       -
       +    ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs

     

       84
       84
       -
        fi

     

       85
       85
       -
        

     

       86
       86
       -
        if [ ! -d ${BIN_DIR} ]; then

     

       87
       87
       -
       -    ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}

     

       88
       88
       -
       +    ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR}

     

       89
       89
       -
        fi

     

       90
       90
       -
        

     

       91
       91
       -
        for i in icons static

     

       92
       92
       -
       @@ -83,5 +77,4 @@ do

     

       93
       93
       -
            fi

     

       94
       94
       -
            echo Copying ${i}

     

       95
       95
       -
            (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)

     

       96
       96
       -
       -    (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})

     

       97
       97
       -
        done

     

       98
       98
       -
       diff --git a/servers/Makefile b/servers/Makefile

     

       99
       99
       -
       index 021aed5..5ccbd08 100644

     

       100
       100
       -
       --- a/servers/Makefile

     

       101
       101
       -
       +++ b/servers/Makefile

     

       102
       102
       -
       @@ -107,13 +107,13 @@ clean:

     

       103
       103
       -
        	-rm -f $(BIN) core *.o *.flc *~ \#*\#

     

       104
       104
       -
        

     

       105
       105
       -
        install: all

     

       106
       106
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \

     

       107
       107
       -
       +	$(INSTALL) -m $(PUBLIC_DIR) -d \

     

       108
       108
       -
        	  $(BROOT)$(BIN_DIR)

     

       109
       109
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       110
       110
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       111
       111
       -
        	  prayer           $(BROOT)$(BIN_DIR)

     

       112
       112
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       113
       113
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       114
       114
       -
        	  prayer-chroot           $(BROOT)$(BIN_DIR)

     

       115
       115
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       116
       116
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       117
       117
       -
        	  prayer-session   $(BROOT)$(BIN_DIR)

     

       118
       118
       -
        

     

       119
       119
       -
        prayer: $(PRAYER_OBJS) prayer_main.o

     

       120
       120
       -
       diff --git a/templates/cam/Makefile b/templates/cam/Makefile

     

       121
       121
       -
       index 9f4122a..396b628 100644

     

       122
       122
       -
       --- a/templates/cam/Makefile

     

       123
       123
       -
       +++ b/templates/cam/Makefile

     

       124
       124
       -
       @@ -124,7 +124,7 @@ _template_index.c:

     

       125
       125
       -
        	$(COMPILE) $(TYPE) $@ $*

     

       126
       126
       -
        

     

       127
       127
       -
        install:

     

       128
       128
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \

     

       129
       129
       -
       +	$(INSTALL) -m $(PUBLIC_DIR) -d \

     

       130
       130
       -
        	  $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       131
       131
       -
        	cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       132
       132
       -
        	cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       133
       133
       -
       diff --git a/templates/old/Makefile b/templates/old/Makefile

     

       134
       134
       -
       index 31016cf..288a64c 100644

     

       135
       135
       -
       --- a/templates/old/Makefile

     

       136
       136
       -
       +++ b/templates/old/Makefile

     

       137
       137
       -
       @@ -123,7 +123,7 @@ _template_index.c:

     

       138
       138
       -
        	$(COMPILE) $(TYPE) $@ $*

     

       139
       139
       -
        

     

       140
       140
       -
        install:

     

       141
       141
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \

     

       142
       142
       -
       +	$(INSTALL) -m $(PUBLIC_DIR) -d \

     

       143
       143
       -
        	  $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       144
       144
       -
        	cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       145
       145
       -
        	cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)

     

       146
       146
       -
       diff --git a/utils/Makefile b/utils/Makefile

     

       147
       147
       -
       index 9c79916..ef82481 100644

     

       148
       148
       -
       --- a/utils/Makefile

     

       149
       149
       -
       +++ b/utils/Makefile

     

       150
       150
       -
       @@ -72,15 +72,15 @@ clean:

     

       151
       151
       -
        	-rm -f $(BIN) core *.o *.flc *~ \#*\#

     

       152
       152
       -
        

     

       153
       153
       -
        install: all

     

       154
       154
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \

     

       155
       155
       -
       +	$(INSTALL) -m $(PUBLIC_DIR) -d \

     

       156
       156
       -
        	  $(BROOT)$(BIN_DIR)

     

       157
       157
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       158
       158
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       159
       159
       -
        	  prayer-ssl-prune $(BROOT)$(BIN_DIR)

     

       160
       160
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       161
       161
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       162
       162
       -
        	  prayer-sem-prune $(BROOT)$(BIN_DIR)

     

       163
       163
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       164
       164
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       165
       165
       -
        	  prayer-db-prune $(BROOT)$(BIN_DIR)

     

       166
       166
       -
       -	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \

     

       167
       167
       -
       +	$(INSTALL) -m $(PUBLIC_EXEC) \

     

       168
       168
       -
        	  prayer-cyclog    $(BROOT)$(BIN_DIR)

     

       169
       169
       -
        

     

       170
       170
       -
        prayer-ssl-prune: $(PRUNE_OBJS)

pkgs/top-level/aliases.nix

···

       714
       714
        
         pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10

     

       715
       715
        
         pinentry_qt5 = pinentry-qt; # Added 2020-02-11

     

       716
       716
        
         poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26

     

       717
       717
       +
         prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09

     

       717
       718
        
         privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31

     

       718
       719
        
         probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03

     

       719
       720
        
         processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10

-2

pkgs/top-level/all-packages.nix

···

       28589
       28589
        
       

     

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

     

       28591
       28591
        
       

     

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

     

       28593
       28593
       -
       

     

       28594
       28592
        
         procps = if stdenv.isLinux

     

       28595
       28593
        
           then callPackage ../os-specific/linux/procps-ng { }

     

       28596
       28594
        
           else unixtools.procps;