commit e2bb7997c49d47dc1184bfb85741fcf0e6e97d9d · pyrox.dev/nixpkgs

+1 -1

doc/languages-frameworks/rust.section.md

···

       20
       20
        
       Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:

     

       21
       21
        
       

     

       22
       22
        
       ```nix

     

       23
       23
       -
       { lib, rustPlatform }:

     

       23
       23
       +
       { lib, fetchFromGitHub, rustPlatform }:

     

       24
       24
        
       

     

       25
       25
        
       rustPlatform.buildRustPackage rec {

     

       26
       26
        
         pname = "ripgrep";

+10

maintainers/maintainer-list.nix

···

       4565
       4565
        
           githubId = 2789926;

     

       4566
       4566
        
           name = "Imran Hossain";

     

       4567
       4567
        
         };

     

       4568
       4568
       +
         iagoq = {

     

       4569
       4569
       +
           email = "18238046+iagocq@users.noreply.github.com";

     

       4570
       4570
       +
           github = "iagocq";

     

       4571
       4571
       +
           githubId = 18238046;

     

       4572
       4572
       +
           name = "Iago Manoel Brito";

     

       4573
       4573
       +
           keys = [{

     

       4574
       4574
       +
             longkeyid = "rsa4096/0x35D39F9A9A1BC8DA";

     

       4575
       4575
       +
             fingerprint = "DF90 9D58 BEE4 E73A 1B8C  5AF3 35D3 9F9A 9A1B C8DA";

     

       4576
       4576
       +
           }];

     

       4577
       4577
       +
         };

     

       4568
       4578
        
         iammrinal0 = {

     

       4569
       4579
        
           email = "nixpkgs@mrinalpurohit.in";

     

       4570
       4580
        
           github = "iammrinal0";

+48

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       140
       140
        
             </listitem>

     

       141
       141
        
             <listitem>

     

       142
       142
        
               <para>

     

       143
       143
       +
                 <link xlink:href="https://github.com/evilsocket/opensnitch">opensnitch</link>,

     

       144
       144
       +
                 an application firewall. Available as

     

       145
       145
       +
                 <link linkend="opt-services.opensnitch.enable">services.opensnitch</link>.

     

       146
       146
       +
               </para>

     

       147
       147
       +
             </listitem>

     

       148
       148
       +
             <listitem>

     

       149
       149
       +
               <para>

     

       143
       150
        
                 <link xlink:href="https://www.snapraid.it/">snapraid</link>, a

     

       144
       151
        
                 backup program for disk arrays. Available as

     

       145
       152
        
                 <link linkend="opt-snapraid.enable">snapraid</link>.

     
···

       283
       290
        
                 <link linkend="opt-services.touchegg.enable">services.touchegg</link>.

     

       284
       291
        
               </para>

     

       285
       292
        
             </listitem>

     

       293
       293
       +
             <listitem>

     

       294
       294
       +
               <para>

     

       295
       295
       +
                 <link xlink:href="https://github.com/pantheon-tweaks/pantheon-tweaks">pantheon-tweaks</link>,

     

       296
       296
       +
                 an unofficial system settings panel for Pantheon. Available as

     

       297
       297
       +
                 <link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>.

     

       298
       298
       +
               </para>

     

       299
       299
       +
             </listitem>

     

       286
       300
        
           </itemizedlist>

     

       287
       301
        
         </section>

     

       288
       302
        
         <section xml:id="sec-release-21.11-incompatibilities">

     

       289
       303
        
           <title>Backward Incompatibilities</title>

     

       290
       304
        
           <itemizedlist>

     

       305
       305
       +
             <listitem>

     

       306
       306
       +
               <para>

     

       307
       307
       +
                 The <literal>security.wrappers</literal> option now requires

     

       308
       308
       +
                 to always specify an owner, group and whether the

     

       309
       309
       +
                 setuid/setgid bit should be set. This is motivated by the fact

     

       310
       310
       +
                 that before NixOS 21.11, specifying either setuid or setgid

     

       311
       311
       +
                 but not owner/group resulted in wrappers owned by

     

       312
       312
       +
                 nobody/nogroup, which is unsafe.

     

       313
       313
       +
               </para>

     

       314
       314
       +
             </listitem>

     

       291
       315
        
             <listitem>

     

       292
       316
        
               <para>

     

       293
       317
        
                 The <literal>paperless</literal> module and package have been

     
···

       1051
       1075
        
             </listitem>

     

       1052
       1076
        
             <listitem>

     

       1053
       1077
        
               <para>

     

       1078
       1078
       +
                 The

     

       1079
       1079
       +
                 <link xlink:href="options.html#opt-services.xserver.extraLayouts"><literal>services.xserver.extraLayouts</literal></link>

     

       1080
       1080
       +
                 no longer cause additional rebuilds when a layout is added or

     

       1081
       1081
       +
                 modified.

     

       1082
       1082
       +
               </para>

     

       1083
       1083
       +
             </listitem>

     

       1084
       1084
       +
             <listitem>

     

       1085
       1085
       +
               <para>

     

       1054
       1086
        
                 Sway: The terminal emulator <literal>rxvt-unicode</literal> is

     

       1055
       1087
        
                 no longer installed by default via

     

       1056
       1088
        
                 <literal>programs.sway.extraPackages</literal>. The current

     
···

       1093
       1125
        
                 and <literal>nginx</literal> are supported. The definitions of

     

       1094
       1126
        
                 wordpress sites should now be set in

     

       1095
       1127
        
                 <link xlink:href="options.html#opt-services.wordpress.sites"><literal>services.wordpress.sites</literal></link>.

     

       1128
       1128
       +
               </para>

     

       1129
       1129
       +
               <para>

     

       1130
       1130
       +
                 Sites definitions that use the old interface are automatically

     

       1131
       1131
       +
                 migrated in the new option. This backward compatibility will

     

       1132
       1132
       +
                 be removed in 22.05.

     

       1133
       1133
       +
               </para>

     

       1134
       1134
       +
             </listitem>

     

       1135
       1135
       +
             <listitem>

     

       1136
       1136
       +
               <para>

     

       1137
       1137
       +
                 The dokuwiki module provides a new interface which allows to

     

       1138
       1138
       +
                 use different webservers with the new option

     

       1139
       1139
       +
                 <link xlink:href="options.html#opt-services.dokuwiki.webserver"><literal>services.dokuwiki.webserver</literal></link>.

     

       1140
       1140
       +
                 Currently <literal>caddy</literal> and

     

       1141
       1141
       +
                 <literal>nginx</literal> are supported. The definitions of

     

       1142
       1142
       +
                 dokuwiki sites should now be set in

     

       1143
       1143
       +
                 <link xlink:href="options.html#opt-services.dokuwiki.sites"><literal>services.dokuwiki.sites</literal></link>.

     

       1096
       1144
        
               </para>

     

       1097
       1145
        
               <para>

     

       1098
       1146
        
                 Sites definitions that use the old interface are automatically

+13

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

···

       45
       45
        
       

     

       46
       46
        
       - [vikunja](https://vikunja.io), a to-do list app. Available as [services.vikunja](#opt-services.vikunja.enable).

     

       47
       47
        
       

     

       48
       48
       +
       - [opensnitch](https://github.com/evilsocket/opensnitch), an application firewall. Available as [services.opensnitch](#opt-services.opensnitch.enable).

     

       49
       49
       +
       

     

       48
       50
        
       - [snapraid](https://www.snapraid.it/), a backup program for disk arrays.

     

       49
       51
        
         Available as [snapraid](#opt-snapraid.enable).

     

       50
       52
        
       

     
···

       90
       92
        
       

     

       91
       93
        
       - [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable).

     

       92
       94
        
       

     

       95
       95
       +
       - [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).

     

       96
       96
       +
       

     

       93
       97
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       98
       98
       +
       

     

       99
       99
       +
       - The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.

     

       100
       100
       +
         This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe.

     

       94
       101
        
       

     

       95
       102
        
       - The `paperless` module and package have been removed. All users should migrate to the

     

       96
       103
        
         successor `paperless-ng` instead. The Paperless project [has been

     
···

       328
       335
        
       

     

       329
       336
        
         However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs.

     

       330
       337
        
       

     

       338
       338
       +
       - The [`services.xserver.extraLayouts`](options.html#opt-services.xserver.extraLayouts) no longer cause additional rebuilds when a layout is added or modified.

     

       339
       339
       +
       

     

       331
       340
        
       - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly.

     

       332
       341
        
       

     

       333
       342
        
       - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information.

     
···

       337
       346
        
       - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package.

     

       338
       347
        
       

     

       339
       348
        
       - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver).  Currently `httpd`, `caddy` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).

     

       349
       349
       +
       

     

       350
       350
       +
         Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.

     

       351
       351
       +
       

     

       352
       352
       +
       - The dokuwiki module provides a new interface which allows to use different webservers with the new option [`services.dokuwiki.webserver`](options.html#opt-services.dokuwiki.webserver).  Currently `caddy` and `nginx` are supported. The definitions of dokuwiki sites should now be set in [`services.dokuwiki.sites`](options.html#opt-services.dokuwiki.sites).

     

       340
       353
        
       

     

       341
       354
        
         Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.

     

       342
       355

+5 -1

nixos/modules/config/console.nix

···

       116
       116
        
           { console.keyMap = with config.services.xserver;

     

       117
       117
        
               mkIf cfg.useXkbConfig

     

       118
       118
        
                 (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''

     

       119
       119
       -
                   '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \

     

       119
       119
       +
                   '${pkgs.ckbcomp}/bin/ckbcomp' \

     

       120
       120
       +
                     ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       121
       121
       +
                       "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       122
       122
       +
                     } \

     

       123
       123
       +
                     -model '${xkbModel}' -layout '${layout}' \

     

       120
       124
        
                     -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"

     

       121
       125
        
                 '');

     

       122
       126
        
           }

+2

nixos/modules/module-list.nix

···

       171
       171
        
         ./programs/npm.nix

     

       172
       172
        
         ./programs/noisetorch.nix

     

       173
       173
        
         ./programs/oblogout.nix

     

       174
       174
       +
         ./programs/pantheon-tweaks.nix

     

       174
       175
        
         ./programs/partition-manager.nix

     

       175
       176
        
         ./programs/plotinus.nix

     

       176
       177
        
         ./programs/proxychains.nix

     
···

       914
       915
        
         ./services/security/nginx-sso.nix

     

       915
       916
        
         ./services/security/oauth2_proxy.nix

     

       916
       917
        
         ./services/security/oauth2_proxy_nginx.nix

     

       918
       918
       +
         ./services/security/opensnitch.nix

     

       917
       919
        
         ./services/security/privacyidea.nix

     

       918
       920
        
         ./services/security/physlock.nix

     

       919
       921
        
         ./services/security/shibboleth-sp.nix

+3 -1

nixos/modules/programs/bandwhich.nix

···

       22
       22
        
         config = mkIf cfg.enable {

     

       23
       23
        
           environment.systemPackages = with pkgs; [ bandwhich ];

     

       24
       24
        
           security.wrappers.bandwhich = {

     

       25
       25
       -
             source = "${pkgs.bandwhich}/bin/bandwhich";

     

       25
       25
       +
             owner = "root";

     

       26
       26
       +
             group = "root";

     

       26
       27
        
             capabilities = "cap_net_raw,cap_net_admin+ep";

     

       28
       28
       +
             source = "${pkgs.bandwhich}/bin/bandwhich";

     

       27
       29
        
           };

     

       28
       30
        
         };

     

       29
       31
        
       }

+4

nixos/modules/programs/captive-browser.nix

···

       105
       105
        
             );

     

       106
       106
        
       

     

       107
       107
        
           security.wrappers.udhcpc = {

     

       108
       108
       +
             owner = "root";

     

       109
       109
       +
             group = "root";

     

       108
       110
        
             capabilities = "cap_net_raw+p";

     

       109
       111
        
             source = "${pkgs.busybox}/bin/udhcpc";

     

       110
       112
        
           };

     

       111
       113
        
       

     

       112
       114
        
           security.wrappers.captive-browser = {

     

       115
       115
       +
             owner = "root";

     

       116
       116
       +
             group = "root";

     

       113
       117
        
             capabilities = "cap_net_raw+p";

     

       114
       118
        
             source = pkgs.writeShellScript "captive-browser" ''

     

       115
       119
        
               export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"

+2

nixos/modules/programs/ccache.nix

···

       28
       28
        
       

     

       29
       29
        
             # "nix-ccache --show-stats" and "nix-ccache --clear"

     

       30
       30
        
             security.wrappers.nix-ccache = {

     

       31
       31
       +
               owner = "nobody";

     

       31
       32
        
               group = "nixbld";

     

       33
       33
       +
               setuid = false;

     

       32
       34
        
               setgid = true;

     

       33
       35
        
               source = pkgs.writeScript "nix-ccache.pl" ''

     

       34
       36
        
                 #!${pkgs.perl}/bin/perl

+6 -1

nixos/modules/programs/firejail.nix

···

       81
       81
        
         };

     

       82
       82
        
       

     

       83
       83
        
         config = mkIf cfg.enable {

     

       84
       84
       -
           security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail";

     

       84
       84
       +
           security.wrappers.firejail =

     

       85
       85
       +
             { setuid = true;

     

       86
       86
       +
               owner = "root";

     

       87
       87
       +
               group = "root";

     

       88
       88
       +
               source = "${lib.getBin pkgs.firejail}/bin/firejail";

     

       89
       89
       +
             };

     

       85
       90
        
       

     

       86
       91
        
           environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ];

     

       87
       92
        
         };

+2

nixos/modules/programs/gamemode.nix

···

       56
       56
        
             polkit.enable = true;

     

       57
       57
        
             wrappers = mkIf cfg.enableRenice {

     

       58
       58
        
               gamemoded = {

     

       59
       59
       +
                 owner = "root";

     

       60
       60
       +
                 group = "root";

     

       59
       61
        
                 source = "${pkgs.gamemode}/bin/gamemoded";

     

       60
       62
        
                 capabilities = "cap_sys_nice+ep";

     

       61
       63
        
               };

+3 -1

nixos/modules/programs/iftop.nix

···

       11
       11
        
         config = mkIf cfg.enable {

     

       12
       12
        
           environment.systemPackages = [ pkgs.iftop ];

     

       13
       13
        
           security.wrappers.iftop = {

     

       14
       14
       -
             source = "${pkgs.iftop}/bin/iftop";

     

       14
       14
       +
             owner = "root";

     

       15
       15
       +
             group = "root";

     

       15
       16
        
             capabilities = "cap_net_raw+p";

     

       17
       17
       +
             source = "${pkgs.iftop}/bin/iftop";

     

       16
       18
        
           };

     

       17
       19
        
         };

     

       18
       20
        
       }

+3 -1

nixos/modules/programs/iotop.nix

···

       10
       10
        
         };

     

       11
       11
        
         config = mkIf cfg.enable {

     

       12
       12
        
           security.wrappers.iotop = {

     

       13
       13
       -
             source = "${pkgs.iotop}/bin/iotop";

     

       13
       13
       +
             owner = "root";

     

       14
       14
       +
             group = "root";

     

       14
       15
        
             capabilities = "cap_net_admin+p";

     

       16
       16
       +
             source = "${pkgs.iotop}/bin/iotop";

     

       15
       17
        
           };

     

       16
       18
        
         };

     

       17
       19
        
       }

+6 -1

nixos/modules/programs/kbdlight.nix

···

       11
       11
        
       

     

       12
       12
        
         config = mkIf cfg.enable {

     

       13
       13
        
           environment.systemPackages = [ pkgs.kbdlight ];

     

       14
       14
       -
           security.wrappers.kbdlight.source = "${pkgs.kbdlight.out}/bin/kbdlight";

     

       14
       14
       +
           security.wrappers.kbdlight =

     

       15
       15
       +
             { setuid = true;

     

       16
       16
       +
               owner = "root";

     

       17
       17
       +
               group = "root";

     

       18
       18
       +
               source = "${pkgs.kbdlight.out}/bin/kbdlight";

     

       19
       19
       +
             };

     

       15
       20
        
         };

     

       16
       21
        
       }

+3 -1

nixos/modules/programs/liboping.nix

···

       13
       13
        
           security.wrappers = mkMerge (map (

     

       14
       14
        
             exec: {

     

       15
       15
        
               "${exec}" = {

     

       16
       16
       -
                 source = "${pkgs.liboping}/bin/${exec}";

     

       16
       16
       +
                 owner = "root";

     

       17
       17
       +
                 group = "root";

     

       17
       18
        
                 capabilities = "cap_net_raw+p";

     

       19
       19
       +
                 source = "${pkgs.liboping}/bin/${exec}";

     

       18
       20
        
               };

     

       19
       21
        
             }

     

       20
       22
        
           ) [ "oping" "noping" ]);

+2

nixos/modules/programs/msmtp.nix

···

       78
       78
        
             source = "${pkgs.msmtp}/bin/sendmail";

     

       79
       79
        
             setuid = false;

     

       80
       80
        
             setgid = false;

     

       81
       81
       +
             owner = "root";

     

       82
       82
       +
             group = "root";

     

       81
       83
        
           };

     

       82
       84
        
       

     

       83
       85
        
           environment.etc."msmtprc".text = let

+3 -1

nixos/modules/programs/mtr.nix

···

       31
       31
        
           environment.systemPackages = with pkgs; [ cfg.package ];

     

       32
       32
        
       

     

       33
       33
        
           security.wrappers.mtr-packet = {

     

       34
       34
       -
             source = "${cfg.package}/bin/mtr-packet";

     

       34
       34
       +
             owner = "root";

     

       35
       35
       +
             group = "root";

     

       35
       36
        
             capabilities = "cap_net_raw+p";

     

       37
       37
       +
             source = "${cfg.package}/bin/mtr-packet";

     

       36
       38
        
           };

     

       37
       39
        
         };

     

       38
       40
        
       }

+3 -1

nixos/modules/programs/noisetorch.nix

···

       18
       18
        
       

     

       19
       19
        
         config = mkIf cfg.enable {

     

       20
       20
        
           security.wrappers.noisetorch = {

     

       21
       21
       -
             source = "${cfg.package}/bin/noisetorch";

     

       21
       21
       +
             owner = "root";

     

       22
       22
       +
             group = "root";

     

       22
       23
        
             capabilities = "cap_sys_resource=+ep";

     

       24
       24
       +
             source = "${cfg.package}/bin/noisetorch";

     

       23
       25
        
           };

     

       24
       26
        
         };

     

       25
       27
        
       }

+19

nixos/modules/programs/pantheon-tweaks.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         meta = {

     

       7
       7
       +
           maintainers = teams.pantheon.members;

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         ###### interface

     

       11
       11
       +
         options = {

     

       12
       12
       +
           programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         ###### implementation

     

       16
       16
       +
         config = mkIf config.programs.pantheon-tweaks.enable {

     

       17
       17
       +
           services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ];

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+14 -7

nixos/modules/programs/shadow.nix

···

       43
       43
        
       

     

       44
       44
        
           '';

     

       45
       45
        
       

     

       46
       46
       +
         mkSetuidRoot = source:

     

       47
       47
       +
           { setuid = true;

     

       48
       48
       +
             owner = "root";

     

       49
       49
       +
             group = "root";

     

       50
       50
       +
             inherit source;

     

       51
       51
       +
           };

     

       52
       52
       +
       

     

       46
       53
        
       in

     

       47
       54
        
       

     

       48
       55
        
       {

     
···

       109
       116
        
             };

     

       110
       117
        
       

     

       111
       118
        
           security.wrappers = {

     

       112
       112
       -
             su.source        = "${pkgs.shadow.su}/bin/su";

     

       113
       113
       -
             sg.source        = "${pkgs.shadow.out}/bin/sg";

     

       114
       114
       -
             newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";

     

       115
       115
       -
             newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";

     

       116
       116
       -
             newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";

     

       119
       119
       +
             su        = mkSetuidRoot "${pkgs.shadow.su}/bin/su";

     

       120
       120
       +
             sg        = mkSetuidRoot "${pkgs.shadow.out}/bin/sg";

     

       121
       121
       +
             newgrp    = mkSetuidRoot "${pkgs.shadow.out}/bin/newgrp";

     

       122
       122
       +
             newuidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newuidmap";

     

       123
       123
       +
             newgidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newgidmap";

     

       117
       124
        
           } // lib.optionalAttrs config.users.mutableUsers {

     

       118
       118
       -
             chsh.source      = "${pkgs.shadow.out}/bin/chsh";

     

       119
       119
       -
             passwd.source    = "${pkgs.shadow.out}/bin/passwd";

     

       125
       125
       +
             chsh   = mkSetuidRoot "${pkgs.shadow.out}/bin/chsh";

     

       126
       126
       +
             passwd = mkSetuidRoot "${pkgs.shadow.out}/bin/passwd";

     

       120
       127
        
           };

     

       121
       128
        
         };

     

       122
       129
        
       }

+6 -1

nixos/modules/programs/singularity.nix

···

       16
       16
        
       

     

       17
       17
        
         config = mkIf cfg.enable {

     

       18
       18
        
             environment.systemPackages = [ singularity ];

     

       19
       19
       -
             security.wrappers.singularity-suid.source = "${singularity}/libexec/singularity/bin/starter-suid.orig";

     

       19
       19
       +
             security.wrappers.singularity-suid =

     

       20
       20
       +
             { setuid = true;

     

       21
       21
       +
               owner = "root";

     

       22
       22
       +
               group = "root";

     

       23
       23
       +
               source = "${singularity}/libexec/singularity/bin/starter-suid.orig";

     

       24
       24
       +
             };

     

       20
       25
        
             systemd.tmpfiles.rules = [

     

       21
       26
        
               "d /var/singularity/mnt/session 0770 root root -"

     

       22
       27
        
               "d /var/singularity/mnt/final 0770 root root -"

+6 -1

nixos/modules/programs/slock.nix

···

       21
       21
        
       

     

       22
       22
        
         config = mkIf cfg.enable {

     

       23
       23
        
           environment.systemPackages = [ pkgs.slock ];

     

       24
       24
       -
           security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock";

     

       24
       24
       +
           security.wrappers.slock =

     

       25
       25
       +
             { setuid = true;

     

       26
       26
       +
               owner = "root";

     

       27
       27
       +
               group = "root";

     

       28
       28
       +
               source = "${pkgs.slock.out}/bin/slock";

     

       29
       29
       +
             };

     

       25
       30
        
         };

     

       26
       31
        
       }

+2

nixos/modules/programs/ssmtp.nix

···

       181
       181
        
             source = "${pkgs.ssmtp}/bin/sendmail";

     

       182
       182
        
             setuid = false;

     

       183
       183
        
             setgid = false;

     

       184
       184
       +
             owner = "root";

     

       185
       185
       +
             group = "root";

     

       184
       186
        
           };

     

       185
       187
        
       

     

       186
       188
        
         };

+3 -1

nixos/modules/programs/traceroute.nix

···

       19
       19
        
       

     

       20
       20
        
         config = mkIf cfg.enable {

     

       21
       21
        
           security.wrappers.traceroute = {

     

       22
       22
       -
             source = "${pkgs.traceroute}/bin/traceroute";

     

       22
       22
       +
             owner = "root";

     

       23
       23
       +
             group = "root";

     

       23
       24
        
             capabilities = "cap_net_raw+p";

     

       25
       25
       +
             source = "${pkgs.traceroute}/bin/traceroute";

     

       24
       26
        
           };

     

       25
       27
        
         };

     

       26
       28
        
       }

+6 -1

nixos/modules/programs/udevil.nix

···

       9
       9
        
         options.programs.udevil.enable = mkEnableOption "udevil";

     

       10
       10
        
       

     

       11
       11
        
         config = mkIf cfg.enable {

     

       12
       12
       -
           security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil";

     

       12
       12
       +
           security.wrappers.udevil =

     

       13
       13
       +
             { setuid = true;

     

       14
       14
       +
               owner = "root";

     

       15
       15
       +
               group = "root";

     

       16
       16
       +
               source = "${lib.getBin pkgs.udevil}/bin/udevil";

     

       17
       17
       +
             };

     

       13
       18
        
         };

     

       14
       19
        
       }

+3 -1

nixos/modules/programs/wavemon.nix

···

       21
       21
        
         config = mkIf cfg.enable {

     

       22
       22
        
           environment.systemPackages = with pkgs; [ wavemon ];

     

       23
       23
        
           security.wrappers.wavemon = {

     

       24
       24
       -
             source = "${pkgs.wavemon}/bin/wavemon";

     

       24
       24
       +
             owner = "root";

     

       25
       25
       +
             group = "root";

     

       25
       26
        
             capabilities = "cap_net_admin+ep";

     

       27
       27
       +
             source = "${pkgs.wavemon}/bin/wavemon";

     

       26
       28
        
           };

     

       27
       29
        
         };

     

       28
       30
        
       }

+6 -1

nixos/modules/programs/wshowkeys.nix

···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         config = mkIf cfg.enable {

     

       20
       20
       -
           security.wrappers.wshowkeys.source = "${pkgs.wshowkeys}/bin/wshowkeys";

     

       20
       20
       +
           security.wrappers.wshowkeys =

     

       21
       21
       +
             { setuid = true;

     

       22
       22
       +
               owner = "root";

     

       23
       23
       +
               group = "root";

     

       24
       24
       +
               source = "${pkgs.wshowkeys}/bin/wshowkeys";

     

       25
       25
       +
             };

     

       21
       26
        
         };

     

       22
       27
        
       }

+6 -1

nixos/modules/security/chromium-suid-sandbox.nix

···

       28
       28
        
       

     

       29
       29
        
         config = mkIf cfg.enable {

     

       30
       30
        
           environment.systemPackages = [ sandbox ];

     

       31
       31
       -
           security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";

     

       31
       31
       +
           security.wrappers.${sandbox.passthru.sandboxExecutableName} =

     

       32
       32
       +
             { setuid = true;

     

       33
       33
       +
               owner = "root";

     

       34
       34
       +
               group = "root";

     

       35
       35
       +
               source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";

     

       36
       36
       +
             };

     

       32
       37
        
         };

     

       33
       38
        
       }

+6 -3

nixos/modules/security/doas.nix

···

       241
       241
        
             }

     

       242
       242
        
           ];

     

       243
       243
        
       

     

       244
       244
       -
           security.wrappers = {

     

       245
       245
       -
             doas.source = "${doas}/bin/doas";

     

       246
       246
       -
           };

     

       244
       244
       +
           security.wrappers.doas =

     

       245
       245
       +
             { setuid = true;

     

       246
       246
       +
               owner = "root";

     

       247
       247
       +
               group = "root";

     

       248
       248
       +
               source = "${doas}/bin/doas";

     

       249
       249
       +
             };

     

       247
       250
        
       

     

       248
       251
        
           environment.systemPackages = [

     

       249
       252
        
             doas

+6 -1

nixos/modules/security/duosec.nix

···

       186
       186
        
         config = mkIf (cfg.ssh.enable || cfg.pam.enable) {

     

       187
       187
        
           environment.systemPackages = [ pkgs.duo-unix ];

     

       188
       188
        
       

     

       189
       189
       -
           security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo";

     

       189
       189
       +
           security.wrappers.login_duo =

     

       190
       190
       +
             { setuid = true;

     

       191
       191
       +
               owner = "root";

     

       192
       192
       +
               group = "root";

     

       193
       193
       +
               source = "${pkgs.duo-unix.out}/bin/login_duo";

     

       194
       194
       +
             };

     

       190
       195
        
       

     

       191
       196
        
           system.activationScripts = {

     

       192
       197
        
             login_duo = mkIf cfg.ssh.enable ''

+3 -2

nixos/modules/security/pam.nix

···

       869
       869
        
       

     

       870
       870
        
           security.wrappers = {

     

       871
       871
        
             unix_chkpwd = {

     

       872
       872
       +
               setuid = true;

     

       873
       873
       +
               owner = "root";

     

       874
       874
       +
               group = "root";

     

       872
       875
        
               source = "${pkgs.pam}/sbin/unix_chkpwd.orig";

     

       873
       873
       -
               owner = "root";

     

       874
       874
       -
               setuid = true;

     

       875
       876
        
             };

     

       876
       877
        
           };

     

       877
       878

+12 -2

nixos/modules/security/pam_usb.nix

···

       32
       32
        
       

     

       33
       33
        
           # Make sure pmount and pumount are setuid wrapped.

     

       34
       34
        
           security.wrappers = {

     

       35
       35
       -
             pmount.source = "${pkgs.pmount.out}/bin/pmount";

     

       36
       36
       -
             pumount.source = "${pkgs.pmount.out}/bin/pumount";

     

       35
       35
       +
             pmount =

     

       36
       36
       +
               { setuid = true;

     

       37
       37
       +
                 owner = "root";

     

       38
       38
       +
                 group = "root";

     

       39
       39
       +
                 source = "${pkgs.pmount.out}/bin/pmount";

     

       40
       40
       +
               };

     

       41
       41
       +
             pumount =

     

       42
       42
       +
               { setuid = true;

     

       43
       43
       +
                 owner = "root";

     

       44
       44
       +
                 group = "root";

     

       45
       45
       +
                 source = "${pkgs.pmount.out}/bin/pumount";

     

       46
       46
       +
               };

     

       37
       47
        
           };

     

       38
       48
        
       

     

       39
       49
        
           environment.systemPackages = [ pkgs.pmount ];

+12 -2

nixos/modules/security/polkit.nix

···

       83
       83
        
           security.pam.services.polkit-1 = {};

     

       84
       84
        
       

     

       85
       85
        
           security.wrappers = {

     

       86
       86
       -
             pkexec.source = "${pkgs.polkit.bin}/bin/pkexec";

     

       87
       87
       -
             polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";

     

       86
       86
       +
             pkexec =

     

       87
       87
       +
               { setuid = true;

     

       88
       88
       +
                 owner = "root";

     

       89
       89
       +
                 group = "root";

     

       90
       90
       +
                 source = "${pkgs.polkit.bin}/bin/pkexec";

     

       91
       91
       +
               };

     

       92
       92
       +
             polkit-agent-helper-1 =

     

       93
       93
       +
               { setuid = true;

     

       94
       94
       +
                 owner = "root";

     

       95
       95
       +
                 group = "root";

     

       96
       96
       +
                 source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";

     

       97
       97
       +
               };

     

       88
       98
        
           };

     

       89
       99
        
       

     

       90
       100
        
           systemd.tmpfiles.rules = [

+188 -94

nixos/modules/security/wrappers/default.nix

···

       5
       5
        
       

     

       6
       6
        
         parentWrapperDir = dirOf wrapperDir;

     

       7
       7
        
       

     

       8
       8
       -
         programs =

     

       9
       9
       -
           (lib.mapAttrsToList

     

       10
       10
       -
             (n: v: (if v ? program then v else v // {program=n;}))

     

       11
       11
       -
             wrappers);

     

       12
       12
       -
       

     

       13
       8
        
         securityWrapper = pkgs.callPackage ./wrapper.nix {

     

       14
       9
        
           inherit parentWrapperDir;

     

       15
       10
        
         };

     

       16
       11
        
       

     

       12
       12
       +
         fileModeType =

     

       13
       13
       +
           let

     

       14
       14
       +
             # taken from the chmod(1) man page

     

       15
       15
       +
             symbolic = "[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+";

     

       16
       16
       +
             numeric = "[-+=]?[0-7]{0,4}";

     

       17
       17
       +
             mode = "((${symbolic})(,${symbolic})*)|(${numeric})";

     

       18
       18
       +
           in

     

       19
       19
       +
            lib.types.strMatching mode

     

       20
       20
       +
            // { description = "file mode string"; };

     

       21
       21
       +
       

     

       22
       22
       +
         wrapperType = lib.types.submodule ({ name, config, ... }: {

     

       23
       23
       +
           options.source = lib.mkOption

     

       24
       24
       +
             { type = lib.types.path;

     

       25
       25
       +
               description = "The absolute path to the program to be wrapped.";

     

       26
       26
       +
             };

     

       27
       27
       +
           options.program = lib.mkOption

     

       28
       28
       +
             { type = with lib.types; nullOr str;

     

       29
       29
       +
               default = name;

     

       30
       30
       +
               description = ''

     

       31
       31
       +
                 The name of the wrapper program. Defaults to the attribute name.

     

       32
       32
       +
               '';

     

       33
       33
       +
             };

     

       34
       34
       +
           options.owner = lib.mkOption

     

       35
       35
       +
             { type = lib.types.str;

     

       36
       36
       +
               description = "The owner of the wrapper program.";

     

       37
       37
       +
             };

     

       38
       38
       +
           options.group = lib.mkOption

     

       39
       39
       +
             { type = lib.types.str;

     

       40
       40
       +
               description = "The group of the wrapper program.";

     

       41
       41
       +
             };

     

       42
       42
       +
           options.permissions = lib.mkOption

     

       43
       43
       +
             { type = fileModeType;

     

       44
       44
       +
               default  = "u+rx,g+x,o+x";

     

       45
       45
       +
               example = "a+rx";

     

       46
       46
       +
               description = ''

     

       47
       47
       +
                 The permissions of the wrapper program. The format is that of a

     

       48
       48
       +
                 symbolic or numeric file mode understood by <command>chmod</command>.

     

       49
       49
       +
               '';

     

       50
       50
       +
             };

     

       51
       51
       +
           options.capabilities = lib.mkOption

     

       52
       52
       +
             { type = lib.types.commas;

     

       53
       53
       +
               default = "";

     

       54
       54
       +
               description = ''

     

       55
       55
       +
                 A comma-separated list of capabilities to be given to the wrapper

     

       56
       56
       +
                 program. For capabilities supported by the system check the

     

       57
       57
       +
                 <citerefentry>

     

       58
       58
       +
                   <refentrytitle>capabilities</refentrytitle>

     

       59
       59
       +
                   <manvolnum>7</manvolnum>

     

       60
       60
       +
                 </citerefentry>

     

       61
       61
       +
                 manual page.

     

       62
       62
       +
       

     

       63
       63
       +
                 <note><para>

     

       64
       64
       +
                   <literal>cap_setpcap</literal>, which is required for the wrapper

     

       65
       65
       +
                   program to be able to raise caps into the Ambient set is NOT raised

     

       66
       66
       +
                   to the Ambient set so that the real program cannot modify its own

     

       67
       67
       +
                   capabilities!! This may be too restrictive for cases in which the

     

       68
       68
       +
                   real program needs cap_setpcap but it at least leans on the side

     

       69
       69
       +
                   security paranoid vs. too relaxed.

     

       70
       70
       +
                 </para></note>

     

       71
       71
       +
               '';

     

       72
       72
       +
             };

     

       73
       73
       +
           options.setuid = lib.mkOption

     

       74
       74
       +
             { type = lib.types.bool;

     

       75
       75
       +
               default = false;

     

       76
       76
       +
               description = "Whether to add the setuid bit the wrapper program.";

     

       77
       77
       +
             };

     

       78
       78
       +
           options.setgid = lib.mkOption

     

       79
       79
       +
             { type = lib.types.bool;

     

       80
       80
       +
               default = false;

     

       81
       81
       +
               description = "Whether to add the setgid bit the wrapper program.";

     

       82
       82
       +
             };

     

       83
       83
       +
         });

     

       84
       84
       +
       

     

       17
       85
        
         ###### Activation script for the setcap wrappers

     

       18
       86
        
         mkSetcapProgram =

     

       19
       87
        
           { program

     

       20
       88
        
           , capabilities

     

       21
       89
        
           , source

     

       22
       22
       -
           , owner  ? "nobody"

     

       23
       23
       -
           , group  ? "nogroup"

     

       24
       24
       -
           , permissions ? "u+rx,g+x,o+x"

     

       90
       90
       +
           , owner

     

       91
       91
       +
           , group

     

       92
       92
       +
           , permissions

     

       25
       93
        
           , ...

     

       26
       94
        
           }:

     

       27
       95
        
           assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");

     

       28
       96
        
           ''

     

       29
       29
       -
             cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}

     

       30
       30
       -
             echo -n "${source}" > $wrapperDir/${program}.real

     

       97
       97
       +
             cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}"

     

       98
       98
       +
             echo -n "${source}" > "$wrapperDir/${program}.real"

     

       31
       99
        
       

     

       32
       100
        
             # Prevent races

     

       33
       33
       -
             chmod 0000 $wrapperDir/${program}

     

       34
       34
       -
             chown ${owner}.${group} $wrapperDir/${program}

     

       101
       101
       +
             chmod 0000 "$wrapperDir/${program}"

     

       102
       102
       +
             chown ${owner}.${group} "$wrapperDir/${program}"

     

       35
       103
        
       

     

       36
       104
        
             # Set desired capabilities on the file plus cap_setpcap so

     

       37
       105
        
             # the wrapper program can elevate the capabilities set on

     

       38
       106
        
             # its file into the Ambient set.

     

       39
       39
       -
             ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program}

     

       107
       107
       +
             ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" "$wrapperDir/${program}"

     

       40
       108
        
       

     

       41
       109
        
             # Set the executable bit

     

       42
       42
       -
             chmod ${permissions} $wrapperDir/${program}

     

       110
       110
       +
             chmod ${permissions} "$wrapperDir/${program}"

     

       43
       111
        
           '';

     

       44
       112
        
       

     

       45
       113
        
         ###### Activation script for the setuid wrappers

     

       46
       114
        
         mkSetuidProgram =

     

       47
       115
        
           { program

     

       48
       116
        
           , source

     

       49
       49
       -
           , owner  ? "nobody"

     

       50
       50
       -
           , group  ? "nogroup"

     

       51
       51
       -
           , setuid ? false

     

       52
       52
       -
           , setgid ? false

     

       53
       53
       -
           , permissions ? "u+rx,g+x,o+x"

     

       117
       117
       +
           , owner

     

       118
       118
       +
           , group

     

       119
       119
       +
           , setuid

     

       120
       120
       +
           , setgid

     

       121
       121
       +
           , permissions

     

       54
       122
        
           , ...

     

       55
       123
        
           }:

     

       56
       124
        
           ''

     

       57
       57
       -
             cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}

     

       58
       58
       -
             echo -n "${source}" > $wrapperDir/${program}.real

     

       125
       125
       +
             cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}"

     

       126
       126
       +
             echo -n "${source}" > "$wrapperDir/${program}.real"

     

       59
       127
        
       

     

       60
       128
        
             # Prevent races

     

       61
       61
       -
             chmod 0000 $wrapperDir/${program}

     

       62
       62
       -
             chown ${owner}.${group} $wrapperDir/${program}

     

       129
       129
       +
             chmod 0000 "$wrapperDir/${program}"

     

       130
       130
       +
             chown ${owner}.${group} "$wrapperDir/${program}"

     

       63
       131
        
       

     

       64
       64
       -
             chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}

     

       132
       132
       +
             chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}"

     

       65
       133
        
           '';

     

       66
       134
        
       

     

       67
       135
        
         mkWrappedPrograms =

     

       68
       136
        
           builtins.map

     

       69
       69
       -
             (s: if (s ? capabilities)

     

       70
       70
       -
                 then mkSetcapProgram

     

       71
       71
       -
                        ({ owner = "root";

     

       72
       72
       -
                           group = "root";

     

       73
       73
       -
                         } // s)

     

       74
       74
       -
                 else if

     

       75
       75
       -
                    (s ? setuid && s.setuid) ||

     

       76
       76
       -
                    (s ? setgid && s.setgid) ||

     

       77
       77
       -
                    (s ? permissions)

     

       78
       78
       -
                 then mkSetuidProgram s

     

       79
       79
       -
                 else mkSetuidProgram

     

       80
       80
       -
                        ({ owner  = "root";

     

       81
       81
       -
                           group  = "root";

     

       82
       82
       -
                           setuid = true;

     

       83
       83
       -
                           setgid = false;

     

       84
       84
       -
                           permissions = "u+rx,g+x,o+x";

     

       85
       85
       -
                         } // s)

     

       86
       86
       -
             ) programs;

     

       137
       137
       +
             (opts:

     

       138
       138
       +
               if opts.capabilities != ""

     

       139
       139
       +
               then mkSetcapProgram opts

     

       140
       140
       +
               else mkSetuidProgram opts

     

       141
       141
       +
             ) (lib.attrValues wrappers);

     

       87
       142
        
       in

     

       88
       143
        
       {

     

       89
       144
        
         imports = [

     
···

       95
       150
        
       

     

       96
       151
        
         options = {

     

       97
       152
        
           security.wrappers = lib.mkOption {

     

       98
       98
       -
             type = lib.types.attrs;

     

       153
       153
       +
             type = lib.types.attrsOf wrapperType;

     

       99
       154
        
             default = {};

     

       100
       155
        
             example = lib.literalExample

     

       101
       156
        
               ''

     

       102
       102
       -
                 { sendmail.source = "/nix/store/.../bin/sendmail";

     

       103
       103
       -
                   ping = {

     

       104
       104
       -
                     source  = "${pkgs.iputils.out}/bin/ping";

     

       105
       105
       -
                     owner   = "nobody";

     

       106
       106
       -
                     group   = "nogroup";

     

       107
       107
       -
                     capabilities = "cap_net_raw+ep";

     

       108
       108
       -
                   };

     

       157
       157
       +
                 {

     

       158
       158
       +
                   # a setuid root program

     

       159
       159
       +
                   doas =

     

       160
       160
       +
                     { setuid = true;

     

       161
       161
       +
                       owner = "root";

     

       162
       162
       +
                       group = "root";

     

       163
       163
       +
                       source = "''${pkgs.doas}/bin/doas";

     

       164
       164
       +
                     };

     

       165
       165
       +
       

     

       166
       166
       +
                   # a setgid program

     

       167
       167
       +
                   locate =

     

       168
       168
       +
                     { setgid = true;

     

       169
       169
       +
                       owner = "root";

     

       170
       170
       +
                       group = "mlocate";

     

       171
       171
       +
                       source = "''${pkgs.locate}/bin/locate";

     

       172
       172
       +
                     };

     

       173
       173
       +
       

     

       174
       174
       +
                   # a program with the CAP_NET_RAW capability

     

       175
       175
       +
                   ping =

     

       176
       176
       +
                     { owner = "root";

     

       177
       177
       +
                       group = "root";

     

       178
       178
       +
                       capabilities = "cap_net_raw+ep";

     

       179
       179
       +
                       source = "''${pkgs.iputils.out}/bin/ping";

     

       180
       180
       +
                     };

     

       109
       181
        
                 }

     

       110
       182
        
               '';

     

       111
       183
        
             description = ''

     

       112
       112
       -
               This option allows the ownership and permissions on the setuid

     

       113
       113
       -
               wrappers for specific programs to be overridden from the

     

       114
       114
       -
               default (setuid root, but not setgid root).

     

       115
       115
       -
       

     

       116
       116
       -
               <note>

     

       117
       117
       -
                 <para>The sub-attribute <literal>source</literal> is mandatory,

     

       118
       118
       -
                 it must be the absolute path to the program to be wrapped.

     

       119
       119
       -
                 </para>

     

       120
       120
       -
       

     

       121
       121
       -
                 <para>The sub-attribute <literal>program</literal> is optional and

     

       122
       122
       -
                 can give the wrapper program a new name. The default name is the same

     

       123
       123
       -
                 as the attribute name itself.</para>

     

       124
       124
       -
       

     

       125
       125
       -
                 <para>Additionally, this option can set capabilities on a

     

       126
       126
       -
                 wrapper program that propagates those capabilities down to the

     

       127
       127
       -
                 wrapped, real program.</para>

     

       128
       128
       -
       

     

       129
       129
       -
                 <para>NOTE: cap_setpcap, which is required for the wrapper

     

       130
       130
       -
                 program to be able to raise caps into the Ambient set is NOT

     

       131
       131
       -
                 raised to the Ambient set so that the real program cannot

     

       132
       132
       -
                 modify its own capabilities!! This may be too restrictive for

     

       133
       133
       -
                 cases in which the real program needs cap_setpcap but it at

     

       134
       134
       -
                 least leans on the side security paranoid vs. too

     

       135
       135
       -
                 relaxed.</para>

     

       136
       136
       -
               </note>

     

       184
       184
       +
               This option effectively allows adding setuid/setgid bits, capabilities,

     

       185
       185
       +
               changing file ownership and permissions of a program without directly

     

       186
       186
       +
               modifying it. This works by creating a wrapper program under the

     

       187
       187
       +
               <option>security.wrapperDir</option> directory, which is then added to

     

       188
       188
       +
               the shell <literal>PATH</literal>.

     

       137
       189
        
             '';

     

       138
       190
        
           };

     

       139
       191
        
       

     
···

       151
       203
        
         ###### implementation

     

       152
       204
        
         config = {

     

       153
       205
        
       

     

       154
       154
       -
           security.wrappers = {

     

       155
       155
       -
             # These are mount related wrappers that require the +s permission.

     

       156
       156
       -
             fusermount.source = "${pkgs.fuse}/bin/fusermount";

     

       157
       157
       -
             fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";

     

       158
       158
       -
             mount.source = "${lib.getBin pkgs.util-linux}/bin/mount";

     

       159
       159
       -
             umount.source = "${lib.getBin pkgs.util-linux}/bin/umount";

     

       160
       160
       -
           };

     

       206
       206
       +
           assertions = lib.mapAttrsToList

     

       207
       207
       +
             (name: opts:

     

       208
       208
       +
               { assertion = opts.setuid || opts.setgid -> opts.capabilities == "";

     

       209
       209
       +
                 message = ''

     

       210
       210
       +
                   The security.wrappers.${name} wrapper is not valid:

     

       211
       211
       +
                       setuid/setgid and capabilities are mutually exclusive.

     

       212
       212
       +
                 '';

     

       213
       213
       +
               }

     

       214
       214
       +
             ) wrappers;

     

       215
       215
       +
       

     

       216
       216
       +
           security.wrappers =

     

       217
       217
       +
             let

     

       218
       218
       +
               mkSetuidRoot = source:

     

       219
       219
       +
                 { setuid = true;

     

       220
       220
       +
                   owner = "root";

     

       221
       221
       +
                   group = "root";

     

       222
       222
       +
                   inherit source;

     

       223
       223
       +
                 };

     

       224
       224
       +
             in

     

       225
       225
       +
             { # These are mount related wrappers that require the +s permission.

     

       226
       226
       +
               fusermount  = mkSetuidRoot "${pkgs.fuse}/bin/fusermount";

     

       227
       227
       +
               fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3";

     

       228
       228
       +
               mount  = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";

     

       229
       229
       +
               umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";

     

       230
       230
       +
             };

     

       161
       231
        
       

     

       162
       232
        
           boot.specialFileSystems.${parentWrapperDir} = {

     

       163
       233
        
             fsType = "tmpfs";

     
···

       179
       249
        
             ]}"

     

       180
       250
        
           '';

     

       181
       251
        
       

     

       182
       182
       -
           ###### setcap activation script

     

       252
       252
       +
           ###### wrappers activation script

     

       183
       253
        
           system.activationScripts.wrappers =

     

       184
       254
        
             lib.stringAfter [ "specialfs" "users" ]

     

       185
       255
        
               ''

     

       186
       186
       -
                 # Look in the system path and in the default profile for

     

       187
       187
       -
                 # programs to be wrapped.

     

       188
       188
       -
                 WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin

     

       189
       189
       -
       

     

       190
       256
        
                 chmod 755 "${parentWrapperDir}"

     

       191
       257
        
       

     

       192
       258
        
                 # We want to place the tmpdirs for the wrappers to the parent dir.

     

       193
       259
        
                 wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)

     

       194
       194
       -
                 chmod a+rx $wrapperDir

     

       260
       260
       +
                 chmod a+rx "$wrapperDir"

     

       195
       261
        
       

     

       196
       262
        
                 ${lib.concatStringsSep "\n" mkWrappedPrograms}

     

       197
       263
        
       

     
···

       199
       265
        
                   # Atomically replace the symlink

     

       200
       266
        
                   # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/

     

       201
       267
        
                   old=$(readlink -f ${wrapperDir})

     

       202
       202
       -
                   if [ -e ${wrapperDir}-tmp ]; then

     

       203
       203
       -
                     rm --force --recursive ${wrapperDir}-tmp

     

       268
       268
       +
                   if [ -e "${wrapperDir}-tmp" ]; then

     

       269
       269
       +
                     rm --force --recursive "${wrapperDir}-tmp"

     

       204
       270
        
                   fi

     

       205
       205
       -
                   ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp

     

       206
       206
       -
                   mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}

     

       207
       207
       -
                   rm --force --recursive $old

     

       271
       271
       +
                   ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"

     

       272
       272
       +
                   mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"

     

       273
       273
       +
                   rm --force --recursive "$old"

     

       208
       274
        
                 else

     

       209
       275
        
                   # For initial setup

     

       210
       210
       -
                   ln --symbolic $wrapperDir ${wrapperDir}

     

       276
       276
       +
                   ln --symbolic "$wrapperDir" "${wrapperDir}"

     

       211
       277
        
                 fi

     

       212
       278
        
               '';

     

       279
       279
       +
       

     

       280
       280
       +
           ###### wrappers consistency checks

     

       281
       281
       +
           system.extraDependencies = lib.singleton (pkgs.runCommandLocal

     

       282
       282
       +
             "ensure-all-wrappers-paths-exist" { }

     

       283
       283
       +
             ''

     

       284
       284
       +
               # make sure we produce output

     

       285
       285
       +
               mkdir -p $out

     

       286
       286
       +
       

     

       287
       287
       +
               echo -n "Checking that Nix store paths of all wrapped programs exist... "

     

       288
       288
       +
       

     

       289
       289
       +
               declare -A wrappers

     

       290
       290
       +
               ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v:

     

       291
       291
       +
                 "wrappers['${n}']='${v.source}'") wrappers)}

     

       292
       292
       +
       

     

       293
       293
       +
               for name in "''${!wrappers[@]}"; do

     

       294
       294
       +
                 path="''${wrappers[$name]}"

     

       295
       295
       +
                 if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then

     

       296
       296
       +
                   test -t 1 && echo -ne '\033[1;31m'

     

       297
       297
       +
                   echo "FAIL"

     

       298
       298
       +
                   echo "The path $path does not exist!"

     

       299
       299
       +
                   echo 'Please, check the value of `security.wrappers."'$name'".source`.'

     

       300
       300
       +
                   test -t 1 && echo -ne '\033[0m'

     

       301
       301
       +
                   exit 1

     

       302
       302
       +
                 fi

     

       303
       303
       +
               done

     

       304
       304
       +
       

     

       305
       305
       +
               echo "OK"

     

       306
       306
       +
             '');

     

       213
       307
        
         };

     

       214
       308
        
       }

+3 -1

nixos/modules/services/desktops/gnome/gnome-keyring.nix

···

       52
       52
        
           security.pam.services.login.enableGnomeKeyring = true;

     

       53
       53
        
       

     

       54
       54
        
           security.wrappers.gnome-keyring-daemon = {

     

       55
       55
       -
             source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";

     

       55
       55
       +
             owner = "root";

     

       56
       56
       +
             group = "root";

     

       56
       57
        
             capabilities = "cap_ipc_lock=ep";

     

       58
       58
       +
             source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";

     

       57
       59
        
           };

     

       58
       60
        
       

     

       59
       61
        
         };

+1 -1

nixos/modules/services/desktops/gsignond.nix

···

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
        
       

     

       12
       12
       -
         meta.maintainers = pkgs.pantheon.maintainers;

     

       12
       12
       +
         meta.maintainers = teams.pantheon.members;

     

       13
       13
        
       

     

       14
       14
        
         ###### interface

     

       15
       15

+6 -1

nixos/modules/services/mail/exim.nix

···

       104
       104
        
             gid = config.ids.gids.exim;

     

       105
       105
        
           };

     

       106
       106
        
       

     

       107
       107
       -
           security.wrappers.exim.source = "${cfg.package}/bin/exim";

     

       107
       107
       +
           security.wrappers.exim =

     

       108
       108
       +
             { setuid = true;

     

       109
       109
       +
               owner = "root";

     

       110
       110
       +
               group = "root";

     

       111
       111
       +
               source = "${cfg.package}/bin/exim";

     

       112
       112
       +
             };

     

       108
       113
        
       

     

       109
       114
        
           systemd.services.exim = {

     

       110
       115
        
             description = "Exim Mail Daemon";

+2 -1

nixos/modules/services/mail/mail.nix

···

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

     

       1
       1
       +
       { config, options, lib, ... }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     
···

       11
       11
        
           services.mail = {

     

       12
       12
        
       

     

       13
       13
        
             sendmailSetuidWrapper = mkOption {

     

       14
       14
       +
               type = types.nullOr options.security.wrappers.type.nestedTypes.elemType;

     

       14
       15
        
               default = null;

     

       15
       16
        
               internal = true;

     

       16
       17
        
               description = ''

+4 -1

nixos/modules/services/mail/opensmtpd.nix

···

       103
       103
        
           };

     

       104
       104
        
       

     

       105
       105
        
           security.wrappers.smtpctl = {

     

       106
       106
       +
             owner = "nobody";

     

       106
       107
        
             group = "smtpq";

     

       108
       108
       +
             setuid = false;

     

       107
       109
        
             setgid = true;

     

       108
       110
        
             source = "${cfg.package}/bin/smtpctl";

     

       109
       111
        
           };

     

       110
       112
        
       

     

       111
       111
       -
           services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl;

     

       113
       113
       +
           services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail

     

       114
       114
       +
             security.wrappers.smtpctl // { program = "sendmail"; };

     

       112
       115
        
       

     

       113
       116
        
           systemd.tmpfiles.rules = [

     

       114
       117
        
             "d /var/spool/smtpd 711 root - - -"

+4

nixos/modules/services/mail/postfix.nix

···

       673
       673
        
             services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {

     

       674
       674
        
               program = "sendmail";

     

       675
       675
        
               source = "${pkgs.postfix}/bin/sendmail";

     

       676
       676
       +
               owner = "nobody";

     

       676
       677
        
               group = setgidGroup;

     

       677
       678
        
               setuid = false;

     

       678
       679
        
               setgid = true;

     
···

       681
       682
        
             security.wrappers.mailq = {

     

       682
       683
        
               program = "mailq";

     

       683
       684
        
               source = "${pkgs.postfix}/bin/mailq";

     

       685
       685
       +
               owner = "nobody";

     

       684
       686
        
               group = setgidGroup;

     

       685
       687
        
               setuid = false;

     

       686
       688
        
               setgid = true;

     
···

       689
       691
        
             security.wrappers.postqueue = {

     

       690
       692
        
               program = "postqueue";

     

       691
       693
        
               source = "${pkgs.postfix}/bin/postqueue";

     

       694
       694
       +
               owner = "nobody";

     

       692
       695
        
               group = setgidGroup;

     

       693
       696
        
               setuid = false;

     

       694
       697
        
               setgid = true;

     
···

       697
       700
        
             security.wrappers.postdrop = {

     

       698
       701
        
               program = "postdrop";

     

       699
       702
        
               source = "${pkgs.postfix}/bin/postdrop";

     

       703
       703
       +
               owner = "nobody";

     

       700
       704
        
               group = setgidGroup;

     

       701
       705
        
               setuid = false;

     

       702
       706
        
               setgid = true;

+3 -1

nixos/modules/services/misc/mame.nix

···

       45
       45
        
           environment.systemPackages = [ pkgs.mame ];

     

       46
       46
        
       

     

       47
       47
        
           security.wrappers."${mame}" = {

     

       48
       48
       -
             source = "${pkgs.mame}/bin/${mame}";

     

       48
       48
       +
             owner = "root";

     

       49
       49
       +
             group = "root";

     

       49
       50
        
             capabilities = "cap_net_admin,cap_net_raw+eip";

     

       51
       51
       +
             source = "${pkgs.mame}/bin/${mame}";

     

       50
       52
        
           };

     

       51
       53
        
       

     

       52
       54
        
           systemd.services.mame = {

+6 -1

nixos/modules/services/misc/weechat.nix

···

       52
       52
        
             wants = [ "network.target" ];

     

       53
       53
        
           };

     

       54
       54
        
       

     

       55
       55
       -
           security.wrappers.screen.source = "${pkgs.screen}/bin/screen";

     

       55
       55
       +
           security.wrappers.screen =

     

       56
       56
       +
             { setuid = true;

     

       57
       57
       +
               owner = "root";

     

       58
       58
       +
               group = "root";

     

       59
       59
       +
               source = "${pkgs.screen}/bin/screen";

     

       60
       60
       +
             };

     

       56
       61
        
         };

     

       57
       62
        
       

     

       58
       63
        
         meta.doc = ./weechat.xml;

+6 -1

nixos/modules/services/monitoring/incron.nix

···

       71
       71
        
       

     

       72
       72
        
           environment.systemPackages = [ pkgs.incron ];

     

       73
       73
        
       

     

       74
       74
       -
           security.wrappers.incrontab.source = "${pkgs.incron}/bin/incrontab";

     

       74
       74
       +
           security.wrappers.incrontab =

     

       75
       75
       +
           { setuid = true;

     

       76
       76
       +
             owner = "root";

     

       77
       77
       +
             group = "root";

     

       78
       78
       +
             source = "${pkgs.incron}/bin/incrontab";

     

       79
       79
       +
           };

     

       75
       80
        
       

     

       76
       81
        
           # incron won't read symlinks

     

       77
       82
        
           environment.etc."incron.d/system" = {

+6 -1

nixos/modules/services/monitoring/zabbix-proxy.nix

···

       262
       262
        
           };

     

       263
       263
        
       

     

       264
       264
        
           security.wrappers = {

     

       265
       265
       -
             fping.source = "${pkgs.fping}/bin/fping";

     

       265
       265
       +
             fping =

     

       266
       266
       +
               { setuid = true;

     

       267
       267
       +
                 owner = "root";

     

       268
       268
       +
                 group = "root";

     

       269
       269
       +
                 source = "${pkgs.fping}/bin/fping";

     

       270
       270
       +
               };

     

       266
       271
        
           };

     

       267
       272
        
       

     

       268
       273
        
           systemd.services.zabbix-proxy = {

+12 -2

nixos/modules/services/networking/smokeping.nix

···

       278
       278
        
             }

     

       279
       279
        
           ];

     

       280
       280
        
           security.wrappers = {

     

       281
       281
       -
             fping.source = "${pkgs.fping}/bin/fping";

     

       282
       282
       -
             fping6.source = "${pkgs.fping}/bin/fping6";

     

       281
       281
       +
             fping =

     

       282
       282
       +
               { setuid = true;

     

       283
       283
       +
                 owner = "root";

     

       284
       284
       +
                 group = "root";

     

       285
       285
       +
                 source = "${pkgs.fping}/bin/fping";

     

       286
       286
       +
               };

     

       287
       287
       +
             fping6 =

     

       288
       288
       +
               { setuid = true;

     

       289
       289
       +
                 owner = "root";

     

       290
       290
       +
                 group = "root";

     

       291
       291
       +
                 source = "${pkgs.fping}/bin/fping6";

     

       292
       292
       +
               };

     

       283
       293
        
           };

     

       284
       294
        
           environment.systemPackages = [ pkgs.fping ];

     

       285
       295
        
           users.users.${cfg.user} = {

+2

nixos/modules/services/networking/x2goserver.nix

···

       88
       88
        
             source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";

     

       89
       89
        
             owner = "x2go";

     

       90
       90
        
             group = "x2go";

     

       91
       91
       +
             setuid = false;

     

       91
       92
        
             setgid = true;

     

       92
       93
        
           };

     

       93
       94
        
           security.wrappers.x2goprintWrapper = {

     

       94
       95
        
             source = "${pkgs.x2goserver}/bin/x2goprint";

     

       95
       96
        
             owner = "x2go";

     

       96
       97
        
             group = "x2go";

     

       98
       98
       +
             setuid = false;

     

       97
       99
        
             setgid = true;

     

       98
       100
        
           };

     

       99
       101

+6 -1

nixos/modules/services/scheduling/cron.nix

···

       93
       93
        
       

     

       94
       94
        
           { services.cron.enable = mkDefault (allFiles != []); }

     

       95
       95
        
           (mkIf (config.services.cron.enable) {

     

       96
       96
       -
             security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab";

     

       96
       96
       +
             security.wrappers.crontab =

     

       97
       97
       +
               { setuid = true;

     

       98
       98
       +
                 owner = "root";

     

       99
       99
       +
                 group = "root";

     

       100
       100
       +
                 source = "${cronNixosPkg}/bin/crontab";

     

       101
       101
       +
               };

     

       97
       102
        
             environment.systemPackages = [ cronNixosPkg ];

     

       98
       103
        
             environment.etc.crontab =

     

       99
       104
        
               { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }

+3

nixos/modules/services/scheduling/fcron.nix

···

       136
       136
        
               owner = "fcron";

     

       137
       137
        
               group = "fcron";

     

       138
       138
        
               setgid = true;

     

       139
       139
       +
               setuid = false;

     

       139
       140
        
             };

     

       140
       141
        
             fcronsighup = {

     

       141
       142
        
               source = "${pkgs.fcron}/bin/fcronsighup";

     

       143
       143
       +
               owner = "root";

     

       142
       144
        
               group = "fcron";

     

       145
       145
       +
               setuid = true;

     

       143
       146
        
             };

     

       144
       147
        
           };

     

       145
       148
        
           systemd.services.fcron = {

+24

nixos/modules/services/security/opensnitch.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         name = "opensnitch";

     

       7
       7
       +
         cfg = config.services.opensnitch;

     

       8
       8
       +
       in {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           services.opensnitch = {

     

       11
       11
       +
             enable = mkEnableOption "Opensnitch application firewall";

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         config = mkIf cfg.enable {

     

       16
       16
       +
       

     

       17
       17
       +
           systemd = {

     

       18
       18
       +
             packages = [ pkgs.opensnitch ];

     

       19
       19
       +
             services.opensnitchd.wantedBy = [ "multi-user.target" ];

     

       20
       20
       +
           };

     

       21
       21
       +
       

     

       22
       22
       +
         };

     

       23
       23
       +
       }

     

       24
       24
       +

+6 -4

nixos/modules/services/security/physlock.nix

···

       38
       38
        
                 setuid wrapper to allow any user to start physlock as root, which

     

       39
       39
        
                 is a minor security risk. Call the physlock binary to use this instead

     

       40
       40
        
                 of using the systemd service.

     

       41
       41
       -
       

     

       42
       42
       -
                 Note that you might need to relog to have the correct binary in your

     

       43
       43
       -
                 PATH upon changing this option.

     

       44
       41
        
               '';

     

       45
       42
        
             };

     

       46
       43
        
       

     
···

       129
       126
        
       

     

       130
       127
        
           (mkIf cfg.allowAnyUser {

     

       131
       128
        
       

     

       132
       132
       -
             security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; };

     

       129
       129
       +
             security.wrappers.physlock =

     

       130
       130
       +
               { setuid = true;

     

       131
       131
       +
                 owner = "root";

     

       132
       132
       +
                 group = "root";

     

       133
       133
       +
                 source = "${pkgs.physlock}/bin/physlock";

     

       134
       134
       +
               };

     

       133
       135
        
       

     

       134
       136
        
           })

     

       135
       137
        
         ]);

+3 -1

nixos/modules/services/video/replay-sorcery.nix

···

       44
       44
        
       

     

       45
       45
        
           security.wrappers = mkIf cfg.enableSysAdminCapability {

     

       46
       46
        
             replay-sorcery = {

     

       47
       47
       -
               source = "${pkgs.replay-sorcery}/bin/replay-sorcery";

     

       47
       47
       +
               owner = "root";

     

       48
       48
       +
               group = "root";

     

       48
       49
        
               capabilities = "cap_sys_admin+ep";

     

       50
       50
       +
               source = "${pkgs.replay-sorcery}/bin/replay-sorcery";

     

       49
       51
        
             };

     

       50
       52
        
           };

     

       51
       53

+321 -262

nixos/modules/services/web-apps/dokuwiki.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       +
         inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types maintainers recursiveUpdate;

     

       5
       5
       +
         inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExample;

     

       6
       6
       +
         inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;

     

       4
       7
        
       

     

       5
       5
       -
         inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types maintainers;

     

       6
       6
       -
         inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep;

     

       8
       8
       +
         cfg = migrateOldAttrs config.services.dokuwiki;

     

       9
       9
       +
         eachSite = cfg.sites;

     

       10
       10
       +
         user = "dokuwiki";

     

       11
       11
       +
         webserver = config.services.${cfg.webserver};

     

       12
       12
       +
         stateDir = hostName: "/var/lib/dokuwiki/${hostName}/data";

     

       7
       13
        
       

     

       8
       8
       -
         eachSite = config.services.dokuwiki;

     

       14
       14
       +
         # Migrate config.services.dokuwiki.<hostName> to config.services.dokuwiki.sites.<hostName>

     

       15
       15
       +
         oldSites = filterAttrs (o: _: o != "sites" && o != "webserver");

     

       16
       16
       +
         migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; };

     

       9
       17
        
       

     

       10
       10
       -
         user = "dokuwiki";

     

       11
       11
       -
         group = config.services.nginx.group;

     

       12
       12
       -
       

     

       13
       13
       -
         dokuwikiAclAuthConfig = cfg: pkgs.writeText "acl.auth.php" ''

     

       18
       18
       +
         dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" ''

     

       14
       19
        
           # acl.auth.php

     

       15
       20
        
           # <?php exit()?>

     

       16
       21
        
           #

     
···

       19
       24
        
           ${toString cfg.acl}

     

       20
       25
        
         '';

     

       21
       26
        
       

     

       22
       22
       -
         dokuwikiLocalConfig = cfg: pkgs.writeText "local.php" ''

     

       27
       27
       +
         dokuwikiLocalConfig = hostName: cfg: pkgs.writeText "local-${hostName}.php" ''

     

       23
       28
        
           <?php

     

       24
       29
        
           $conf['savedir'] = '${cfg.stateDir}';

     

       25
       30
        
           $conf['superuser'] = '${toString cfg.superUser}';

     
···

       28
       33
        
           ${toString cfg.extraConfig}

     

       29
       34
        
         '';

     

       30
       35
        
       

     

       31
       31
       -
         dokuwikiPluginsLocalConfig = cfg: pkgs.writeText "plugins.local.php" ''

     

       36
       36
       +
         dokuwikiPluginsLocalConfig = hostName: cfg: pkgs.writeText "plugins.local-${hostName}.php" ''

     

       32
       37
        
           <?php

     

       33
       38
        
           ${cfg.pluginsConfig}

     

       34
       39
        
         '';

     

       40
       40
       +
       

     

       35
       41
        
       

     

       36
       42
        
         pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec {

     

       37
       43
        
           pname = "dokuwiki-${hostName}";

     
···

       43
       49
        
             cp -r * $out/

     

       44
       50
        
       

     

       45
       51
        
             # symlink the dokuwiki config

     

       46
       46
       -
             ln -s ${dokuwikiLocalConfig cfg} $out/share/dokuwiki/local.php

     

       52
       52
       +
             ln -s ${dokuwikiLocalConfig hostName cfg} $out/share/dokuwiki/local.php

     

       47
       53
        
       

     

       48
       54
        
             # symlink plugins config

     

       49
       49
       -
             ln -s ${dokuwikiPluginsLocalConfig cfg} $out/share/dokuwiki/plugins.local.php

     

       55
       55
       +
             ln -s ${dokuwikiPluginsLocalConfig hostName cfg} $out/share/dokuwiki/plugins.local.php

     

       50
       56
        
       

     

       51
       57
        
             # symlink acl

     

       52
       52
       -
             ln -s ${dokuwikiAclAuthConfig cfg} $out/share/dokuwiki/acl.auth.php

     

       58
       58
       +
             ln -s ${dokuwikiAclAuthConfig hostName cfg} $out/share/dokuwiki/acl.auth.php

     

       53
       59
        
       

     

       54
       60
        
             # symlink additional plugin(s) and templates(s)

     

       55
       61
        
             ${concatMapStringsSep "\n" (template: "ln -s ${template} $out/share/dokuwiki/lib/tpl/${template.name}") cfg.templates}

     
···

       57
       63
        
           '';

     

       58
       64
        
         };

     

       59
       65
        
       

     

       60
       60
       -
         siteOpts = { config, lib, name, ...}: {

     

       61
       61
       -
           options = {

     

       62
       62
       -
             enable = mkEnableOption "DokuWiki web application.";

     

       63
       63
       -
       

     

       64
       64
       -
             package = mkOption {

     

       65
       65
       -
               type = types.package;

     

       66
       66
       -
               default = pkgs.dokuwiki;

     

       67
       67
       -
               description = "Which dokuwiki package to use.";

     

       68
       68
       -
             };

     

       69
       69
       -
       

     

       70
       70
       -
             hostName = mkOption {

     

       71
       71
       -
               type = types.str;

     

       72
       72
       -
               default = "localhost";

     

       73
       73
       -
               description = "FQDN for the instance.";

     

       74
       74
       -
             };

     

       75
       75
       -
       

     

       76
       76
       -
             stateDir = mkOption {

     

       77
       77
       -
               type = types.path;

     

       78
       78
       -
               default = "/var/lib/dokuwiki/${name}/data";

     

       79
       79
       -
               description = "Location of the dokuwiki state directory.";

     

       80
       80
       -
             };

     

       66
       66
       +
         siteOpts = { config, lib, name, ... }:

     

       67
       67
       +
           {

     

       68
       68
       +
             options = {

     

       69
       69
       +
               package = mkOption {

     

       70
       70
       +
                 type = types.package;

     

       71
       71
       +
                 default = pkgs.dokuwiki;

     

       72
       72
       +
                 description = "Which DokuWiki package to use.";

     

       73
       73
       +
               };

     

       81
       74
        
       

     

       82
       82
       -
             acl = mkOption {

     

       83
       83
       -
               type = types.nullOr types.lines;

     

       84
       84
       -
               default = null;

     

       85
       85
       -
               example = "*               @ALL               8";

     

       86
       86
       -
               description = ''

     

       87
       87
       -
                 Access Control Lists: see <link xlink:href="https://www.dokuwiki.org/acl"/>

     

       88
       88
       -
                 Mutually exclusive with services.dokuwiki.aclFile

     

       89
       89
       -
                 Set this to a value other than null to take precedence over aclFile option.

     

       75
       75
       +
               stateDir = mkOption {

     

       76
       76
       +
                 type = types.path;

     

       77
       77
       +
                 default = "/var/lib/dokuwiki/${name}/data";

     

       78
       78
       +
                 description = "Location of the DokuWiki state directory.";

     

       79
       79
       +
               };

     

       90
       80
        
       

     

       91
       91
       -
                 Warning: Consider using aclFile instead if you do not

     

       92
       92
       -
                 want to store the ACL in the world-readable Nix store.

     

       93
       93
       -
               '';

     

       94
       94
       -
             };

     

       81
       81
       +
               acl = mkOption {

     

       82
       82
       +
                 type = types.nullOr types.lines;

     

       83
       83
       +
                 default = null;

     

       84
       84
       +
                 example = "*               @ALL               8";

     

       85
       85
       +
                 description = ''

     

       86
       86
       +
                   Access Control Lists: see <link xlink:href="https://www.dokuwiki.org/acl"/>

     

       87
       87
       +
                   Mutually exclusive with services.dokuwiki.aclFile

     

       88
       88
       +
                   Set this to a value other than null to take precedence over aclFile option.

     

       95
       89
        
       

     

       96
       96
       -
             aclFile = mkOption {

     

       97
       97
       -
               type = with types; nullOr str;

     

       98
       98
       -
               default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null;

     

       99
       99
       -
               description = ''

     

       100
       100
       -
                 Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl

     

       101
       101
       -
                 Mutually exclusive with services.dokuwiki.acl which is preferred.

     

       102
       102
       -
                 Consult documentation <link xlink:href="https://www.dokuwiki.org/acl"/> for further instructions.

     

       103
       103
       -
                 Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist"/>

     

       104
       104
       -
               '';

     

       105
       105
       -
               example = "/var/lib/dokuwiki/${name}/acl.auth.php";

     

       106
       106
       -
             };

     

       90
       90
       +
                   Warning: Consider using aclFile instead if you do not

     

       91
       91
       +
                   want to store the ACL in the world-readable Nix store.

     

       92
       92
       +
                 '';

     

       93
       93
       +
               };

     

       107
       94
        
       

     

       108
       108
       -
             aclUse = mkOption {

     

       109
       109
       -
               type = types.bool;

     

       110
       110
       -
               default = true;

     

       111
       111
       -
               description = ''

     

       112
       112
       -
                 Necessary for users to log in into the system.

     

       113
       113
       -
                 Also limits anonymous users. When disabled,

     

       114
       114
       -
                 everyone is able to create and edit content.

     

       115
       115
       -
               '';

     

       116
       116
       -
             };

     

       95
       95
       +
               aclFile = mkOption {

     

       96
       96
       +
                 type = with types; nullOr str;

     

       97
       97
       +
                 default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null;

     

       98
       98
       +
                 description = ''

     

       99
       99
       +
                   Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl

     

       100
       100
       +
                   Mutually exclusive with services.dokuwiki.acl which is preferred.

     

       101
       101
       +
                   Consult documentation <link xlink:href="https://www.dokuwiki.org/acl"/> for further instructions.

     

       102
       102
       +
                   Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist"/>

     

       103
       103
       +
                 '';

     

       104
       104
       +
                 example = "/var/lib/dokuwiki/${name}/acl.auth.php";

     

       105
       105
       +
               };

     

       117
       106
        
       

     

       118
       118
       -
             pluginsConfig = mkOption {

     

       119
       119
       -
               type = types.lines;

     

       120
       120
       -
               default = ''

     

       121
       121
       -
                 $plugins['authad'] = 0;

     

       122
       122
       -
                 $plugins['authldap'] = 0;

     

       123
       123
       -
                 $plugins['authmysql'] = 0;

     

       124
       124
       -
                 $plugins['authpgsql'] = 0;

     

       125
       125
       -
               '';

     

       126
       126
       -
               description = ''

     

       127
       127
       -
                 List of the dokuwiki (un)loaded plugins.

     

       128
       128
       -
               '';

     

       129
       129
       -
             };

     

       107
       107
       +
               aclUse = mkOption {

     

       108
       108
       +
                 type = types.bool;

     

       109
       109
       +
                 default = true;

     

       110
       110
       +
                 description = ''

     

       111
       111
       +
                   Necessary for users to log in into the system.

     

       112
       112
       +
                   Also limits anonymous users. When disabled,

     

       113
       113
       +
                   everyone is able to create and edit content.

     

       114
       114
       +
                 '';

     

       115
       115
       +
               };

     

       130
       116
        
       

     

       131
       131
       -
             superUser = mkOption {

     

       132
       132
       -
               type = types.nullOr types.str;

     

       133
       133
       -
               default = "@admin";

     

       134
       134
       -
               description = ''

     

       135
       135
       -
                 You can set either a username, a list of usernames (“admin1,admin2”),

     

       136
       136
       -
                 or the name of a group by prepending an @ char to the groupname

     

       137
       137
       -
                 Consult documentation <link xlink:href="https://www.dokuwiki.org/config:superuser"/> for further instructions.

     

       138
       138
       -
               '';

     

       139
       139
       -
             };

     

       117
       117
       +
               pluginsConfig = mkOption {

     

       118
       118
       +
                 type = types.lines;

     

       119
       119
       +
                 default = ''

     

       120
       120
       +
                   $plugins['authad'] = 0;

     

       121
       121
       +
                   $plugins['authldap'] = 0;

     

       122
       122
       +
                   $plugins['authmysql'] = 0;

     

       123
       123
       +
                   $plugins['authpgsql'] = 0;

     

       124
       124
       +
                 '';

     

       125
       125
       +
                 description = ''

     

       126
       126
       +
                   List of the dokuwiki (un)loaded plugins.

     

       127
       127
       +
                 '';

     

       128
       128
       +
               };

     

       140
       129
        
       

     

       141
       141
       -
             usersFile = mkOption {

     

       142
       142
       -
               type = with types; nullOr str;

     

       143
       143
       -
               default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null;

     

       144
       144
       -
               description = ''

     

       145
       145
       -
                 Location of the dokuwiki users file. List of users. Format:

     

       146
       146
       -
                 login:passwordhash:Real Name:email:groups,comma,separated

     

       147
       147
       -
                 Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1`

     

       148
       148
       -
                 Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/users.auth.php.dist"/>

     

       130
       130
       +
               superUser = mkOption {

     

       131
       131
       +
                 type = types.nullOr types.str;

     

       132
       132
       +
                 default = "@admin";

     

       133
       133
       +
                 description = ''

     

       134
       134
       +
                   You can set either a username, a list of usernames (“admin1,admin2”),

     

       135
       135
       +
                   or the name of a group by prepending an @ char to the groupname

     

       136
       136
       +
                   Consult documentation <link xlink:href="https://www.dokuwiki.org/config:superuser"/> for further instructions.

     

       149
       137
        
                 '';

     

       150
       150
       -
               example = "/var/lib/dokuwiki/${name}/users.auth.php";

     

       151
       151
       -
             };

     

       138
       138
       +
               };

     

       152
       139
        
       

     

       153
       153
       -
             disableActions = mkOption {

     

       154
       154
       -
               type = types.nullOr types.str;

     

       155
       155
       -
               default = "";

     

       156
       156
       -
               example = "search,register";

     

       157
       157
       -
               description = ''

     

       158
       158
       -
                 Disable individual action modes. Refer to

     

       159
       159
       -
                 <link xlink:href="https://www.dokuwiki.org/config:action_modes"/>

     

       160
       160
       -
                 for details on supported values.

     

       161
       161
       -
               '';

     

       162
       162
       -
             };

     

       140
       140
       +
               usersFile = mkOption {

     

       141
       141
       +
                 type = with types; nullOr str;

     

       142
       142
       +
                 default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null;

     

       143
       143
       +
                 description = ''

     

       144
       144
       +
                   Location of the dokuwiki users file. List of users. Format:

     

       145
       145
       +
                   login:passwordhash:Real Name:email:groups,comma,separated

     

       146
       146
       +
                   Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1`

     

       147
       147
       +
                   Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/users.auth.php.dist"/>

     

       148
       148
       +
                   '';

     

       149
       149
       +
                 example = "/var/lib/dokuwiki/${name}/users.auth.php";

     

       150
       150
       +
               };

     

       163
       151
        
       

     

       164
       164
       -
             extraConfig = mkOption {

     

       165
       165
       -
               type = types.nullOr types.lines;

     

       166
       166
       -
               default = null;

     

       167
       167
       -
               example = ''

     

       168
       168
       -
                 $conf['title'] = 'My Wiki';

     

       169
       169
       -
                 $conf['userewrite'] = 1;

     

       170
       170
       -
               '';

     

       171
       171
       -
               description = ''

     

       172
       172
       -
                 DokuWiki configuration. Refer to

     

       173
       173
       -
                 <link xlink:href="https://www.dokuwiki.org/config"/>

     

       174
       174
       -
                 for details on supported values.

     

       175
       175
       -
               '';

     

       176
       176
       -
             };

     

       152
       152
       +
               disableActions = mkOption {

     

       153
       153
       +
                 type = types.nullOr types.str;

     

       154
       154
       +
                 default = "";

     

       155
       155
       +
                 example = "search,register";

     

       156
       156
       +
                 description = ''

     

       157
       157
       +
                   Disable individual action modes. Refer to

     

       158
       158
       +
                   <link xlink:href="https://www.dokuwiki.org/config:action_modes"/>

     

       159
       159
       +
                   for details on supported values.

     

       160
       160
       +
                 '';

     

       161
       161
       +
               };

     

       177
       162
        
       

     

       178
       178
       -
             plugins = mkOption {

     

       179
       179
       -
               type = types.listOf types.path;

     

       180
       180
       -
               default = [];

     

       181
       181
       -
               description = ''

     

       182
       182
       -
                     List of path(s) to respective plugin(s) which are copied from the 'plugin' directory.

     

       183
       183
       -
                     <note><para>These plugins need to be packaged before use, see example.</para></note>

     

       184
       184
       -
               '';

     

       185
       185
       -
               example = ''

     

       186
       186
       -
                     # Let's package the icalevents plugin

     

       187
       187
       -
                     plugin-icalevents = pkgs.stdenv.mkDerivation {

     

       188
       188
       -
                       name = "icalevents";

     

       189
       189
       -
                       # Download the plugin from the dokuwiki site

     

       190
       190
       -
                       src = pkgs.fetchurl {

     

       191
       191
       -
                         url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";

     

       192
       192
       -
                         sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";

     

       163
       163
       +
               plugins = mkOption {

     

       164
       164
       +
                 type = types.listOf types.path;

     

       165
       165
       +
                 default = [];

     

       166
       166
       +
                 description = ''

     

       167
       167
       +
                       List of path(s) to respective plugin(s) which are copied from the 'plugin' directory.

     

       168
       168
       +
                       <note><para>These plugins need to be packaged before use, see example.</para></note>

     

       169
       169
       +
                 '';

     

       170
       170
       +
                 example = ''

     

       171
       171
       +
                       # Let's package the icalevents plugin

     

       172
       172
       +
                       plugin-icalevents = pkgs.stdenv.mkDerivation {

     

       173
       173
       +
                         name = "icalevents";

     

       174
       174
       +
                         # Download the plugin from the dokuwiki site

     

       175
       175
       +
                         src = pkgs.fetchurl {

     

       176
       176
       +
                           url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip";

     

       177
       177
       +
                           sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";

     

       178
       178
       +
                         };

     

       179
       179
       +
                         sourceRoot = ".";

     

       180
       180
       +
                         # We need unzip to build this package

     

       181
       181
       +
                         buildInputs = [ pkgs.unzip ];

     

       182
       182
       +
                         # Installing simply means copying all files to the output directory

     

       183
       183
       +
                         installPhase = "mkdir -p $out; cp -R * $out/";

     

       193
       184
        
                       };

     

       194
       194
       -
                       sourceRoot = ".";

     

       195
       195
       -
                       # We need unzip to build this package

     

       196
       196
       -
                       nativeBuildInputs = [ pkgs.unzip ];

     

       197
       197
       -
                       # Installing simply means copying all files to the output directory

     

       198
       198
       -
                       installPhase = "mkdir -p $out; cp -R * $out/";

     

       199
       199
       -
                     };

     

       200
       185
        
       

     

       201
       201
       -
                     # And then pass this theme to the plugin list like this:

     

       202
       202
       -
                     plugins = [ plugin-icalevents ];

     

       203
       203
       -
               '';

     

       204
       204
       -
             };

     

       186
       186
       +
                       # And then pass this theme to the plugin list like this:

     

       187
       187
       +
                       plugins = [ plugin-icalevents ];

     

       188
       188
       +
                 '';

     

       189
       189
       +
               };

     

       205
       190
        
       

     

       206
       206
       -
             templates = mkOption {

     

       207
       207
       -
               type = types.listOf types.path;

     

       208
       208
       -
               default = [];

     

       209
       209
       -
               description = ''

     

       210
       210
       -
                     List of path(s) to respective template(s) which are copied from the 'tpl' directory.

     

       211
       211
       -
                     <note><para>These templates need to be packaged before use, see example.</para></note>

     

       212
       212
       -
               '';

     

       213
       213
       -
               example = ''

     

       214
       214
       -
                     # Let's package the bootstrap3 theme

     

       215
       215
       -
                     template-bootstrap3 = pkgs.stdenv.mkDerivation {

     

       216
       216
       -
                       name = "bootstrap3";

     

       217
       217
       -
                       # Download the theme from the dokuwiki site

     

       218
       218
       -
                       src = pkgs.fetchurl {

     

       219
       219
       -
                         url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";

     

       220
       220
       -
                         sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";

     

       191
       191
       +
               templates = mkOption {

     

       192
       192
       +
                 type = types.listOf types.path;

     

       193
       193
       +
                 default = [];

     

       194
       194
       +
                 description = ''

     

       195
       195
       +
                       List of path(s) to respective template(s) which are copied from the 'tpl' directory.

     

       196
       196
       +
                       <note><para>These templates need to be packaged before use, see example.</para></note>

     

       197
       197
       +
                 '';

     

       198
       198
       +
                 example = ''

     

       199
       199
       +
                       # Let's package the bootstrap3 theme

     

       200
       200
       +
                       template-bootstrap3 = pkgs.stdenv.mkDerivation {

     

       201
       201
       +
                         name = "bootstrap3";

     

       202
       202
       +
                         # Download the theme from the dokuwiki site

     

       203
       203
       +
                         src = pkgs.fetchurl {

     

       204
       204
       +
                           url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip";

     

       205
       205
       +
                           sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";

     

       206
       206
       +
                         };

     

       207
       207
       +
                         # We need unzip to build this package

     

       208
       208
       +
                         buildInputs = [ pkgs.unzip ];

     

       209
       209
       +
                         # Installing simply means copying all files to the output directory

     

       210
       210
       +
                         installPhase = "mkdir -p $out; cp -R * $out/";

     

       221
       211
        
                       };

     

       222
       222
       -
                       # We need unzip to build this package

     

       223
       223
       -
                       nativeBuildInputs = [ pkgs.unzip ];

     

       224
       224
       -
                       # Installing simply means copying all files to the output directory

     

       225
       225
       -
                       installPhase = "mkdir -p $out; cp -R * $out/";

     

       226
       226
       -
                     };

     

       227
       212
        
       

     

       228
       228
       -
                     # And then pass this theme to the template list like this:

     

       229
       229
       -
                     templates = [ template-bootstrap3 ];

     

       230
       230
       -
               '';

     

       231
       231
       -
             };

     

       213
       213
       +
                       # And then pass this theme to the template list like this:

     

       214
       214
       +
                       templates = [ template-bootstrap3 ];

     

       215
       215
       +
                 '';

     

       216
       216
       +
               };

     

       232
       217
        
       

     

       233
       233
       -
             poolConfig = mkOption {

     

       234
       234
       -
               type = with types; attrsOf (oneOf [ str int bool ]);

     

       235
       235
       -
               default = {

     

       236
       236
       -
                 "pm" = "dynamic";

     

       237
       237
       -
                 "pm.max_children" = 32;

     

       238
       238
       -
                 "pm.start_servers" = 2;

     

       239
       239
       -
                 "pm.min_spare_servers" = 2;

     

       240
       240
       -
                 "pm.max_spare_servers" = 4;

     

       241
       241
       -
                 "pm.max_requests" = 500;

     

       218
       218
       +
               poolConfig = mkOption {

     

       219
       219
       +
                 type = with types; attrsOf (oneOf [ str int bool ]);

     

       220
       220
       +
                 default = {

     

       221
       221
       +
                   "pm" = "dynamic";

     

       222
       222
       +
                   "pm.max_children" = 32;

     

       223
       223
       +
                   "pm.start_servers" = 2;

     

       224
       224
       +
                   "pm.min_spare_servers" = 2;

     

       225
       225
       +
                   "pm.max_spare_servers" = 4;

     

       226
       226
       +
                   "pm.max_requests" = 500;

     

       227
       227
       +
                 };

     

       228
       228
       +
                 description = ''

     

       229
       229
       +
                   Options for the DokuWiki PHP pool. See the documentation on <literal>php-fpm.conf</literal>

     

       230
       230
       +
                   for details on configuration directives.

     

       231
       231
       +
                 '';

     

       242
       232
        
               };

     

       243
       243
       -
               description = ''

     

       244
       244
       -
                 Options for the dokuwiki PHP pool. See the documentation on <literal>php-fpm.conf</literal>

     

       245
       245
       -
                 for details on configuration directives.

     

       246
       246
       -
               '';

     

       247
       247
       -
             };

     

       248
       233
        
       

     

       249
       249
       -
             nginx = mkOption {

     

       250
       250
       -
               type = types.submodule (

     

       251
       251
       -
                 recursiveUpdate

     

       252
       252
       -
                   (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}

     

       253
       253
       -
               );

     

       254
       254
       -
               default = {};

     

       255
       255
       -
               example = {

     

       256
       256
       -
                 serverAliases = [

     

       257
       257
       -
                   "wiki.\${config.networking.domain}"

     

       258
       258
       -
                 ];

     

       259
       259
       -
                 # To enable encryption and let let's encrypt take care of certificate

     

       260
       260
       -
                 forceSSL = true;

     

       261
       261
       -
                 enableACME = true;

     

       234
       234
       +
               extraConfig = mkOption {

     

       235
       235
       +
                 type = types.nullOr types.lines;

     

       236
       236
       +
                 default = null;

     

       237
       237
       +
                 example = ''

     

       238
       238
       +
                   $conf['title'] = 'My Wiki';

     

       239
       239
       +
                   $conf['userewrite'] = 1;

     

       240
       240
       +
                 '';

     

       241
       241
       +
                 description = ''

     

       242
       242
       +
                   DokuWiki configuration. Refer to

     

       243
       243
       +
                   <link xlink:href="https://www.dokuwiki.org/config"/>

     

       244
       244
       +
                   for details on supported values.

     

       245
       245
       +
                 '';

     

       262
       246
        
               };

     

       263
       263
       -
               description = ''

     

       264
       264
       -
                 With this option, you can customize the nginx virtualHost settings.

     

       265
       265
       -
               '';

     

       247
       247
       +
       

     

       266
       248
        
             };

     

       249
       249
       +
       

     

       267
       250
        
           };

     

       268
       268
       -
         };

     

       269
       251
        
       in

     

       270
       252
        
       {

     

       271
       253
        
         # interface

     

       272
       254
        
         options = {

     

       273
       255
        
           services.dokuwiki = mkOption {

     

       274
       274
       -
             type = types.attrsOf (types.submodule siteOpts);

     

       256
       256
       +
             type = types.submodule {

     

       257
       257
       +
               # Used to support old interface

     

       258
       258
       +
               freeformType = types.attrsOf (types.submodule siteOpts);

     

       259
       259
       +
       

     

       260
       260
       +
               # New interface

     

       261
       261
       +
               options.sites = mkOption {

     

       262
       262
       +
                 type = types.attrsOf (types.submodule siteOpts);

     

       263
       263
       +
                 default = {};

     

       264
       264
       +
                 description = "Specification of one or more DokuWiki sites to serve";

     

       265
       265
       +
               };

     

       266
       266
       +
       

     

       267
       267
       +
               options.webserver = mkOption {

     

       268
       268
       +
                 type = types.enum [ "nginx" "caddy" ];

     

       269
       269
       +
                 default = "nginx";

     

       270
       270
       +
                 description = ''

     

       271
       271
       +
                   Whether to use nginx or caddy for virtual host management.

     

       272
       272
       +
       

     

       273
       273
       +
                   Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.&lt;name&gt;</literal>.

     

       274
       274
       +
                   See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.

     

       275
       275
       +
       

     

       276
       276
       +
                   Further apache2 configuration can be done by adapting <literal>services.httpd.virtualHosts.&lt;name&gt;</literal>.

     

       277
       277
       +
                   See <xref linkend="opt-services.httpd.virtualHosts"/> for further information.

     

       278
       278
       +
                 '';

     

       279
       279
       +
               };

     

       280
       280
       +
             };

     

       275
       281
        
             default = {};

     

       276
       276
       -
             description = "Sepcification of one or more dokuwiki sites to serve.";

     

       282
       282
       +
             description = "DokuWiki configuration";

     

       277
       283
        
           };

     

       284
       284
       +
       

     

       278
       285
        
         };

     

       279
       286
        
       

     

       280
       287
        
         # implementation

     

       281
       281
       -
       

     

       282
       282
       -
         config = mkIf (eachSite != {}) {

     

       283
       283
       -
       

     

       284
       284
       -
           warnings = mapAttrsToList (hostName: cfg: mkIf (cfg.superUser == null) "Not setting services.dokuwiki.${hostName} superUser will impair your ability to administer DokuWiki") eachSite;

     

       288
       288
       +
         config = mkIf (eachSite != {}) (mkMerge [{

     

       285
       289
        
       

     

       286
       290
        
           assertions = flatten (mapAttrsToList (hostName: cfg:

     

       287
       291
        
           [{

     

       288
       292
        
             assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null);

     

       289
       289
       -
             message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory if aclUse true";

     

       293
       293
       +
             message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if aclUse true";

     

       290
       294
        
           }

     

       291
       295
        
           {

     

       292
       296
        
             assertion = cfg.usersFile != null -> cfg.aclUse != false;

     

       293
       293
       -
             message = "services.dokuwiki.${hostName}.aclUse must must be true if usersFile is not null";

     

       297
       297
       +
             message = "services.dokuwiki.sites.${hostName}.aclUse must must be true if usersFile is not null";

     

       294
       298
        
           }

     

       295
       299
        
           ]) eachSite);

     

       296
       300
        
       

     

       301
       301
       +
           warnings = mapAttrsToList (hostName: _: ''services.dokuwiki."${hostName}" is deprecated use services.dokuwiki.sites."${hostName}"'') (oldSites cfg);

     

       302
       302
       +
       

     

       297
       303
        
           services.phpfpm.pools = mapAttrs' (hostName: cfg: (

     

       298
       304
        
             nameValuePair "dokuwiki-${hostName}" {

     

       299
       305
        
               inherit user;

     

       300
       300
       -
               inherit group;

     

       306
       306
       +
               group = webserver.group;

     

       307
       307
       +
       

     

       301
       308
        
               phpEnv = {

     

       302
       302
       -
                 DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}";

     

       303
       303
       -
                 DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}";

     

       309
       309
       +
                 DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}";

     

       310
       310
       +
                 DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}";

     

       304
       311
        
               } // optionalAttrs (cfg.usersFile != null) {

     

       305
       312
        
                 DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}";

     

       306
       313
        
               } //optionalAttrs (cfg.aclUse) {

     

       307
       307
       -
                 DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}";

     

       314
       314
       +
                 DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig hostName cfg}" else "${toString cfg.aclFile}";

     

       308
       315
        
               };

     

       309
       316
        
       

     

       310
       317
        
               settings = {

     

       311
       311
       -
                 "listen.mode" = "0660";

     

       312
       312
       -
                 "listen.owner" = user;

     

       313
       313
       -
                 "listen.group" = group;

     

       318
       318
       +
                 "listen.owner" = webserver.user;

     

       319
       319
       +
                 "listen.group" = webserver.group;

     

       314
       320
        
               } // cfg.poolConfig;

     

       315
       315
       -
             })) eachSite;

     

       321
       321
       +
             }

     

       322
       322
       +
           )) eachSite;

     

       323
       323
       +
       

     

       324
       324
       +
         }

     

       325
       325
       +
       

     

       326
       326
       +
         {

     

       327
       327
       +
           systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [

     

       328
       328
       +
             "d ${stateDir hostName}/attic 0750 ${user} ${webserver.group} - -"

     

       329
       329
       +
             "d ${stateDir hostName}/cache 0750 ${user} ${webserver.group} - -"

     

       330
       330
       +
             "d ${stateDir hostName}/index 0750 ${user} ${webserver.group} - -"

     

       331
       331
       +
             "d ${stateDir hostName}/locks 0750 ${user} ${webserver.group} - -"

     

       332
       332
       +
             "d ${stateDir hostName}/media 0750 ${user} ${webserver.group} - -"

     

       333
       333
       +
             "d ${stateDir hostName}/media_attic 0750 ${user} ${webserver.group} - -"

     

       334
       334
       +
             "d ${stateDir hostName}/media_meta 0750 ${user} ${webserver.group} - -"

     

       335
       335
       +
             "d ${stateDir hostName}/meta 0750 ${user} ${webserver.group} - -"

     

       336
       336
       +
             "d ${stateDir hostName}/pages 0750 ${user} ${webserver.group} - -"

     

       337
       337
       +
             "d ${stateDir hostName}/tmp 0750 ${user} ${webserver.group} - -"

     

       338
       338
       +
           ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist"

     

       339
       339
       +
           ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist"

     

       340
       340
       +
           ) eachSite);

     

       341
       341
       +
       

     

       342
       342
       +
           users.users.${user} = {

     

       343
       343
       +
             group = webserver.group;

     

       344
       344
       +
             isSystemUser = true;

     

       345
       345
       +
           };

     

       346
       346
       +
         }

     

       316
       347
        
       

     

       348
       348
       +
         (mkIf (cfg.webserver == "nginx") {

     

       317
       349
        
           services.nginx = {

     

       318
       350
        
             enable = true;

     

       319
       319
       -
             virtualHosts = mapAttrs (hostName: cfg:  mkMerge [ cfg.nginx {

     

       320
       320
       -
               root = mkForce "${pkg hostName cfg}/share/dokuwiki";

     

       321
       321
       -
               extraConfig = lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";

     

       351
       351
       +
             virtualHosts = mapAttrs (hostName: cfg: {

     

       352
       352
       +
               serverName = mkDefault hostName;

     

       353
       353
       +
               root = "${pkg hostName cfg}/share/dokuwiki";

     

       322
       354
        
       

     

       323
       323
       -
               locations."~ /(conf/|bin/|inc/|install.php)" = {

     

       324
       324
       -
                 extraConfig = "deny all;";

     

       325
       325
       -
               };

     

       355
       355
       +
               locations = {

     

       356
       356
       +
                 "~ /(conf/|bin/|inc/|install.php)" = {

     

       357
       357
       +
                   extraConfig = "deny all;";

     

       358
       358
       +
                 };

     

       326
       359
        
       

     

       327
       327
       -
               locations."~ ^/data/" = {

     

       328
       328
       -
                 root = "${cfg.stateDir}";

     

       329
       329
       -
                 extraConfig = "internal;";

     

       330
       330
       -
               };

     

       360
       360
       +
                 "~ ^/data/" = {

     

       361
       361
       +
                   root = "${stateDir hostName}";

     

       362
       362
       +
                   extraConfig = "internal;";

     

       363
       363
       +
                 };

     

       331
       364
        
       

     

       332
       332
       -
               locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = {

     

       333
       333
       -
                 extraConfig = "expires 365d;";

     

       334
       334
       -
               };

     

       365
       365
       +
                 "~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = {

     

       366
       366
       +
                   extraConfig = "expires 365d;";

     

       367
       367
       +
                 };

     

       335
       368
        
       

     

       336
       336
       -
               locations."/" = {

     

       337
       337
       -
                 priority = 1;

     

       338
       338
       -
                 index = "doku.php";

     

       339
       339
       -
                 extraConfig = "try_files $uri $uri/ @dokuwiki;";

     

       340
       340
       -
               };

     

       369
       369
       +
                 "/" = {

     

       370
       370
       +
                   priority = 1;

     

       371
       371
       +
                   index = "doku.php";

     

       372
       372
       +
                   extraConfig = ''try_files $uri $uri/ @dokuwiki;'';

     

       373
       373
       +
                 };

     

       341
       374
        
       

     

       342
       342
       -
               locations."@dokuwiki" = {

     

       343
       343
       -
                 extraConfig = ''

     

       375
       375
       +
                 "@dokuwiki" = {

     

       376
       376
       +
                   extraConfig = ''

     

       344
       377
        
                     # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki config page

     

       345
       378
        
                     rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;

     

       346
       379
        
                     rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;

     

       347
       380
        
                     rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;

     

       348
       381
        
                     rewrite ^/(.*) /doku.php?id=$1&$args last;

     

       349
       349
       -
                 '';

     

       350
       350
       -
               };

     

       382
       382
       +
                   '';

     

       383
       383
       +
                 };

     

       351
       384
        
       

     

       352
       352
       -
               locations."~ \\.php$" = {

     

       353
       353
       -
                 extraConfig = ''

     

       385
       385
       +
                 "~ \\.php$" = {

     

       386
       386
       +
                   extraConfig = ''

     

       354
       387
        
                     try_files $uri $uri/ /doku.php;

     

       355
       388
        
                     include ${pkgs.nginx}/conf/fastcgi_params;

     

       356
       389
        
                     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

     

       357
       390
        
                     fastcgi_param REDIRECT_STATUS 200;

     

       358
       391
        
                     fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};

     

       359
       359
       -
                     ${lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}

     

       360
       360
       -
                 '';

     

       392
       392
       +
                     '';

     

       393
       393
       +
                 };

     

       394
       394
       +
       

     

       361
       395
        
               };

     

       362
       362
       -
             }]) eachSite;

     

       396
       396
       +
             }) eachSite;

     

       363
       397
        
           };

     

       398
       398
       +
         })

     

       364
       399
        
       

     

       365
       365
       -
           systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [

     

       366
       366
       -
             "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -"

     

       367
       367
       -
             "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -"

     

       368
       368
       -
             "d ${cfg.stateDir}/index 0750 ${user} ${group} - -"

     

       369
       369
       -
             "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -"

     

       370
       370
       -
             "d ${cfg.stateDir}/media 0750 ${user} ${group} - -"

     

       371
       371
       -
             "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -"

     

       372
       372
       -
             "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -"

     

       373
       373
       -
             "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -"

     

       374
       374
       -
             "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -"

     

       375
       375
       -
             "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -"

     

       376
       376
       -
           ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist"

     

       377
       377
       -
           ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist"

     

       378
       378
       -
           ) eachSite);

     

       400
       400
       +
         (mkIf (cfg.webserver == "caddy") {

     

       401
       401
       +
           services.caddy = {

     

       402
       402
       +
             enable = true;

     

       403
       403
       +
             virtualHosts = mapAttrs' (hostName: cfg: (

     

       404
       404
       +
               nameValuePair "http://${hostName}" {

     

       405
       405
       +
                 extraConfig = ''

     

       406
       406
       +
                   root * ${pkg hostName cfg}/share/dokuwiki

     

       407
       407
       +
                   file_server

     

       379
       408
        
       

     

       380
       380
       -
           users.users.${user} = {

     

       381
       381
       -
             group = group;

     

       382
       382
       -
             isSystemUser = true;

     

       409
       409
       +
                   encode zstd gzip

     

       410
       410
       +
                   php_fastcgi unix/${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}

     

       411
       411
       +
       

     

       412
       412
       +
                   @restrict_files {

     

       413
       413
       +
                     path /data/* /conf/* /bin/* /inc/* /vendor/* /install.php

     

       414
       414
       +
                   }

     

       415
       415
       +
       

     

       416
       416
       +
                   respond @restrict_files 404

     

       417
       417
       +
       

     

       418
       418
       +
                   @allow_media {

     

       419
       419
       +
                     path_regexp path ^/_media/(.*)$

     

       420
       420
       +
                   }

     

       421
       421
       +
                   rewrite @allow_media /lib/exe/fetch.php?media=/{http.regexp.path.1}

     

       422
       422
       +
       

     

       423
       423
       +
                   @allow_detail   {

     

       424
       424
       +
                     path /_detail*

     

       425
       425
       +
                   }

     

       426
       426
       +
                   rewrite @allow_detail /lib/exe/detail.php?media={path}

     

       427
       427
       +
       

     

       428
       428
       +
                   @allow_export   {

     

       429
       429
       +
                     path /_export*

     

       430
       430
       +
                     path_regexp export /([^/]+)/(.*)

     

       431
       431
       +
                   }

     

       432
       432
       +
                   rewrite @allow_export /doku.php?do=export_{http.regexp.export.1}&id={http.regexp.export.2}

     

       433
       433
       +
       

     

       434
       434
       +
                   try_files {path} {path}/ /doku.php?id={path}&{query}

     

       435
       435
       +
                 '';

     

       436
       436
       +
               }

     

       437
       437
       +
             )) eachSite;

     

       383
       438
        
           };

     

       384
       384
       -
         };

     

       439
       439
       +
         })

     

       385
       440
        
       

     

       386
       386
       -
         meta.maintainers = with maintainers; [ _1000101 ];

     

       441
       441
       +
         ]);

     

       387
       442
        
       

     

       443
       443
       +
         meta.maintainers = with maintainers; [

     

       444
       444
       +
           _1000101

     

       445
       445
       +
           onny

     

       446
       446
       +
         ];

     

       388
       447
        
       }

+3 -2

nixos/modules/services/x11/desktop-managers/cde.nix

···

       49
       49
        
           users.groups.mail = {};

     

       50
       50
        
           security.wrappers = {

     

       51
       51
        
             dtmail = {

     

       52
       52
       +
               setgid = true;

     

       53
       53
       +
               owner = "nobody";

     

       54
       54
       +
               group = "mail";

     

       52
       55
        
               source = "${pkgs.cdesktopenv}/bin/dtmail";

     

       53
       53
       -
               group = "mail";

     

       54
       54
       -
               setgid = true;

     

       55
       56
        
             };

     

       56
       57
        
           };

     

       57
       58

+18 -3

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       65
       65
        
       

     

       66
       66
        
           # Wrappers for programs installed by enlightenment that should be setuid

     

       67
       67
        
           security.wrappers = {

     

       68
       68
       -
             enlightenment_ckpasswd.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd";

     

       69
       69
       -
             enlightenment_sys.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys";

     

       70
       70
       -
             enlightenment_system.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system";

     

       68
       68
       +
             enlightenment_ckpasswd =

     

       69
       69
       +
               { setuid = true;

     

       70
       70
       +
                 owner = "root";

     

       71
       71
       +
                 group = "root";

     

       72
       72
       +
                 source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd";

     

       73
       73
       +
               };

     

       74
       74
       +
             enlightenment_sys =

     

       75
       75
       +
               { setuid = true;

     

       76
       76
       +
                 owner = "root";

     

       77
       77
       +
                 group = "root";

     

       78
       78
       +
                 source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys";

     

       79
       79
       +
               };

     

       80
       80
       +
             enlightenment_system =

     

       81
       81
       +
               { setuid = true;

     

       82
       82
       +
                 owner = "root";

     

       83
       83
       +
                 group = "root";

     

       84
       84
       +
                 source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system";

     

       85
       85
       +
               };

     

       71
       86
        
           };

     

       72
       87
        
       

     

       73
       88
        
           environment.etc."X11/xkb".source = xcfg.xkbDir;

+1 -1

nixos/modules/services/x11/desktop-managers/pantheon.nix

···

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
        
           doc = ./pantheon.xml;

     

       21
       21
       -
           maintainers = pkgs.pantheon.maintainers;

     

       21
       21
       +
           maintainers = teams.pantheon.members;

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         options = {

+18 -6

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       197
       197
        
             };

     

       198
       198
        
       

     

       199
       199
        
             security.wrappers = {

     

       200
       200
       -
               kcheckpass.source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";

     

       201
       201
       -
               start_kdeinit.source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";

     

       202
       202
       -
               kwin_wayland = {

     

       203
       203
       -
                 source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";

     

       204
       204
       -
                 capabilities = "cap_sys_nice+ep";

     

       205
       205
       -
               };

     

       200
       200
       +
               kcheckpass =

     

       201
       201
       +
                 { setuid = true;

     

       202
       202
       +
                   owner = "root";

     

       203
       203
       +
                   group = "root";

     

       204
       204
       +
                   source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";

     

       205
       205
       +
                 };

     

       206
       206
       +
               start_kdeinit =

     

       207
       207
       +
                 { setuid = true;

     

       208
       208
       +
                   owner = "root";

     

       209
       209
       +
                   group = "root";

     

       210
       210
       +
                   source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";

     

       211
       211
       +
                 };

     

       212
       212
       +
               kwin_wayland =

     

       213
       213
       +
                 { owner = "root";

     

       214
       214
       +
                   group = "root";

     

       215
       215
       +
                   capabilities = "cap_sys_nice+ep";

     

       216
       216
       +
                   source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";

     

       217
       217
       +
                 };

     

       206
       218
        
             };

     

       207
       219
        
       

     

       208
       220
        
             # DDC support

+6 -46

nixos/modules/services/x11/extra-layouts.nix

···

       79
       79
        
           };

     

       80
       80
        
         };

     

       81
       81
        
       

     

       82
       82
       +
         xkb_patched = pkgs.xorg.xkeyboardconfig_custom {

     

       83
       83
       +
           layouts = config.services.xserver.extraLayouts;

     

       84
       84
       +
         };

     

       85
       85
       +
       

     

       82
       86
        
       in

     

       83
       87
        
       

     

       84
       88
        
       {

     
···

       114
       118
        
       

     

       115
       119
        
         config = mkIf (layouts != { }) {

     

       116
       120
        
       

     

       117
       117
       -
           # We don't override xkeyboard_config directly to

     

       118
       118
       -
           # reduce the amount of packages to be recompiled.

     

       119
       119
       -
           # Only the following packages are necessary to set

     

       120
       120
       -
           # a custom layout anyway:

     

       121
       121
       -
           nixpkgs.overlays = lib.singleton (self: super: {

     

       122
       122
       -
       

     

       123
       123
       -
             xkb_patched = self.xorg.xkeyboardconfig_custom {

     

       124
       124
       -
               layouts = config.services.xserver.extraLayouts;

     

       125
       125
       -
             };

     

       126
       126
       -
       

     

       127
       127
       -
             xorg = super.xorg // {

     

       128
       128
       -
               xorgserver = super.xorg.xorgserver.overrideAttrs (old: {

     

       129
       129
       -
                 configureFlags = old.configureFlags ++ [

     

       130
       130
       -
                   "--with-xkb-bin-directory=${self.xorg.xkbcomp}/bin"

     

       131
       131
       -
                   "--with-xkb-path=${self.xkb_patched}/share/X11/xkb"

     

       132
       132
       -
                 ];

     

       133
       133
       -
               });

     

       134
       134
       -
       

     

       135
       135
       -
               setxkbmap = super.xorg.setxkbmap.overrideAttrs (old: {

     

       136
       136
       -
                 postInstall =

     

       137
       137
       -
                   ''

     

       138
       138
       -
                     mkdir -p $out/share

     

       139
       139
       -
                     ln -sfn ${self.xkb_patched}/etc/X11 $out/share/X11

     

       140
       140
       -
                   '';

     

       141
       141
       -
               });

     

       142
       142
       -
       

     

       143
       143
       -
               xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: {

     

       144
       144
       -
                 configureFlags = [ "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb" ];

     

       145
       145
       -
               });

     

       146
       146
       -
       

     

       147
       147
       -
             };

     

       148
       148
       -
       

     

       149
       149
       -
             ckbcomp = super.ckbcomp.override {

     

       150
       150
       -
               xkeyboard_config = self.xkb_patched;

     

       151
       151
       -
             };

     

       152
       152
       -
       

     

       153
       153
       -
             xkbvalidate = super.xkbvalidate.override {

     

       154
       154
       -
               libxkbcommon = self.libxkbcommon.override {

     

       155
       155
       -
                 xkeyboard_config = self.xkb_patched;

     

       156
       156
       -
               };

     

       157
       157
       -
             };

     

       158
       158
       -
       

     

       159
       159
       -
           });

     

       160
       160
       -
       

     

       161
       121
        
           environment.sessionVariables = {

     

       162
       122
        
             # runtime override supported by multiple libraries e. g. libxkbcommon

     

       163
       123
        
             # https://xkbcommon.org/doc/current/group__include-path.html

     

       164
       164
       -
             XKB_CONFIG_ROOT = "${pkgs.xkb_patched}/etc/X11/xkb";

     

       124
       124
       +
             XKB_CONFIG_ROOT = "${xkb_patched}/etc/X11/xkb";

     

       165
       125
        
           };

     

       166
       126
        
       

     

       167
       127
        
           services.xserver = {

     

       168
       168
       -
             xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";

     

       128
       128
       +
             xkbDir = "${xkb_patched}/etc/X11/xkb";

     

       169
       129
        
             exportConfiguration = config.services.xserver.displayManager.startx.enable

     

       170
       130
        
               || config.services.xserver.displayManager.sx.enable;

     

       171
       131
        
           };

+3

nixos/modules/services/x11/xserver.nix

···

       738
       738
        
             nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ];

     

       739
       739
        
             preferLocalBuild = true;

     

       740
       740
        
           } ''

     

       741
       741
       +
             ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)

     

       742
       742
       +
               "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}"

     

       743
       743
       +
             }

     

       741
       744
        
             xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"

     

       742
       745
        
             touch "$out"

     

       743
       746
        
           '');

+12 -2

nixos/modules/tasks/filesystems/ecryptfs.nix

···

       7
       7
        
         config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) {

     

       8
       8
        
           system.fsPackages = [ pkgs.ecryptfs ];

     

       9
       9
        
           security.wrappers = {

     

       10
       10
       -
             "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";

     

       11
       11
       -
             "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";

     

       10
       10
       +
             "mount.ecryptfs_private" =

     

       11
       11
       +
               { setuid = true;

     

       12
       12
       +
                 owner = "root";

     

       13
       13
       +
                 group = "root";

     

       14
       14
       +
                 source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";

     

       15
       15
       +
               };

     

       16
       16
       +
             "umount.ecryptfs_private" =

     

       17
       17
       +
               { setuid = true;

     

       18
       18
       +
                 owner = "root";

     

       19
       19
       +
                 group = "root";

     

       20
       20
       +
                 source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";

     

       21
       21
       +
               };

     

       12
       22
        
           };

     

       13
       23
        
         };

     

       14
       24
        
       }

+7 -2

nixos/modules/tasks/network-interfaces.nix

···

       1133
       1133
        
           # kernel because we need the ambient capability

     

       1134
       1134
        
           security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then {

     

       1135
       1135
        
             ping = {

     

       1136
       1136
       -
               source  = "${pkgs.iputils.out}/bin/ping";

     

       1136
       1136
       +
               owner = "root";

     

       1137
       1137
       +
               group = "root";

     

       1137
       1138
        
               capabilities = "cap_net_raw+p";

     

       1139
       1139
       +
               source = "${pkgs.iputils.out}/bin/ping";

     

       1138
       1140
        
             };

     

       1139
       1141
        
           } else {

     

       1140
       1140
       -
             ping.source = "${pkgs.iputils.out}/bin/ping";

     

       1142
       1142
       +
             setuid = true;

     

       1143
       1143
       +
             owner = "root";

     

       1144
       1144
       +
             group = "root";

     

       1145
       1145
       +
             source = "${pkgs.iputils.out}/bin/ping";

     

       1141
       1146
        
           };

     

       1142
       1147
        
           security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter ''

     

       1143
       1148
        
             /run/wrappers/bin/ping {

+3

nixos/modules/virtualisation/libvirtd.nix

···

       183
       183
        
           };

     

       184
       184
        
       

     

       185
       185
        
           security.wrappers.qemu-bridge-helper = {

     

       186
       186
       +
             setuid = true;

     

       187
       187
       +
             owner = "root";

     

       188
       188
       +
             group = "root";

     

       186
       189
        
             source = "/run/${dirName}/nix-helpers/qemu-bridge-helper";

     

       187
       190
        
           };

     

       188
       191

+4 -2

nixos/modules/virtualisation/spice-usb-redirection.nix

···

       14
       14
        
       

     

       15
       15
        
         config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable {

     

       16
       16
        
           environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions

     

       17
       17
       -
           security.wrappers.spice-client-glib-usb-acl-helper ={

     

       18
       18
       -
             source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper";

     

       17
       17
       +
           security.wrappers.spice-client-glib-usb-acl-helper = {

     

       18
       18
       +
             owner = "root";

     

       19
       19
       +
             group = "root";

     

       19
       20
        
             capabilities = "cap_fowner+ep";

     

       21
       21
       +
             source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper";

     

       20
       22
        
           };

     

       21
       23
        
         };

     

       22
       24

+17

nixos/modules/virtualisation/vmware-guest.nix

···

       37
       37
        
               serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";

     

       38
       38
        
             };

     

       39
       39
        
       

     

       40
       40
       +
           # Mount the vmblock for drag-and-drop and copy-and-paste.

     

       41
       41
       +
           systemd.mounts = [

     

       42
       42
       +
             {

     

       43
       43
       +
               description = "VMware vmblock fuse mount";

     

       44
       44
       +
               documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ];

     

       45
       45
       +
               before = [ "vmware.service" ];

     

       46
       46
       +
               wants = [ "vmware.service" ];

     

       47
       47
       +
               what = "${open-vm-tools}/bin/vmware-vmblock-fuse";

     

       48
       48
       +
               where = "/run/vmblock-fuse";

     

       49
       49
       +
               type = "fuse";

     

       50
       50
       +
               options = "subtype=vmware-vmblock,default_permissions,allow_other";

     

       51
       51
       +
               wantedBy = [ "multi-user.target" ];

     

       52
       52
       +
             }

     

       53
       53
       +
           ];

     

       54
       54
       +
       

     

       55
       55
       +
           security.wrappers.vmware-user-suid-wrapper.source = "${open-vm-tools}/bin/vmware-user-suid-wrapper";

     

       56
       56
       +
       

     

       40
       57
        
           environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*";

     

       41
       58
        
       

     

       42
       59
        
           services.xserver = mkIf (!cfg.headless) {

+60 -25

nixos/tests/dokuwiki.nix

···

       33
       33
        
       in {

     

       34
       34
        
         name = "dokuwiki";

     

       35
       35
        
         meta = with pkgs.lib; {

     

       36
       36
       -
           maintainers = with maintainers; [ _1000101 ];

     

       36
       36
       +
           maintainers = with maintainers; [

     

       37
       37
       +
             _1000101

     

       38
       38
       +
             onny

     

       39
       39
       +
           ];

     

       37
       40
        
         };

     

       38
       38
       -
         machine = { ... }: {

     

       39
       39
       -
           services.dokuwiki."site1.local" = {

     

       40
       40
       -
             aclUse = false;

     

       41
       41
       -
             superUser = "admin";

     

       41
       41
       +
       

     

       42
       42
       +
         nodes = {

     

       43
       43
       +
           dokuwiki_nginx = {...}: {

     

       44
       44
       +
             services.dokuwiki = {

     

       45
       45
       +
               sites = {

     

       46
       46
       +
                 "site1.local" = {

     

       47
       47
       +
                   aclUse = false;

     

       48
       48
       +
                   superUser = "admin";

     

       49
       49
       +
                 };

     

       50
       50
       +
                 "site2.local" = {

     

       51
       51
       +
                   usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";

     

       52
       52
       +
                   superUser = "admin";

     

       53
       53
       +
                   templates = [ template-bootstrap3 ];

     

       54
       54
       +
                   plugins = [ plugin-icalevents ];

     

       55
       55
       +
                 };

     

       56
       56
       +
               };

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       59
       59
       +
             networking.firewall.allowedTCPPorts = [ 80 ];

     

       60
       60
       +
             networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];

     

       42
       61
        
           };

     

       43
       43
       -
           services.dokuwiki."site2.local" = {

     

       44
       44
       -
             usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";

     

       45
       45
       -
             superUser = "admin";

     

       46
       46
       -
             templates = [ template-bootstrap3 ];

     

       47
       47
       -
             plugins = [ plugin-icalevents ];

     

       62
       62
       +
       

     

       63
       63
       +
           dokuwiki_caddy = {...}: {

     

       64
       64
       +
             services.dokuwiki = {

     

       65
       65
       +
               webserver = "caddy";

     

       66
       66
       +
               sites = {

     

       67
       67
       +
                 "site1.local" = {

     

       68
       68
       +
                   aclUse = false;

     

       69
       69
       +
                   superUser = "admin";

     

       70
       70
       +
                 };

     

       71
       71
       +
                 "site2.local" = {

     

       72
       72
       +
                   usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";

     

       73
       73
       +
                   superUser = "admin";

     

       74
       74
       +
                   templates = [ template-bootstrap3 ];

     

       75
       75
       +
                   plugins = [ plugin-icalevents ];

     

       76
       76
       +
                 };

     

       77
       77
       +
               };

     

       78
       78
       +
             };

     

       79
       79
       +
       

     

       80
       80
       +
             networking.firewall.allowedTCPPorts = [ 80 ];

     

       81
       81
       +
             networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];

     

       48
       82
        
           };

     

       49
       49
       -
           networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];

     

       83
       83
       +
       

     

       50
       84
        
         };

     

       51
       85
        
       

     

       52
       86
        
         testScript = ''

     

       53
       53
       -
           site_names = ["site1.local", "site2.local"]

     

       54
       87
        
       

     

       55
       88
        
           start_all()

     

       56
       89
        
       

     

       57
       57
       -
           machine.wait_for_unit("phpfpm-dokuwiki-site1.local.service")

     

       58
       58
       -
           machine.wait_for_unit("phpfpm-dokuwiki-site2.local.service")

     

       90
       90
       +
           dokuwiki_nginx.wait_for_unit("nginx")

     

       91
       91
       +
           dokuwiki_caddy.wait_for_unit("caddy")

     

       59
       92
        
       

     

       60
       60
       -
           machine.wait_for_unit("nginx.service")

     

       93
       93
       +
           site_names = ["site1.local", "site2.local"]

     

       61
       94
        
       

     

       62
       62
       -
           machine.wait_for_open_port(80)

     

       95
       95
       +
           for machine in (dokuwiki_nginx, dokuwiki_caddy):

     

       96
       96
       +
             for site_name in site_names:

     

       97
       97
       +
               machine.wait_for_unit(f"phpfpm-dokuwiki-{site_name}")

     

       63
       98
        
       

     

       64
       64
       -
           machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'")

     

       65
       65
       -
           machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'")

     

       99
       99
       +
               machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'")

     

       100
       100
       +
               machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'")

     

       66
       101
        
       

     

       67
       67
       -
           machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'")

     

       68
       68
       -
           machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'")

     

       102
       102
       +
               machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'")

     

       103
       103
       +
               machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'")

     

       69
       104
        
       

     

       70
       70
       -
           machine.succeed(

     

       71
       71
       -
               "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php",

     

       72
       72
       -
               "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'",

     

       73
       73
       -
               "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'",

     

       74
       74
       -
           )

     

       105
       105
       +
               machine.succeed(

     

       106
       106
       +
                   "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php",

     

       107
       107
       +
                   "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'",

     

       108
       108
       +
                   "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'",

     

       109
       109
       +
               )

     

       75
       110
        
         '';

     

       76
       111
        
       })

+2 -2

nixos/tests/pantheon.nix

···

       3
       3
        
       {

     

       4
       4
        
         name = "pantheon";

     

       5
       5
        
       

     

       6
       6
       -
         meta = with pkgs.lib.maintainers; {

     

       7
       7
       -
           maintainers = pkgs.pantheon.maintainers;

     

       6
       6
       +
         meta = with lib; {

     

       7
       7
       +
           maintainers = teams.pantheon.members;

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         machine = { ... }:

+2 -2

pkgs/applications/audio/sidplayfp/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "sidplayfp";

     

       19
       19
       -
         version = "2.2.1";

     

       19
       19
       +
         version = "2.2.2";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "libsidplayfp";

     

       23
       23
        
           repo = "sidplayfp";

     

       24
       24
        
           rev = "v${version}";

     

       25
       25
       -
           sha256 = "sha256-IlPZmZpWxMaArkRnqu6JCGxiHU7JczRxiySqzAopfxc=";

     

       25
       25
       +
           sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ autoreconfHook perl pkg-config ];

+11 -7

pkgs/applications/editors/emacs/elisp-packages/ement/default.nix

···

       9
       9
        
       

     

       10
       10
        
       trivialBuild {

     

       11
       11
        
         pname = "ement";

     

       12
       12
       -
         version = "unstable-2021-09-08";

     

       12
       12
       +
         version = "unstable-2021-09-16";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "alphapapa";

     

       16
       16
       +
           repo = "ement.el";

     

       17
       17
       +
           rev = "c07e914f077199c95b0e7941a421675c95d4687e";

     

       18
       18
       +
           sha256 = "sha256-kYVb2NrHYC87mY/hFUMAjb4TLJ9A2L2RrHoiAXvRaGg=";

     

       19
       19
       +
         };

     

       13
       20
        
       

     

       14
       21
        
         packageRequires = [

     

       15
       22
        
           plz

     
···

       17
       24
        
           ts

     

       18
       25
        
         ];

     

       19
       26
        
       

     

       20
       20
       -
         src = fetchFromGitHub {

     

       21
       21
       -
           owner = "alphapapa";

     

       22
       22
       -
           repo = "ement.el";

     

       23
       23
       -
           rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d";

     

       24
       24
       -
           sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I=";

     

       25
       25
       -
         };

     

       27
       27
       +
         patches = [

     

       28
       28
       +
           ./handle-nil-images.patch

     

       29
       29
       +
         ];

     

       26
       30
        
       

     

       27
       31
        
         meta = {

     

       28
       32
        
           description = "Ement.el is a Matrix client for Emacs";

+28

pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch

···

       1
       1
       +
       diff --git a/ement.el b/ement.el

     

       2
       2
       +
       index c9596a7..1b33045 100644

     

       3
       3
       +
       --- a/ement.el

     

       4
       4
       +
       +++ b/ement.el

     

       5
       5
       +
       @@ -682,14 +682,15 @@ can cause undesirable underlining."

     

       6
       6
       +
          "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.

     

       7
       7
       +
        IMAGE should be one as created by, e.g. `create-image'."

     

       8
       8
       +
          ;; It would be nice if the image library had some simple functions to do this sort of thing.

     

       9
       9
       +
       -  (let ((new-image (cl-copy-list image)))

     

       10
       10
       +
       -    (when (fboundp 'imagemagick-types)

     

       11
       11
       +
       -      ;; Only do this when ImageMagick is supported.

     

       12
       12
       +
       -      ;; FIXME: When requiring Emacs 27+, remove this (I guess?).

     

       13
       13
       +
       -      (setf (image-property new-image :type) 'imagemagick))

     

       14
       14
       +
       -    (setf (image-property new-image :max-width) max-width

     

       15
       15
       +
       -          (image-property new-image :max-height) max-height)

     

       16
       16
       +
       -    new-image))

     

       17
       17
       +
       +  (when image

     

       18
       18
       +
       +    (let ((new-image (cl-copy-list image)))

     

       19
       19
       +
       +      (when (fboundp 'imagemagick-types)

     

       20
       20
       +
       +        ;; Only do this when ImageMagick is supported.

     

       21
       21
       +
       +        ;; FIXME: When requiring Emacs 27+, remove this (I guess?).

     

       22
       22
       +
       +        (setf (image-property new-image :type) 'imagemagick))

     

       23
       23
       +
       +      (setf (image-property new-image :max-width) max-width

     

       24
       24
       +
       +            (image-property new-image :max-height) max-height)

     

       25
       25
       +
       +      new-image)))

     

       26
       26
       +
        

     

       27
       27
       +
        ;;;;; Reading/writing sessions

     

       28
       28
       +

+1 -1

pkgs/applications/graphics/akira/default.nix

···

       69
       69
        
           description = "Native Linux Design application built in Vala and GTK";

     

       70
       70
        
           homepage = "https://github.com/akiraux/Akira";

     

       71
       71
        
           license = licenses.gpl3Plus;

     

       72
       72
       -
           maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers;

     

       72
       72
       +
           maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members;

     

       73
       73
        
           platforms = platforms.linux;

     

       74
       74
        
         };

     

       75
       75
        
       }

+1 -1

pkgs/applications/graphics/ideogram/default.nix

···

       61
       61
        
           description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS";

     

       62
       62
        
           homepage = "https://github.com/cassidyjames/ideogram";

     

       63
       63
        
           license = licenses.gpl2Plus;

     

       64
       64
       -
           maintainers = pantheon.maintainers;

     

       64
       64
       +
           maintainers = teams.pantheon.members;

     

       65
       65
        
           platforms = platforms.linux;

     

       66
       66
        
         };

     

       67
       67

+1 -1

pkgs/applications/misc/appeditor/default.nix

···

       56
       56
        
         meta = with lib; {

     

       57
       57
        
           description = "Edit the Pantheon desktop application menu";

     

       58
       58
        
           homepage = "https://github.com/donadigo/appeditor";

     

       59
       59
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       59
       59
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       60
       60
        
           platforms = platforms.linux;

     

       61
       61
        
           license = licenses.gpl3Plus;

     

       62
       62
        
         };

+1 -1

pkgs/applications/misc/cipher/default.nix

···

       57
       57
        
         meta = with lib; {

     

       58
       58
        
           description = "A simple application for encoding and decoding text, designed for elementary OS";

     

       59
       59
        
           homepage = "https://github.com/arshubham/cipher";

     

       60
       60
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       60
       60
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       61
       61
        
           platforms = platforms.linux;

     

       62
       62
        
           license = licenses.gpl3Plus;

     

       63
       63
        
         };

+1 -1

pkgs/applications/misc/formatter/default.nix

···

       71
       71
        
         meta = with lib; {

     

       72
       72
        
           description = "A simple formatter designed for elementary OS";

     

       73
       73
        
           homepage = "https://github.com/Djaler/Formatter";

     

       74
       74
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       74
       74
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       75
       75
        
           platforms = platforms.linux;

     

       76
       76
        
           license = licenses.lgpl2Plus;

     

       77
       77
        
         };

+2 -2

pkgs/applications/misc/mnamer/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "mnamer";

     

       5
       5
       -
         version = "2.5.3";

     

       5
       5
       +
         version = "2.5.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jkwill87";

     

       9
       9
        
           repo = "mnamer";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd";

     

       11
       11
       +
           sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [

+19

pkgs/applications/misc/octoprint/plugins.nix

···

       147
       147
        
           };

     

       148
       148
        
         };

     

       149
       149
        
       

     

       150
       150
       +
         ender3v2tempfix = buildPlugin rec {

     

       151
       151
       +
           pname = "OctoPrintPlugin-ender3v2tempfix";

     

       152
       152
       +
           version = "unstable-2021-04-27";

     

       153
       153
       +
       

     

       154
       154
       +
           src = fetchFromGitHub {

     

       155
       155
       +
             owner = "SimplyPrint";

     

       156
       156
       +
             repo = "OctoPrint-Creality2xTemperatureReportingFix";

     

       157
       157
       +
             rev = "2c4183b6a0242a24ebf646d7ac717cd7a2db2bcf";

     

       158
       158
       +
             sha256 = "03bc2zbffw4ksk8if90kxhs3179nbhb4xikp4f0adm3lrnvxkd3s";

     

       159
       159
       +
           };

     

       160
       160
       +
       

     

       161
       161
       +
           meta = with lib; {

     

       162
       162
       +
             description = "Fixes the double temperature reporting from the Creality Ender-3 v2 printer";

     

       163
       163
       +
             homepage = "https://github.com/SimplyPrint/OctoPrint-Creality2xTemperatureReportingFix";

     

       164
       164
       +
             license = licenses.mit;

     

       165
       165
       +
             maintainers = with maintainers; [ illustris ];

     

       166
       166
       +
           };

     

       167
       167
       +
         };

     

       168
       168
       +
       

     

       150
       169
        
         gcodeeditor = buildPlugin rec {

     

       151
       170
        
           pname = "GcodeEditor";

     

       152
       171
        
           version = "0.2.12";

+1 -2

pkgs/applications/misc/plank/default.nix

···

       23
       23
        
       , libgee

     

       24
       24
        
       , wrapGAppsHook

     

       25
       25
        
       , autoreconfHook

     

       26
       26
       -
       , pantheon

     

       27
       26
        
       }:

     

       28
       27
        
       

     

       29
       28
        
       stdenv.mkDerivation rec {

     
···

       84
       83
        
           homepage = "https://launchpad.net/plank";

     

       85
       84
        
           license = licenses.gpl3Plus;

     

       86
       85
        
           platforms = platforms.linux;

     

       87
       87
       -
           maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;

     

       86
       86
       +
           maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members;

     

       88
       87
        
         };

     

       89
       88
        
       }

+2 -2

pkgs/applications/misc/portfolio-filemanager/default.nix

···

       17
       17
        
       

     

       18
       18
        
       python3.pkgs.buildPythonApplication rec {

     

       19
       19
        
         pname = "portfolio";

     

       20
       20
       -
         version = "0.9.10";

     

       20
       20
       +
         version = "0.9.12";

     

       21
       21
        
       

     

       22
       22
        
         format = "other";

     

       23
       23
        
       

     
···

       25
       25
        
           owner = "tchx84";

     

       26
       26
        
           repo = "Portfolio";

     

       27
       27
        
           rev = "v${version}";

     

       28
       28
       -
           sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4";

     

       28
       28
       +
           sha256 = "sha256-P+XQRIL2DepoOSVElxVxMihqxdxwLVnvXuraZN8L7z8=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

+1 -1

pkgs/applications/misc/sequeler/default.nix

···

       45
       45
        
           '';

     

       46
       46
        
           homepage = "https://github.com/Alecaddd/sequeler";

     

       47
       47
        
           license = licenses.gpl3;

     

       48
       48
       -
           maintainers = [ maintainers.etu ] ++ pantheon.maintainers;

     

       48
       48
       +
           maintainers = with maintainers; [ etu ] ++ teams.pantheon.members;

     

       49
       49
        
           platforms = platforms.linux;

     

       50
       50
        
         };

     

       51
       51
        
       }

+2 -1

pkgs/applications/networking/browsers/chromium/common.nix

···

       88
       88
        
         gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [

     

       89
       89
        
           "ffmpeg"

     

       90
       90
        
           "snappy"

     

       91
       91
       +
         ] ++ lib.optionals (!chromiumVersionAtLeast "95") [

     

       92
       92
       +
           "zlib"

     

       91
       93
        
         ] ++ [

     

       92
       94
        
           "flac"

     

       93
       95
        
           "libjpeg"

     
···

       95
       97
        
           "libwebp"

     

       96
       98
        
           "libxslt"

     

       97
       99
        
           "opus"

     

       98
       98
       -
           "zlib"

     

       99
       100
        
         ];

     

       100
       101
        
       

     

       101
       102
        
         opusWithCustomModes = libopus.override {

+1 -1

pkgs/applications/networking/browsers/ephemeral/default.nix

···

       64
       64
        
         meta = with lib; {

     

       65
       65
        
           description = "The always-incognito web browser";

     

       66
       66
        
           homepage = "https://github.com/cassidyjames/ephemeral";

     

       67
       67
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       67
       67
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       68
       68
        
           platforms = platforms.linux;

     

       69
       69
        
           license = licenses.gpl3;

     

       70
       70
        
         };

+4 -2

pkgs/applications/networking/cluster/kubernetes/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "kubernetes";

     

       24
       24
       -
         version = "1.22.1";

     

       24
       24
       +
         version = "1.22.2";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "kubernetes";

     

       28
       28
        
           repo = "kubernetes";

     

       29
       29
        
           rev = "v${version}";

     

       30
       30
       -
           sha256 = "sha256-coiDKczX5kWw/5A9+p0atPbn2nR0wBBdfXKTw6FYywo=";

     

       30
       30
       +
           sha256 = "sha256-O+FY9wJ0fztO7i5qJfw+cfhfBgaMWKX7IBBXJV4uuCk=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];

     
···

       60
       60
        
         '';

     

       61
       61
        
       

     

       62
       62
        
         installPhase = ''

     

       63
       63
       +
           runHook preInstall

     

       63
       64
        
           for p in $WHAT; do

     

       64
       65
        
             install -D _output/local/go/bin/''${p##*/} -t $out/bin

     

       65
       66
        
           done

     
···

       83
       84
        
               --bash <($out/bin/$tool completion bash) \

     

       84
       85
        
               --zsh <($out/bin/$tool completion zsh)

     

       85
       86
        
           done

     

       87
       87
       +
           runHook postInstall

     

       86
       88
        
         '';

     

       87
       89
        
       

     

       88
       90
        
         preFixup = ''

+2 -2

pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix

···

       20
       20
        
           "${electron}/bin/electron";

     

       21
       21
        
       in nodePackages.deltachat-desktop.override rec {

     

       22
       22
        
         pname = "deltachat-desktop";

     

       23
       23
       -
         version = "1.21.0";

     

       23
       23
       +
         version = "1.21.1";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "deltachat";

     

       27
       27
        
           repo = "deltachat-desktop";

     

       28
       28
        
           rev = "v${version}";

     

       29
       29
       -
           sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45";

     

       29
       29
       +
           sha256 = "0d59z0mvi70i26d79s4h0sssclwcakidhvhq56zi78bkfqlx7xf1";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

+1 -1

pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "deltachat-desktop",

     

       3
       3
       -
         "version": "1.21.0",

     

       3
       3
       +
         "version": "1.21.1",

     

       4
       4
        
         "dependencies": {

     

       5
       5
        
           "@blueprintjs/core": "^3.22.3",

     

       6
       6
        
           "@mapbox/geojson-extent": "^1.0.0",

+2 -2

pkgs/applications/networking/instant-messengers/ferdi/default.nix

···

       17
       17
        
       mkFranzDerivation' rec {

     

       18
       18
        
         pname = "ferdi";

     

       19
       19
        
         name = "Ferdi";

     

       20
       20
       -
         version = "5.6.0";

     

       20
       20
       +
         version = "5.6.2";

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";

     

       23
       23
       -
           sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc=";

     

       23
       23
       +
           sha256 = "sha256-8rB7SnaIaeCXAaKELNO1CnxpV8TyeKRCVamwpATeia4=";

     

       24
       24
        
         };

     

       25
       25
        
         extraBuildInputs = [ xorg.libxshmfence ];

     

       26
       26
        
         meta = with lib; {

+2 -2

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       25
       25
        
             else "");

     

       26
       26
        
       in stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "signal-desktop";

     

       28
       28
       -
         version = "5.17.1"; # Please backport all updates to the stable channel.

     

       28
       28
       +
         version = "5.17.2"; # Please backport all updates to the stable channel.

     

       29
       29
        
         # All releases have a limited lifetime and "expire" 90 days after the release.

     

       30
       30
        
         # When releases "expire" the application becomes unusable until an update is

     

       31
       31
        
         # applied. The expiration date for the current release can be extracted with:

     
···

       35
       35
        
       

     

       36
       36
        
         src = fetchurl {

     

       37
       37
        
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

     

       38
       38
       -
           sha256 = "sha256-gJ5jDMdEx2YSmPtNfv2gKKAgPfRJcb3Aabti/DgHaIU=";

     

       38
       38
       +
           sha256 = "1fmn2i6k3zh3d37234yxbawzf85fa66xybcli7xffli39czxbcj3";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         nativeBuildInputs = [

+261 -261

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix

···

       1
       1
        
       {

     

       2
       2
       -
         version = "91.1.0";

     

       2
       2
       +
         version = "91.1.1";

     

       3
       3
        
         sources = [

     

       4
       4
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/af/thunderbird-91.1.0.tar.bz2";

     

       4
       4
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/af/thunderbird-91.1.1.tar.bz2";

     

       5
       5
        
             locale = "af";

     

       6
       6
        
             arch = "linux-x86_64";

     

       7
       7
       -
             sha256 = "6b355e9b1e5c467b51aecf697d776014f52a4b71c3b67afae34e64cb8af4155c";

     

       7
       7
       +
             sha256 = "ba98ba0ac513e9f8ca047bd08b38e2391d5b67b4195c2c1ac7d90498e148ad6b";

     

       8
       8
        
           }

     

       9
       9
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ar/thunderbird-91.1.0.tar.bz2";

     

       9
       9
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ar/thunderbird-91.1.1.tar.bz2";

     

       10
       10
        
             locale = "ar";

     

       11
       11
        
             arch = "linux-x86_64";

     

       12
       12
       -
             sha256 = "1fa1acd3b21db46e70ad0295ed95be4b3839b8029de09a42d11a8523df0e4573";

     

       12
       12
       +
             sha256 = "3514eadb52d000429f16417d3af5ce648cfdeaa583bb3602623f40abfca72fec";

     

       13
       13
        
           }

     

       14
       14
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ast/thunderbird-91.1.0.tar.bz2";

     

       14
       14
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ast/thunderbird-91.1.1.tar.bz2";

     

       15
       15
        
             locale = "ast";

     

       16
       16
        
             arch = "linux-x86_64";

     

       17
       17
       -
             sha256 = "aa3c7ba15bd18ab420c028571fa472b25d4ffc11f5789e4330d49a787442a2f9";

     

       17
       17
       +
             sha256 = "c630ab402c6f166181474b0e7299dc24ff0de5ce92fa0894adbc3dbaf8878f59";

     

       18
       18
        
           }

     

       19
       19
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/be/thunderbird-91.1.0.tar.bz2";

     

       19
       19
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/be/thunderbird-91.1.1.tar.bz2";

     

       20
       20
        
             locale = "be";

     

       21
       21
        
             arch = "linux-x86_64";

     

       22
       22
       -
             sha256 = "24a39668aaadec7a77bd75dbb9174d4865776d55c33d3b6a8fd63cb6589a176c";

     

       22
       22
       +
             sha256 = "9f484652940fec35d9adad996e80092cedabc789952e083107b405992b1ecf9d";

     

       23
       23
        
           }

     

       24
       24
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/bg/thunderbird-91.1.0.tar.bz2";

     

       24
       24
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/bg/thunderbird-91.1.1.tar.bz2";

     

       25
       25
        
             locale = "bg";

     

       26
       26
        
             arch = "linux-x86_64";

     

       27
       27
       -
             sha256 = "aed38cd5384c6e7df097fca8b37e866e0e432ea37f636c2306d2c1534b1013a7";

     

       27
       27
       +
             sha256 = "f784957e36cb9a92083c275eec887d3a6847439281e94346e5bf0e065ec23366";

     

       28
       28
        
           }

     

       29
       29
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/br/thunderbird-91.1.0.tar.bz2";

     

       29
       29
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/br/thunderbird-91.1.1.tar.bz2";

     

       30
       30
        
             locale = "br";

     

       31
       31
        
             arch = "linux-x86_64";

     

       32
       32
       -
             sha256 = "6e8558c74d7bd0fc827bae6fc948d20a8bf3a8cd1b60784bc9e45c101b781bf2";

     

       32
       32
       +
             sha256 = "2817bf350195954464db3a936db3a3730c2d33dfea9333165e69418b627d575d";

     

       33
       33
        
           }

     

       34
       34
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ca/thunderbird-91.1.0.tar.bz2";

     

       34
       34
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ca/thunderbird-91.1.1.tar.bz2";

     

       35
       35
        
             locale = "ca";

     

       36
       36
        
             arch = "linux-x86_64";

     

       37
       37
       -
             sha256 = "35f23617e5a62dbb2732688add158818c9f33d1c38555c1035ebdf1511a58ba4";

     

       37
       37
       +
             sha256 = "176b8f2463267ad2aed07ca6966609c600615763caba662ac68c45b5d36e367c";

     

       38
       38
        
           }

     

       39
       39
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cak/thunderbird-91.1.0.tar.bz2";

     

       39
       39
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cak/thunderbird-91.1.1.tar.bz2";

     

       40
       40
        
             locale = "cak";

     

       41
       41
        
             arch = "linux-x86_64";

     

       42
       42
       -
             sha256 = "6029b2ec2581997916575e73e88c01068f48a6b72e606882936be5ee4d6bb69a";

     

       42
       42
       +
             sha256 = "7ff8fc736dd4232801d0e50b154747827cc818fe76782b219d683a8b2bba8969";

     

       43
       43
        
           }

     

       44
       44
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cs/thunderbird-91.1.0.tar.bz2";

     

       44
       44
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cs/thunderbird-91.1.1.tar.bz2";

     

       45
       45
        
             locale = "cs";

     

       46
       46
        
             arch = "linux-x86_64";

     

       47
       47
       -
             sha256 = "6e7d2c6fdf864c7a9951f805a867c8d2b300d31f011e8e36e7f914c269ace27f";

     

       47
       47
       +
             sha256 = "b6763048e3fab66a4f08fd8c868d7c9c51258c540801546546b7da3b2ea64693";

     

       48
       48
        
           }

     

       49
       49
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cy/thunderbird-91.1.0.tar.bz2";

     

       49
       49
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cy/thunderbird-91.1.1.tar.bz2";

     

       50
       50
        
             locale = "cy";

     

       51
       51
        
             arch = "linux-x86_64";

     

       52
       52
       -
             sha256 = "7933796c5db473ca10f3633ca8f4d7d8fc6b8042e5fab2c18e45a0f1cfe542cd";

     

       52
       52
       +
             sha256 = "810213d5f90387bd6f46436b1479b977248ec043235f2f97b7e8d0a3b296eaec";

     

       53
       53
        
           }

     

       54
       54
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/da/thunderbird-91.1.0.tar.bz2";

     

       54
       54
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/da/thunderbird-91.1.1.tar.bz2";

     

       55
       55
        
             locale = "da";

     

       56
       56
        
             arch = "linux-x86_64";

     

       57
       57
       -
             sha256 = "fbce1763012fbb3395668cc88cd9562ca7cb19ecaa0f4eee81def9983106b97d";

     

       57
       57
       +
             sha256 = "2c85f4ea05fb03aaf88f4cb028375a628061f2699adde13f78cf6e76b7564e7d";

     

       58
       58
        
           }

     

       59
       59
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/de/thunderbird-91.1.0.tar.bz2";

     

       59
       59
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/de/thunderbird-91.1.1.tar.bz2";

     

       60
       60
        
             locale = "de";

     

       61
       61
        
             arch = "linux-x86_64";

     

       62
       62
       -
             sha256 = "8e62c8f447cf509b31f4f54bd8537d8ff9e525ba065e225a1e1c0acdadff0d3e";

     

       62
       62
       +
             sha256 = "9a05ca5400224fbf0923a331e1ba986d38038df24340c6aee695c24f96f75e0e";

     

       63
       63
        
           }

     

       64
       64
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/dsb/thunderbird-91.1.0.tar.bz2";

     

       64
       64
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/dsb/thunderbird-91.1.1.tar.bz2";

     

       65
       65
        
             locale = "dsb";

     

       66
       66
        
             arch = "linux-x86_64";

     

       67
       67
       -
             sha256 = "4c3064d94f70ed5d80ee091127de862f700904c7ea267a9f225d3e770472d0cc";

     

       67
       67
       +
             sha256 = "e06a84821ba0354e4d5efe0e080734e39f376ba3e1f1c385ab939fd4cb84301c";

     

       68
       68
        
           }

     

       69
       69
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/el/thunderbird-91.1.0.tar.bz2";

     

       69
       69
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/el/thunderbird-91.1.1.tar.bz2";

     

       70
       70
        
             locale = "el";

     

       71
       71
        
             arch = "linux-x86_64";

     

       72
       72
       -
             sha256 = "5307684da1676cec690ecbd47159d99f8034f4f1dd7f2785bbd673b4bde88760";

     

       72
       72
       +
             sha256 = "32a1de995a05495721a4c6a6a74ec27b68c03d7b2121ea7d6ce6d295ceb8d328";

     

       73
       73
        
           }

     

       74
       74
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-CA/thunderbird-91.1.0.tar.bz2";

     

       74
       74
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-CA/thunderbird-91.1.1.tar.bz2";

     

       75
       75
        
             locale = "en-CA";

     

       76
       76
        
             arch = "linux-x86_64";

     

       77
       77
       -
             sha256 = "a411b006a7589c7798cf6e23d32c1096c8587904b8dec0c77c59a4864d94d077";

     

       77
       77
       +
             sha256 = "95f2dd81dc1958f2acd8a801fe7a87dfa0a00c6b91b8bd669f8e3caf6d90aad2";

     

       78
       78
        
           }

     

       79
       79
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-GB/thunderbird-91.1.0.tar.bz2";

     

       79
       79
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-GB/thunderbird-91.1.1.tar.bz2";

     

       80
       80
        
             locale = "en-GB";

     

       81
       81
        
             arch = "linux-x86_64";

     

       82
       82
       -
             sha256 = "430b01b92d52940bfc37f5d6179da4cddf36884b3b26ece298a24b7743f72833";

     

       82
       82
       +
             sha256 = "3177bce52669f44ae58ca447b54a86329cdb5b8006199e86fa66b5bfe96ac8a3";

     

       83
       83
        
           }

     

       84
       84
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-US/thunderbird-91.1.0.tar.bz2";

     

       84
       84
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-US/thunderbird-91.1.1.tar.bz2";

     

       85
       85
        
             locale = "en-US";

     

       86
       86
        
             arch = "linux-x86_64";

     

       87
       87
       -
             sha256 = "d19eb0214c17b9738124fd196cfc64e8c98df092d7777e59ebff2fd6304ccdad";

     

       87
       87
       +
             sha256 = "c0331b86ef72bae3d769ca977b0c9adeb9a29145dab1eb0013f4d88fa9caeedc";

     

       88
       88
        
           }

     

       89
       89
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-AR/thunderbird-91.1.0.tar.bz2";

     

       89
       89
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-AR/thunderbird-91.1.1.tar.bz2";

     

       90
       90
        
             locale = "es-AR";

     

       91
       91
        
             arch = "linux-x86_64";

     

       92
       92
       -
             sha256 = "1614a42f7cff6e7c8d82cb7be3cbb13b056242206fb4e9b4765576d1a048c764";

     

       92
       92
       +
             sha256 = "e2aee8223131a46bf99140ebdb56ab76ca03eb5eb66dfbee75f23520d95d1971";

     

       93
       93
        
           }

     

       94
       94
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-ES/thunderbird-91.1.0.tar.bz2";

     

       94
       94
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-ES/thunderbird-91.1.1.tar.bz2";

     

       95
       95
        
             locale = "es-ES";

     

       96
       96
        
             arch = "linux-x86_64";

     

       97
       97
       -
             sha256 = "36fa6d30f6a743fba64cb3c7087143d9ba270b75b9c68e2bd9f305c0dba72a36";

     

       97
       97
       +
             sha256 = "c8e189dc7a57d47c6dba9e4cda3068b327fa10cff3818e97a4942c71c1d0cc87";

     

       98
       98
        
           }

     

       99
       99
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/et/thunderbird-91.1.0.tar.bz2";

     

       99
       99
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/et/thunderbird-91.1.1.tar.bz2";

     

       100
       100
        
             locale = "et";

     

       101
       101
        
             arch = "linux-x86_64";

     

       102
       102
       -
             sha256 = "c3ccde17967aca822bf70ad836c412315c4f8315126d000369344e19d3f5e4f5";

     

       102
       102
       +
             sha256 = "76e094d63467fb36622b64361f86041f0e6361a4fb1f1702c8a0e88bc57cfc96";

     

       103
       103
        
           }

     

       104
       104
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/eu/thunderbird-91.1.0.tar.bz2";

     

       104
       104
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/eu/thunderbird-91.1.1.tar.bz2";

     

       105
       105
        
             locale = "eu";

     

       106
       106
        
             arch = "linux-x86_64";

     

       107
       107
       -
             sha256 = "799a10b1d0d59087dcbc36ea584e7b5bd0bf6e824b8b54fd4805693a86d8a5eb";

     

       107
       107
       +
             sha256 = "8f09dc4bbbb76b660acf4664f4fb083a50de6523842171b4fe9558e7255c8bbf";

     

       108
       108
        
           }

     

       109
       109
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fi/thunderbird-91.1.0.tar.bz2";

     

       109
       109
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fi/thunderbird-91.1.1.tar.bz2";

     

       110
       110
        
             locale = "fi";

     

       111
       111
        
             arch = "linux-x86_64";

     

       112
       112
       -
             sha256 = "9d4ff3871c76453ee24ecca614c2b3ee74ccec34653758cb0d6814c6cb880cf2";

     

       112
       112
       +
             sha256 = "d7dba3916342bfefe549ad21a70a438c8f2031fc5f0085fc4e236d0f8d07c948";

     

       113
       113
        
           }

     

       114
       114
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fr/thunderbird-91.1.0.tar.bz2";

     

       114
       114
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fr/thunderbird-91.1.1.tar.bz2";

     

       115
       115
        
             locale = "fr";

     

       116
       116
        
             arch = "linux-x86_64";

     

       117
       117
       -
             sha256 = "8ecd58d5e078b3764805962a5b79c34cd967b671e83bf1d4eb986dbb6a0ce01f";

     

       117
       117
       +
             sha256 = "4088b924197a6baf7ea3ee233d566b9799cbab955a135bc870eaf6e08ce70915";

     

       118
       118
        
           }

     

       119
       119
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fy-NL/thunderbird-91.1.0.tar.bz2";

     

       119
       119
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fy-NL/thunderbird-91.1.1.tar.bz2";

     

       120
       120
        
             locale = "fy-NL";

     

       121
       121
        
             arch = "linux-x86_64";

     

       122
       122
       -
             sha256 = "0f06c52b5acb30787df11994c816bacbb639d52f69490ce0d14f1dcea3393522";

     

       122
       122
       +
             sha256 = "59cd7d50cdbb7867f746b137ec8f70407ae649b03e86a73a2be642eab9256be4";

     

       123
       123
        
           }

     

       124
       124
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ga-IE/thunderbird-91.1.0.tar.bz2";

     

       124
       124
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ga-IE/thunderbird-91.1.1.tar.bz2";

     

       125
       125
        
             locale = "ga-IE";

     

       126
       126
        
             arch = "linux-x86_64";

     

       127
       127
       -
             sha256 = "ed49900c65dcc82db483f6ed25aa84d8df4ac2ef961857e2e04581a39fd2614c";

     

       127
       127
       +
             sha256 = "10936f6c941d8c94eea200c1c3bb8919066714129eb3b34d67df87c9b93f331c";

     

       128
       128
        
           }

     

       129
       129
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gd/thunderbird-91.1.0.tar.bz2";

     

       129
       129
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gd/thunderbird-91.1.1.tar.bz2";

     

       130
       130
        
             locale = "gd";

     

       131
       131
        
             arch = "linux-x86_64";

     

       132
       132
       -
             sha256 = "a5c60e5ec859ec7b3f3c5415e2aadbe0d934808c3ed2fd05832bdba9100f3906";

     

       132
       132
       +
             sha256 = "4ee24daec40780a8148092c96140575e7e5d1169fd37ffc6d46879f76f976f80";

     

       133
       133
        
           }

     

       134
       134
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gl/thunderbird-91.1.0.tar.bz2";

     

       134
       134
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gl/thunderbird-91.1.1.tar.bz2";

     

       135
       135
        
             locale = "gl";

     

       136
       136
        
             arch = "linux-x86_64";

     

       137
       137
       -
             sha256 = "952b19e3c2b228102340803095c5c3854f1e726bf3bde05a5a5706cd536f6dfb";

     

       137
       137
       +
             sha256 = "0126bc6b167b8bcb2135e02c289f26aed82e4ab8dc820fa9468ebb41fd05604d";

     

       138
       138
        
           }

     

       139
       139
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/he/thunderbird-91.1.0.tar.bz2";

     

       139
       139
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/he/thunderbird-91.1.1.tar.bz2";

     

       140
       140
        
             locale = "he";

     

       141
       141
        
             arch = "linux-x86_64";

     

       142
       142
       -
             sha256 = "33121f9612d938b8f8dc040cfff99c6e76db956bf5cbd8823e8ec5488d6fb154";

     

       142
       142
       +
             sha256 = "58ae78aee2da5f8a33edf8c87a743ea7f3da6702f25682869db9bbfcb53d4df5";

     

       143
       143
        
           }

     

       144
       144
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hr/thunderbird-91.1.0.tar.bz2";

     

       144
       144
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hr/thunderbird-91.1.1.tar.bz2";

     

       145
       145
        
             locale = "hr";

     

       146
       146
        
             arch = "linux-x86_64";

     

       147
       147
       -
             sha256 = "62060cc1b62831543bab9d8d6e63d8cc8ec755e51b463adf3823987828037196";

     

       147
       147
       +
             sha256 = "c4543e54a9fa59906c64b8830e4ce6218279872e6beafeb67d13250159eca8f0";

     

       148
       148
        
           }

     

       149
       149
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hsb/thunderbird-91.1.0.tar.bz2";

     

       149
       149
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hsb/thunderbird-91.1.1.tar.bz2";

     

       150
       150
        
             locale = "hsb";

     

       151
       151
        
             arch = "linux-x86_64";

     

       152
       152
       -
             sha256 = "24f8af584f7f882a2a6e80ef704e58fdf1893c4690eaa9b9a6cc03fc786c6865";

     

       152
       152
       +
             sha256 = "cded10c83585c5d6ebdae4a0740262f43203b7a9252144a6f97eb6b329cea95a";

     

       153
       153
        
           }

     

       154
       154
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hu/thunderbird-91.1.0.tar.bz2";

     

       154
       154
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hu/thunderbird-91.1.1.tar.bz2";

     

       155
       155
        
             locale = "hu";

     

       156
       156
        
             arch = "linux-x86_64";

     

       157
       157
       -
             sha256 = "33b17c2920312de96f9e7158b9659ab5afe8fdd09454b535b2b84f72e9797669";

     

       157
       157
       +
             sha256 = "f6dcdab2dad04a9210f509a62da49ec5269bf5c9f40e74cf9d2f43edb0abd422";

     

       158
       158
        
           }

     

       159
       159
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hy-AM/thunderbird-91.1.0.tar.bz2";

     

       159
       159
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hy-AM/thunderbird-91.1.1.tar.bz2";

     

       160
       160
        
             locale = "hy-AM";

     

       161
       161
        
             arch = "linux-x86_64";

     

       162
       162
       -
             sha256 = "608cbb5ce32eef21489000f92857ac45e73adbf618f44e7fc36d8d323432504c";

     

       162
       162
       +
             sha256 = "b3f8a1b6d4576dbf660bee6404b97babeb04bf0c1c6ff27aab25a073436f43a4";

     

       163
       163
        
           }

     

       164
       164
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/id/thunderbird-91.1.0.tar.bz2";

     

       164
       164
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/id/thunderbird-91.1.1.tar.bz2";

     

       165
       165
        
             locale = "id";

     

       166
       166
        
             arch = "linux-x86_64";

     

       167
       167
       -
             sha256 = "29e8a54b74a6ea8e8eed88b00c833bd6b6e90c9da62090a7162642627c04cd25";

     

       167
       167
       +
             sha256 = "e1bfada3b7d33e01462cc303b22298850c5923f42e8ca656cdf5b2dc72c00745";

     

       168
       168
        
           }

     

       169
       169
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/is/thunderbird-91.1.0.tar.bz2";

     

       169
       169
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/is/thunderbird-91.1.1.tar.bz2";

     

       170
       170
        
             locale = "is";

     

       171
       171
        
             arch = "linux-x86_64";

     

       172
       172
       -
             sha256 = "5d8fc62ba40847027b9dc497294fd4a6a1ca34b1aadb934388d32942f0e47b47";

     

       172
       172
       +
             sha256 = "602ee80721bfa921805c1fff2b0802d7845d7970645cbb839e5d0f6e25b5fe65";

     

       173
       173
        
           }

     

       174
       174
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/it/thunderbird-91.1.0.tar.bz2";

     

       174
       174
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/it/thunderbird-91.1.1.tar.bz2";

     

       175
       175
        
             locale = "it";

     

       176
       176
        
             arch = "linux-x86_64";

     

       177
       177
       -
             sha256 = "f5f0b1101e4ac664af9b4acf63d40d9cd1109653ce4f397a22f0d61f13576261";

     

       177
       177
       +
             sha256 = "7e55d0b20027e23d3340a593beeebac0fead2dd0d048133b2e42dbb33288c4c5";

     

       178
       178
        
           }

     

       179
       179
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ja/thunderbird-91.1.0.tar.bz2";

     

       179
       179
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ja/thunderbird-91.1.1.tar.bz2";

     

       180
       180
        
             locale = "ja";

     

       181
       181
        
             arch = "linux-x86_64";

     

       182
       182
       -
             sha256 = "7be97e12f05418cb82d86731130f0c2ebfc0c8aacc7f4120be2ec11d53b5980d";

     

       182
       182
       +
             sha256 = "df67309b344f46f9ead5939a2f0f7bc34b90bf4cfa4cc28a662391146951c4a0";

     

       183
       183
        
           }

     

       184
       184
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ka/thunderbird-91.1.0.tar.bz2";

     

       184
       184
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ka/thunderbird-91.1.1.tar.bz2";

     

       185
       185
        
             locale = "ka";

     

       186
       186
        
             arch = "linux-x86_64";

     

       187
       187
       -
             sha256 = "47438a6fa2bad17d57f90fb083f70ec023d65a9a344fd4ffa137cec9ceb1b29d";

     

       187
       187
       +
             sha256 = "0992f5884dec1431a1c82e289195db7561a8089e7cd7d8fb940c0435e365b6f2";

     

       188
       188
        
           }

     

       189
       189
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kab/thunderbird-91.1.0.tar.bz2";

     

       189
       189
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kab/thunderbird-91.1.1.tar.bz2";

     

       190
       190
        
             locale = "kab";

     

       191
       191
        
             arch = "linux-x86_64";

     

       192
       192
       -
             sha256 = "0037b1e8514c25fcbd05fb8dbb66880cbbf22d2bee443d14cca4acb3ef994982";

     

       192
       192
       +
             sha256 = "37eb0b67bb564762f8c88fac75c9ef8a51ad4ca302e3bc5f4d99ff799a141309";

     

       193
       193
        
           }

     

       194
       194
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kk/thunderbird-91.1.0.tar.bz2";

     

       194
       194
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kk/thunderbird-91.1.1.tar.bz2";

     

       195
       195
        
             locale = "kk";

     

       196
       196
        
             arch = "linux-x86_64";

     

       197
       197
       -
             sha256 = "749e22fb529f7d710a6a2ebeae9eb5019fad8cfda8f6678da9749bb2709fccd5";

     

       197
       197
       +
             sha256 = "16fcf81dd18c51826d3a93e6393c820227322ad4cceaa668a22fcf79d9fe0773";

     

       198
       198
        
           }

     

       199
       199
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ko/thunderbird-91.1.0.tar.bz2";

     

       199
       199
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ko/thunderbird-91.1.1.tar.bz2";

     

       200
       200
        
             locale = "ko";

     

       201
       201
        
             arch = "linux-x86_64";

     

       202
       202
       -
             sha256 = "d69205bc220de204535569d058230b9888d58cae8f8c44ff1fcec78a6443223a";

     

       202
       202
       +
             sha256 = "4e6b0bb94ae1442b987b5e98ef287f6cdd354d13ecbb14dfc25b04ba17b3961d";

     

       203
       203
        
           }

     

       204
       204
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lt/thunderbird-91.1.0.tar.bz2";

     

       204
       204
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lt/thunderbird-91.1.1.tar.bz2";

     

       205
       205
        
             locale = "lt";

     

       206
       206
        
             arch = "linux-x86_64";

     

       207
       207
       -
             sha256 = "8d670513f40d04e73cab28bf2cbed5865c11c9ca22abd7b0c7f8e823e0d1553a";

     

       207
       207
       +
             sha256 = "03364e6f6104f083bd38dbd65c1d451186757e07460840a1fc8ed8d71f00cc8b";

     

       208
       208
        
           }

     

       209
       209
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lv/thunderbird-91.1.0.tar.bz2";

     

       209
       209
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lv/thunderbird-91.1.1.tar.bz2";

     

       210
       210
        
             locale = "lv";

     

       211
       211
        
             arch = "linux-x86_64";

     

       212
       212
       -
             sha256 = "1e8f6b5189b289b7538b4d49ab79e384f721c90279dbafb74fa797eed3144a00";

     

       212
       212
       +
             sha256 = "4da6a4e457aadb58819c3b44432c5a5ff17f2be378fb461d859a92768e2c4b7e";

     

       213
       213
        
           }

     

       214
       214
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ms/thunderbird-91.1.0.tar.bz2";

     

       214
       214
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ms/thunderbird-91.1.1.tar.bz2";

     

       215
       215
        
             locale = "ms";

     

       216
       216
        
             arch = "linux-x86_64";

     

       217
       217
       -
             sha256 = "6c29d08a31ddf074afe987864fd597822d70438b27b4f3ba09637235d387c4c6";

     

       217
       217
       +
             sha256 = "8aae1245c40ba4b7682f5d26f3b90d9b5cfe53fbd00a755e699ddcea6ac5164f";

     

       218
       218
        
           }

     

       219
       219
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nb-NO/thunderbird-91.1.0.tar.bz2";

     

       219
       219
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nb-NO/thunderbird-91.1.1.tar.bz2";

     

       220
       220
        
             locale = "nb-NO";

     

       221
       221
        
             arch = "linux-x86_64";

     

       222
       222
       -
             sha256 = "b0427494aa505bc4fb0dbd22881c480d9b3b0003a1768010ae277403964cc069";

     

       222
       222
       +
             sha256 = "d279ee97817a87a87b8848f6cce8e1b0a9643095dbf46e3632df6242f9b05b23";

     

       223
       223
        
           }

     

       224
       224
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nl/thunderbird-91.1.0.tar.bz2";

     

       224
       224
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nl/thunderbird-91.1.1.tar.bz2";

     

       225
       225
        
             locale = "nl";

     

       226
       226
        
             arch = "linux-x86_64";

     

       227
       227
       -
             sha256 = "b690288643ecdda0f92c74ea1e27555dcbbfb5600e4b96c5f09fc6d438a07904";

     

       227
       227
       +
             sha256 = "f1d58f439aa8276b5baa475e696a6eedb484059eef66ed8ab6ea27f66182d53a";

     

       228
       228
        
           }

     

       229
       229
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nn-NO/thunderbird-91.1.0.tar.bz2";

     

       229
       229
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nn-NO/thunderbird-91.1.1.tar.bz2";

     

       230
       230
        
             locale = "nn-NO";

     

       231
       231
        
             arch = "linux-x86_64";

     

       232
       232
       -
             sha256 = "2d75277596380c477334f81ef75a20216502a767c307b50b29b1e9fb9c859c44";

     

       232
       232
       +
             sha256 = "703745b4b07778058a8ed8d4072700033f268ea513abc9f4dc7d1cdcf07c9c2c";

     

       233
       233
        
           }

     

       234
       234
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pa-IN/thunderbird-91.1.0.tar.bz2";

     

       234
       234
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pa-IN/thunderbird-91.1.1.tar.bz2";

     

       235
       235
        
             locale = "pa-IN";

     

       236
       236
        
             arch = "linux-x86_64";

     

       237
       237
       -
             sha256 = "1ab4a0c67f0ece7263b5aa67ff83e525b22aff82577ee80c422ebe8dc3df88e0";

     

       237
       237
       +
             sha256 = "46d756ecb4d5e566dc4a72115874b32bce8eba5de141448d461d795b0c81e78c";

     

       238
       238
        
           }

     

       239
       239
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pl/thunderbird-91.1.0.tar.bz2";

     

       239
       239
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pl/thunderbird-91.1.1.tar.bz2";

     

       240
       240
        
             locale = "pl";

     

       241
       241
        
             arch = "linux-x86_64";

     

       242
       242
       -
             sha256 = "d4ef5d8678c8ef56bfc29362ef1745daef81ae7f8769eef6dcb38e9c2575f694";

     

       242
       242
       +
             sha256 = "7384fd09796d727f82dd9f92b3faa67d53c415c01b44c885a998039eda703545";

     

       243
       243
        
           }

     

       244
       244
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-BR/thunderbird-91.1.0.tar.bz2";

     

       244
       244
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-BR/thunderbird-91.1.1.tar.bz2";

     

       245
       245
        
             locale = "pt-BR";

     

       246
       246
        
             arch = "linux-x86_64";

     

       247
       247
       -
             sha256 = "e29a8f74c456c3bb74e2c32aeb8b33b2e43a44f34ebdb965c62c26899c209b3e";

     

       247
       247
       +
             sha256 = "dcd97601965c25f43fc10bf59c5ccd3d62439ad3f1ed724c379951d2b514df72";

     

       248
       248
        
           }

     

       249
       249
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-PT/thunderbird-91.1.0.tar.bz2";

     

       249
       249
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-PT/thunderbird-91.1.1.tar.bz2";

     

       250
       250
        
             locale = "pt-PT";

     

       251
       251
        
             arch = "linux-x86_64";

     

       252
       252
       -
             sha256 = "2e4af178f24ef709d770e53511da6c9445b4c68f8326a820839dccc1c7f5f018";

     

       252
       252
       +
             sha256 = "225c2c87e5e18a987c1cad74622ace48bcda9dac7d420694f91c0c30757bfa23";

     

       253
       253
        
           }

     

       254
       254
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/rm/thunderbird-91.1.0.tar.bz2";

     

       254
       254
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/rm/thunderbird-91.1.1.tar.bz2";

     

       255
       255
        
             locale = "rm";

     

       256
       256
        
             arch = "linux-x86_64";

     

       257
       257
       -
             sha256 = "720067814b8b2ebcf4e4befffca4b64a2b3ede35a52cfbe155eacaaa55e3751f";

     

       257
       257
       +
             sha256 = "07ca0312828ee92b9d04ca5e62f6f4f65260faba80da1da5365a2614edd43dae";

     

       258
       258
        
           }

     

       259
       259
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ro/thunderbird-91.1.0.tar.bz2";

     

       259
       259
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ro/thunderbird-91.1.1.tar.bz2";

     

       260
       260
        
             locale = "ro";

     

       261
       261
        
             arch = "linux-x86_64";

     

       262
       262
       -
             sha256 = "c1c86c6e702182eb058abda2e3aae249f2baa84b8c920216d82b02dd93336736";

     

       262
       262
       +
             sha256 = "3cee1abefb6bcd9508a14e0b03e14f30b6aba95245ba79993d293fc92a3f7bb4";

     

       263
       263
        
           }

     

       264
       264
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ru/thunderbird-91.1.0.tar.bz2";

     

       264
       264
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ru/thunderbird-91.1.1.tar.bz2";

     

       265
       265
        
             locale = "ru";

     

       266
       266
        
             arch = "linux-x86_64";

     

       267
       267
       -
             sha256 = "79fa279c4b384c82952a8622c1fdbdd380f5c7c8519739daae923fe68a008168";

     

       267
       267
       +
             sha256 = "e6491ab33fa05012206b22223f78e2f6f575f9e99d33159f0c853b538c3ab9ce";

     

       268
       268
        
           }

     

       269
       269
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sk/thunderbird-91.1.0.tar.bz2";

     

       269
       269
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sk/thunderbird-91.1.1.tar.bz2";

     

       270
       270
        
             locale = "sk";

     

       271
       271
        
             arch = "linux-x86_64";

     

       272
       272
       -
             sha256 = "dcc35cf4d23ad70e58378d9ce85d6cb627601ba1b6703bfa91b1350d7c9db460";

     

       272
       272
       +
             sha256 = "b4cc3471da1cd3f1f9146bf5ba9d33f706df6d2988375a7f148223eba2cb88e5";

     

       273
       273
        
           }

     

       274
       274
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sl/thunderbird-91.1.0.tar.bz2";

     

       274
       274
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sl/thunderbird-91.1.1.tar.bz2";

     

       275
       275
        
             locale = "sl";

     

       276
       276
        
             arch = "linux-x86_64";

     

       277
       277
       -
             sha256 = "ffd4fd2047d6be06763c7e5d64936ed781ac55a6412236d3f4373e740f3effe2";

     

       277
       277
       +
             sha256 = "a83b61af2283d3c694ede815faaa0abfb3e6b7a346d9d984dbf3e50856532473";

     

       278
       278
        
           }

     

       279
       279
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sq/thunderbird-91.1.0.tar.bz2";

     

       279
       279
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sq/thunderbird-91.1.1.tar.bz2";

     

       280
       280
        
             locale = "sq";

     

       281
       281
        
             arch = "linux-x86_64";

     

       282
       282
       -
             sha256 = "db989f096cfbb11451877f7a55b89ecc3d95f3920716f3c094272f7f606350f7";

     

       282
       282
       +
             sha256 = "6562243bd3ca68b6b09c12745111c36a269e60593c5c458e04da12a9f1cfe7dc";

     

       283
       283
        
           }

     

       284
       284
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sr/thunderbird-91.1.0.tar.bz2";

     

       284
       284
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sr/thunderbird-91.1.1.tar.bz2";

     

       285
       285
        
             locale = "sr";

     

       286
       286
        
             arch = "linux-x86_64";

     

       287
       287
       -
             sha256 = "bc63020249bd66abcf17dd86daf72960c80fdfa334257031f88060d610b7b420";

     

       287
       287
       +
             sha256 = "2b8dee91bfe25480f1a7b12b3825e2445b369d6125df9a13271ef6a6af015db8";

     

       288
       288
        
           }

     

       289
       289
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sv-SE/thunderbird-91.1.0.tar.bz2";

     

       289
       289
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sv-SE/thunderbird-91.1.1.tar.bz2";

     

       290
       290
        
             locale = "sv-SE";

     

       291
       291
        
             arch = "linux-x86_64";

     

       292
       292
       -
             sha256 = "018f169ef69d4d43c860fa0b31102f87001035cdebbdaf9a296a5a9a42ffd351";

     

       292
       292
       +
             sha256 = "113e0ebd096ef5ea225c76e930cbdc58f2b529b39fe799310098abefa4652ee1";

     

       293
       293
        
           }

     

       294
       294
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/th/thunderbird-91.1.0.tar.bz2";

     

       294
       294
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/th/thunderbird-91.1.1.tar.bz2";

     

       295
       295
        
             locale = "th";

     

       296
       296
        
             arch = "linux-x86_64";

     

       297
       297
       -
             sha256 = "10a062c36ee778f9fb16cc90b27e51a00efc143008ea11c4e04a0261bcfd2001";

     

       297
       297
       +
             sha256 = "71b62b60167d06a02fcc90017b33d65c757d18d05fbf689607631ff1783941ce";

     

       298
       298
        
           }

     

       299
       299
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/tr/thunderbird-91.1.0.tar.bz2";

     

       299
       299
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/tr/thunderbird-91.1.1.tar.bz2";

     

       300
       300
        
             locale = "tr";

     

       301
       301
        
             arch = "linux-x86_64";

     

       302
       302
       -
             sha256 = "bbafbc16b0437fd507db0c72cdd0f13f40485329a1f6b238daf7f77c21290acb";

     

       302
       302
       +
             sha256 = "ab7f254131c8fdcc040d06d29ffdb0da6d95b9970f7640851bbdad337af0bd0a";

     

       303
       303
        
           }

     

       304
       304
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uk/thunderbird-91.1.0.tar.bz2";

     

       304
       304
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uk/thunderbird-91.1.1.tar.bz2";

     

       305
       305
        
             locale = "uk";

     

       306
       306
        
             arch = "linux-x86_64";

     

       307
       307
       -
             sha256 = "fb7488a541f284eda5862cf3f1f16e274fc3604d1ab3ec03c39c4779c9900c8d";

     

       307
       307
       +
             sha256 = "6da1aa51763b3acb2015eb78b50d5d6cc080bd606e2afdcf181d84095b0cedc3";

     

       308
       308
        
           }

     

       309
       309
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uz/thunderbird-91.1.0.tar.bz2";

     

       309
       309
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uz/thunderbird-91.1.1.tar.bz2";

     

       310
       310
        
             locale = "uz";

     

       311
       311
        
             arch = "linux-x86_64";

     

       312
       312
       -
             sha256 = "c8238bb841b37e4f468c95e07c714caacb2c028969d10ed88027b89ebd12f11a";

     

       312
       312
       +
             sha256 = "933513bdc1b1137dc627ec4895c3299d3633a105eadf2216b682fe36554c5f5b";

     

       313
       313
        
           }

     

       314
       314
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/vi/thunderbird-91.1.0.tar.bz2";

     

       314
       314
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/vi/thunderbird-91.1.1.tar.bz2";

     

       315
       315
        
             locale = "vi";

     

       316
       316
        
             arch = "linux-x86_64";

     

       317
       317
       -
             sha256 = "34bb1df38a05b37a0e8f976bf45aa2b95295e54d3cea32a199ac1a3b623086c4";

     

       317
       317
       +
             sha256 = "8f3eb2210a070983d87e6d5ec9908cabfdd012a4691443c39cbf2212d79e2394";

     

       318
       318
        
           }

     

       319
       319
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-CN/thunderbird-91.1.0.tar.bz2";

     

       319
       319
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-CN/thunderbird-91.1.1.tar.bz2";

     

       320
       320
        
             locale = "zh-CN";

     

       321
       321
        
             arch = "linux-x86_64";

     

       322
       322
       -
             sha256 = "e30dbf4980e33684f2011ce5fb938b1c78e106bf9f0386e720674e494e78b3a7";

     

       322
       322
       +
             sha256 = "0faa621dba2d2725bcd6b2a337feac5ee2d6bf66900ce30e1e5abbcddc15ca45";

     

       323
       323
        
           }

     

       324
       324
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-TW/thunderbird-91.1.0.tar.bz2";

     

       324
       324
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-TW/thunderbird-91.1.1.tar.bz2";

     

       325
       325
        
             locale = "zh-TW";

     

       326
       326
        
             arch = "linux-x86_64";

     

       327
       327
       -
             sha256 = "09e33501f8df2889820bea4ece53edd3a732b94cfad1a5006aca2f0930db80d4";

     

       327
       327
       +
             sha256 = "e236b7d2b9187a0ac780d7e0821cf29138d5f03321248e4edab0d1f2a7267cc7";

     

       328
       328
        
           }

     

       329
       329
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/af/thunderbird-91.1.0.tar.bz2";

     

       329
       329
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/af/thunderbird-91.1.1.tar.bz2";

     

       330
       330
        
             locale = "af";

     

       331
       331
        
             arch = "linux-i686";

     

       332
       332
       -
             sha256 = "def6badfd1fc47bcaf39eb729b32b7b18b60644d30ce1851e3c05a4e434aa55a";

     

       332
       332
       +
             sha256 = "624e9894eba97eafff7241dd73c2edd685e0786ba3e12f525980012d7dbae0e6";

     

       333
       333
        
           }

     

       334
       334
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ar/thunderbird-91.1.0.tar.bz2";

     

       334
       334
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ar/thunderbird-91.1.1.tar.bz2";

     

       335
       335
        
             locale = "ar";

     

       336
       336
        
             arch = "linux-i686";

     

       337
       337
       -
             sha256 = "53d0a95c544e619a25ac6cc7cc6679b1acee486e9c421a1daddbf8654b887afd";

     

       337
       337
       +
             sha256 = "62f250a1925e8b3cf2c98fe877b7b5a6d559d3fafb1320312fc765630c23a71b";

     

       338
       338
        
           }

     

       339
       339
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ast/thunderbird-91.1.0.tar.bz2";

     

       339
       339
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ast/thunderbird-91.1.1.tar.bz2";

     

       340
       340
        
             locale = "ast";

     

       341
       341
        
             arch = "linux-i686";

     

       342
       342
       -
             sha256 = "887af3d430ae6a9f8ab8c4e8660ad3ee96b7bdd0a20b97382e2ee19c75881907";

     

       342
       342
       +
             sha256 = "102b2e3d812eb4737f3d4ab63e2b696cb7cc2478ad438bed5c19299d65dc5ac6";

     

       343
       343
        
           }

     

       344
       344
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/be/thunderbird-91.1.0.tar.bz2";

     

       344
       344
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/be/thunderbird-91.1.1.tar.bz2";

     

       345
       345
        
             locale = "be";

     

       346
       346
        
             arch = "linux-i686";

     

       347
       347
       -
             sha256 = "b1c98702341cb8250518226dc6ce1403ff6e8c4d693d6e2c71216b8448fa8685";

     

       347
       347
       +
             sha256 = "ed15b0cc8c4d0dcc4071ccdc602fd796c5dc42a027f26595d1d8df2ab10267ba";

     

       348
       348
        
           }

     

       349
       349
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/bg/thunderbird-91.1.0.tar.bz2";

     

       349
       349
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/bg/thunderbird-91.1.1.tar.bz2";

     

       350
       350
        
             locale = "bg";

     

       351
       351
        
             arch = "linux-i686";

     

       352
       352
       -
             sha256 = "77637e9d2e135116f2136ba04a48e787b1c44f137430255126f9d45ecb1fb56b";

     

       352
       352
       +
             sha256 = "234f8ff03dbf19bd9100663ee517fa1630d0e7bd00953a056d5085021fa90324";

     

       353
       353
        
           }

     

       354
       354
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/br/thunderbird-91.1.0.tar.bz2";

     

       354
       354
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/br/thunderbird-91.1.1.tar.bz2";

     

       355
       355
        
             locale = "br";

     

       356
       356
        
             arch = "linux-i686";

     

       357
       357
       -
             sha256 = "f05f6536e425685296d257a7dabe838a9e09e3663d8315ac3f810a2f434e7087";

     

       357
       357
       +
             sha256 = "34c578de385448cad19dc368a04d0285cfb1520c31477f6eacc10ffa2e81a02d";

     

       358
       358
        
           }

     

       359
       359
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ca/thunderbird-91.1.0.tar.bz2";

     

       359
       359
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ca/thunderbird-91.1.1.tar.bz2";

     

       360
       360
        
             locale = "ca";

     

       361
       361
        
             arch = "linux-i686";

     

       362
       362
       -
             sha256 = "0509d0cde2a0fe2d6ac8dc2d5b850ddff7815145673dd2ee5a121dea95253f2c";

     

       362
       362
       +
             sha256 = "c3d3dfdeaa72254d02b12f72c83a95a2904a13f2e0c721d3baa5da0dd76bc2c8";

     

       363
       363
        
           }

     

       364
       364
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cak/thunderbird-91.1.0.tar.bz2";

     

       364
       364
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cak/thunderbird-91.1.1.tar.bz2";

     

       365
       365
        
             locale = "cak";

     

       366
       366
        
             arch = "linux-i686";

     

       367
       367
       -
             sha256 = "9838e298051a41e26f07b4b3fe2b986f17dae2a28abe6d6f1117c6f0a07a3792";

     

       367
       367
       +
             sha256 = "7cf60b8ecc692696081115f1df65f9976613ef34b57d412a6d3333a18400aa3c";

     

       368
       368
        
           }

     

       369
       369
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cs/thunderbird-91.1.0.tar.bz2";

     

       369
       369
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cs/thunderbird-91.1.1.tar.bz2";

     

       370
       370
        
             locale = "cs";

     

       371
       371
        
             arch = "linux-i686";

     

       372
       372
       -
             sha256 = "c480356bed2203f20c2e56b84a4f57782d8c439ee6f760a7bf71f6b635ff30fd";

     

       372
       372
       +
             sha256 = "59f01da4722c4317f80a7174f85fff9ba60a8341d589ef2cc27c565a529af2f5";

     

       373
       373
        
           }

     

       374
       374
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cy/thunderbird-91.1.0.tar.bz2";

     

       374
       374
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cy/thunderbird-91.1.1.tar.bz2";

     

       375
       375
        
             locale = "cy";

     

       376
       376
        
             arch = "linux-i686";

     

       377
       377
       -
             sha256 = "0b3787a4b535630cd18be5bd643f8a26bbe92b2a0d43a20638572bafd0ce7725";

     

       377
       377
       +
             sha256 = "470e65ebf016cd8fdcba1ad405df36d556c6fa43c23856b88d6da3fc58f80d81";

     

       378
       378
        
           }

     

       379
       379
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/da/thunderbird-91.1.0.tar.bz2";

     

       379
       379
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/da/thunderbird-91.1.1.tar.bz2";

     

       380
       380
        
             locale = "da";

     

       381
       381
        
             arch = "linux-i686";

     

       382
       382
       -
             sha256 = "83be22576ad41fa1c8cad84c7f7236f810248ecdf5cb0d1605693fe0193b28d7";

     

       382
       382
       +
             sha256 = "d1e95c7744d5058354e8626c361b7d529fefb2032cf380f8f129e84243221b9d";

     

       383
       383
        
           }

     

       384
       384
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/de/thunderbird-91.1.0.tar.bz2";

     

       384
       384
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/de/thunderbird-91.1.1.tar.bz2";

     

       385
       385
        
             locale = "de";

     

       386
       386
        
             arch = "linux-i686";

     

       387
       387
       -
             sha256 = "3edc194f461c6785f71353917a7e8451b838066238ac178031f0584b0c44c23d";

     

       387
       387
       +
             sha256 = "dbb632f5fe3a3ea2ffce78ef8984e78debf2b0d09ec42bfd1b642a7fd68dc93a";

     

       388
       388
        
           }

     

       389
       389
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/dsb/thunderbird-91.1.0.tar.bz2";

     

       389
       389
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/dsb/thunderbird-91.1.1.tar.bz2";

     

       390
       390
        
             locale = "dsb";

     

       391
       391
        
             arch = "linux-i686";

     

       392
       392
       -
             sha256 = "4d11e2475112e28836d08e091a4a42a6bb6cffc2ef91a5daa909af0559c564cf";

     

       392
       392
       +
             sha256 = "ab5d84870b77376fee50b082e14f2d5ce915f9041a63f09519ea5b8ab2c8c990";

     

       393
       393
        
           }

     

       394
       394
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/el/thunderbird-91.1.0.tar.bz2";

     

       394
       394
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/el/thunderbird-91.1.1.tar.bz2";

     

       395
       395
        
             locale = "el";

     

       396
       396
        
             arch = "linux-i686";

     

       397
       397
       -
             sha256 = "d4d1e9c7ab327bacfa0077cd1935660c7e49adba24be2be1af91ba5661872e65";

     

       397
       397
       +
             sha256 = "a96a8d96484b441210b98e768462237ad2e4306bcb20412028613f480160fcd3";

     

       398
       398
        
           }

     

       399
       399
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-CA/thunderbird-91.1.0.tar.bz2";

     

       399
       399
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-CA/thunderbird-91.1.1.tar.bz2";

     

       400
       400
        
             locale = "en-CA";

     

       401
       401
        
             arch = "linux-i686";

     

       402
       402
       -
             sha256 = "4ea129ba96f00ad35e727af252d864b5b7b5d299cd4d75961c399a1b112638b2";

     

       402
       402
       +
             sha256 = "f43fa2abb60bdeb571ec665d8f5779b049d3270f05e01e43795408e450240d85";

     

       403
       403
        
           }

     

       404
       404
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-GB/thunderbird-91.1.0.tar.bz2";

     

       404
       404
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-GB/thunderbird-91.1.1.tar.bz2";

     

       405
       405
        
             locale = "en-GB";

     

       406
       406
        
             arch = "linux-i686";

     

       407
       407
       -
             sha256 = "a8fb21782b4556d9f050b471c6de8871cd156b83bf3453e3fb1d5845d8cadc7f";

     

       407
       407
       +
             sha256 = "6c3c9f1c8f4e3f6cc6008cec83e5c234f797762ae05cdfe7dd7e95794f3fa007";

     

       408
       408
        
           }

     

       409
       409
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-US/thunderbird-91.1.0.tar.bz2";

     

       409
       409
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-US/thunderbird-91.1.1.tar.bz2";

     

       410
       410
        
             locale = "en-US";

     

       411
       411
        
             arch = "linux-i686";

     

       412
       412
       -
             sha256 = "46e6de8047c63b877ca7a34f2154851060833502d5bced598873d3f8d89cb099";

     

       412
       412
       +
             sha256 = "a6c3f8b935f8c5e185e621aed1725b82db1007c977949fb9f786b86bf024dffb";

     

       413
       413
        
           }

     

       414
       414
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-AR/thunderbird-91.1.0.tar.bz2";

     

       414
       414
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-AR/thunderbird-91.1.1.tar.bz2";

     

       415
       415
        
             locale = "es-AR";

     

       416
       416
        
             arch = "linux-i686";

     

       417
       417
       -
             sha256 = "d24b1067cc6249b7d89fbcfedf18e390939c7aa3c1e009554ae4a3e980ce8605";

     

       417
       417
       +
             sha256 = "e431f72359b602e4bb784626bda3f4526eda6ee5bddbe51d5c67fb62325da237";

     

       418
       418
        
           }

     

       419
       419
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-ES/thunderbird-91.1.0.tar.bz2";

     

       419
       419
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-ES/thunderbird-91.1.1.tar.bz2";

     

       420
       420
        
             locale = "es-ES";

     

       421
       421
        
             arch = "linux-i686";

     

       422
       422
       -
             sha256 = "5ab7cbff3a0bb6684eeed6698826f7c417fef3a774a08995b087dbb069768e37";

     

       422
       422
       +
             sha256 = "3f7ccfb4b86b11583289036792e78d080f558d8d58d1b11929664952076ed152";

     

       423
       423
        
           }

     

       424
       424
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/et/thunderbird-91.1.0.tar.bz2";

     

       424
       424
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/et/thunderbird-91.1.1.tar.bz2";

     

       425
       425
        
             locale = "et";

     

       426
       426
        
             arch = "linux-i686";

     

       427
       427
       -
             sha256 = "fd0a1e89d8c045e7858828c384ec9c1d805424b6d54cb46de7b45bec1266b89f";

     

       427
       427
       +
             sha256 = "4d224ed49c4cc300e22add49b79931b753155f5052d7d0572a3b99833351feb3";

     

       428
       428
        
           }

     

       429
       429
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/eu/thunderbird-91.1.0.tar.bz2";

     

       429
       429
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/eu/thunderbird-91.1.1.tar.bz2";

     

       430
       430
        
             locale = "eu";

     

       431
       431
        
             arch = "linux-i686";

     

       432
       432
       -
             sha256 = "02ddc8a6dc782d7148dcd799b87d10fe9d6417199bf4c245bf1baccfa173d6c1";

     

       432
       432
       +
             sha256 = "84ec201b40080de068c9a2d9ca4effb360102d34970964813f4335187fa0c472";

     

       433
       433
        
           }

     

       434
       434
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fi/thunderbird-91.1.0.tar.bz2";

     

       434
       434
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fi/thunderbird-91.1.1.tar.bz2";

     

       435
       435
        
             locale = "fi";

     

       436
       436
        
             arch = "linux-i686";

     

       437
       437
       -
             sha256 = "ede8df4035b3fbeb7a2dcd49fbfcf56d9be4c152e57d7bcffcf66b35eb02e8ee";

     

       437
       437
       +
             sha256 = "633a45dd1dd870dd0d486715328152ee092a5297f95f35ad4ac8c1a0fa59caba";

     

       438
       438
        
           }

     

       439
       439
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fr/thunderbird-91.1.0.tar.bz2";

     

       439
       439
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fr/thunderbird-91.1.1.tar.bz2";

     

       440
       440
        
             locale = "fr";

     

       441
       441
        
             arch = "linux-i686";

     

       442
       442
       -
             sha256 = "c343bc336f4c556af1ceaa597391608edcbc4f970f1fc6af6699853331d6b574";

     

       442
       442
       +
             sha256 = "1a5e668cdfc500652d3429ecddd987993c60032de0dd570c14256642927910e9";

     

       443
       443
        
           }

     

       444
       444
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fy-NL/thunderbird-91.1.0.tar.bz2";

     

       444
       444
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fy-NL/thunderbird-91.1.1.tar.bz2";

     

       445
       445
        
             locale = "fy-NL";

     

       446
       446
        
             arch = "linux-i686";

     

       447
       447
       -
             sha256 = "2f2d2e7b47ea8b38379b883f4c3296110f82450d5dd5e64b76588b4bb8de6462";

     

       447
       447
       +
             sha256 = "86d52dfe0a63c7f066f4d6b677d1b2d1025b60d7ca556f2cce074ac529d49948";

     

       448
       448
        
           }

     

       449
       449
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ga-IE/thunderbird-91.1.0.tar.bz2";

     

       449
       449
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ga-IE/thunderbird-91.1.1.tar.bz2";

     

       450
       450
        
             locale = "ga-IE";

     

       451
       451
        
             arch = "linux-i686";

     

       452
       452
       -
             sha256 = "3b60ca04b46298c5e560a9a85d01bdb1e2254b25b1592f78c616822f07454bc8";

     

       452
       452
       +
             sha256 = "0a116945f0ce9f51feb9658756bbb706830709155d21f4d32be5bb9c2ba3924b";

     

       453
       453
        
           }

     

       454
       454
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gd/thunderbird-91.1.0.tar.bz2";

     

       454
       454
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gd/thunderbird-91.1.1.tar.bz2";

     

       455
       455
        
             locale = "gd";

     

       456
       456
        
             arch = "linux-i686";

     

       457
       457
       -
             sha256 = "bc07c4aaa55fb554fbf5a5ff5f7f03360ba048047e3e3365e28b995d40c60372";

     

       457
       457
       +
             sha256 = "ddf29128560baf824d5ab984cc4c219318d62d1f6946c83f1e281bf59dfde046";

     

       458
       458
        
           }

     

       459
       459
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gl/thunderbird-91.1.0.tar.bz2";

     

       459
       459
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gl/thunderbird-91.1.1.tar.bz2";

     

       460
       460
        
             locale = "gl";

     

       461
       461
        
             arch = "linux-i686";

     

       462
       462
       -
             sha256 = "b5ce738aeff507c8aa9dd3f7d0303d877188e0f51a99291ab8090b3af7e92a2c";

     

       462
       462
       +
             sha256 = "28e291c985d8b618bb88a65995f0c523d18a231bd9e3020b743815754d2f761a";

     

       463
       463
        
           }

     

       464
       464
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/he/thunderbird-91.1.0.tar.bz2";

     

       464
       464
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/he/thunderbird-91.1.1.tar.bz2";

     

       465
       465
        
             locale = "he";

     

       466
       466
        
             arch = "linux-i686";

     

       467
       467
       -
             sha256 = "3fe4505d46483e73e165185b449633169f8d3507c4c1a30d99e3442269907f79";

     

       467
       467
       +
             sha256 = "daecfd126e4e7f7eed943c715b7e0e17fb1b17b55963211130a2326bdeaf2fa9";

     

       468
       468
        
           }

     

       469
       469
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hr/thunderbird-91.1.0.tar.bz2";

     

       469
       469
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hr/thunderbird-91.1.1.tar.bz2";

     

       470
       470
        
             locale = "hr";

     

       471
       471
        
             arch = "linux-i686";

     

       472
       472
       -
             sha256 = "87d7a3dce52e7fe0ea9d8fe610bd6683e14c0e65cfc6c4c25e5b258a468ff9ec";

     

       472
       472
       +
             sha256 = "f685cf4629e13337795d25f7e75bf2f24abca87e35e41c62b0f48613a2e57365";

     

       473
       473
        
           }

     

       474
       474
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hsb/thunderbird-91.1.0.tar.bz2";

     

       474
       474
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hsb/thunderbird-91.1.1.tar.bz2";

     

       475
       475
        
             locale = "hsb";

     

       476
       476
        
             arch = "linux-i686";

     

       477
       477
       -
             sha256 = "4befc38910d18cc91b27ccbcd54a04cc87f709a7a5908f48c16b90fa5118b833";

     

       477
       477
       +
             sha256 = "d9161bb816887e1fc2296dcd942f0fb4736f86bc8a8122f61caeffac75b0c19f";

     

       478
       478
        
           }

     

       479
       479
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hu/thunderbird-91.1.0.tar.bz2";

     

       479
       479
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hu/thunderbird-91.1.1.tar.bz2";

     

       480
       480
        
             locale = "hu";

     

       481
       481
        
             arch = "linux-i686";

     

       482
       482
       -
             sha256 = "9ae438b5b09d2390e3d934c85cad39d7a5dc733b1ad3add74c1700faff19bc6f";

     

       482
       482
       +
             sha256 = "80e69465e6afd1b50a695b30fcfdc13ad2c051e75fcec666276935874e79d5fe";

     

       483
       483
        
           }

     

       484
       484
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hy-AM/thunderbird-91.1.0.tar.bz2";

     

       484
       484
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hy-AM/thunderbird-91.1.1.tar.bz2";

     

       485
       485
        
             locale = "hy-AM";

     

       486
       486
        
             arch = "linux-i686";

     

       487
       487
       -
             sha256 = "f0bf9acdc4f7b7b5b9e0d1a6005bb4919f10474a19aa9c54a4696ec3b6ec6853";

     

       487
       487
       +
             sha256 = "a1aff21e7b07bcc20685d906d69d6b2515983263d90d2a2533e58d6c74046fbf";

     

       488
       488
        
           }

     

       489
       489
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/id/thunderbird-91.1.0.tar.bz2";

     

       489
       489
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/id/thunderbird-91.1.1.tar.bz2";

     

       490
       490
        
             locale = "id";

     

       491
       491
        
             arch = "linux-i686";

     

       492
       492
       -
             sha256 = "3b266327a9681e5b2299b860f4ba6153c49d2417c3f506bb721dad4e6bebf21f";

     

       492
       492
       +
             sha256 = "e911dd870b7a33d50278597a6cd1970c15578716f97a1ca90bac2813c4aabcb6";

     

       493
       493
        
           }

     

       494
       494
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/is/thunderbird-91.1.0.tar.bz2";

     

       494
       494
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/is/thunderbird-91.1.1.tar.bz2";

     

       495
       495
        
             locale = "is";

     

       496
       496
        
             arch = "linux-i686";

     

       497
       497
       -
             sha256 = "63c5947e73d86ccda38e2f600b2bf17378e44c8ef0137fc8cf788d9fd04c90b8";

     

       497
       497
       +
             sha256 = "ec91be584ef82def938d295925b1231f7ea50bf9e171d90ce74ae575970c5e5b";

     

       498
       498
        
           }

     

       499
       499
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/it/thunderbird-91.1.0.tar.bz2";

     

       499
       499
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/it/thunderbird-91.1.1.tar.bz2";

     

       500
       500
        
             locale = "it";

     

       501
       501
        
             arch = "linux-i686";

     

       502
       502
       -
             sha256 = "de701cb3aa59f540e7fe9cb364a34ad7b6072ef407530555e9bcde1799cf1afe";

     

       502
       502
       +
             sha256 = "971d7ff2f20926b9148ac6386f2d5824a1443b3a4618e67cf4c30c14f126d711";

     

       503
       503
        
           }

     

       504
       504
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ja/thunderbird-91.1.0.tar.bz2";

     

       504
       504
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ja/thunderbird-91.1.1.tar.bz2";

     

       505
       505
        
             locale = "ja";

     

       506
       506
        
             arch = "linux-i686";

     

       507
       507
       -
             sha256 = "16ddb5bf1cb3338a511b0e22f7b48e4dee43c364e0d8f1df5dca4354946c6d41";

     

       507
       507
       +
             sha256 = "17526869e3234f885f2078c98a8442b2dd5a019a529d31e0bb6df5b6be24be8b";

     

       508
       508
        
           }

     

       509
       509
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ka/thunderbird-91.1.0.tar.bz2";

     

       509
       509
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ka/thunderbird-91.1.1.tar.bz2";

     

       510
       510
        
             locale = "ka";

     

       511
       511
        
             arch = "linux-i686";

     

       512
       512
       -
             sha256 = "4fa177e0e9f4227bb389fb784a491730da682331161b6716caa64f9859756a96";

     

       512
       512
       +
             sha256 = "945beaab6b2bac56b13f7329b98fe6bf621fa9f3c022b3568dfa43bdce6e422c";

     

       513
       513
        
           }

     

       514
       514
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kab/thunderbird-91.1.0.tar.bz2";

     

       514
       514
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kab/thunderbird-91.1.1.tar.bz2";

     

       515
       515
        
             locale = "kab";

     

       516
       516
        
             arch = "linux-i686";

     

       517
       517
       -
             sha256 = "79ece60db326d24b0672c518356c5af52f4bc32955d9e9df3d342d5179768f2c";

     

       517
       517
       +
             sha256 = "39b6835112c58cba3b5e4b2f6964dbd9982c8146f0290aed9b13b10ae159bdd5";

     

       518
       518
        
           }

     

       519
       519
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kk/thunderbird-91.1.0.tar.bz2";

     

       519
       519
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kk/thunderbird-91.1.1.tar.bz2";

     

       520
       520
        
             locale = "kk";

     

       521
       521
        
             arch = "linux-i686";

     

       522
       522
       -
             sha256 = "cdd426bf11206588de80d4b8d68498748444e0536da9e6cc62f1b066faf195dd";

     

       522
       522
       +
             sha256 = "a5c4fcd5d4e91c52814b2e8c6b0b239e0c430ea6169b351b33beb2b0736fa94b";

     

       523
       523
        
           }

     

       524
       524
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ko/thunderbird-91.1.0.tar.bz2";

     

       524
       524
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ko/thunderbird-91.1.1.tar.bz2";

     

       525
       525
        
             locale = "ko";

     

       526
       526
        
             arch = "linux-i686";

     

       527
       527
       -
             sha256 = "4b18853761c82122d814d95a57c161647f97de344e57f2600fa562332b56362e";

     

       527
       527
       +
             sha256 = "97e5ae5cd2def5410de5b8a3194f77c53fc4ecb17572e9925a4bff56cb2ca73e";

     

       528
       528
        
           }

     

       529
       529
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lt/thunderbird-91.1.0.tar.bz2";

     

       529
       529
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lt/thunderbird-91.1.1.tar.bz2";

     

       530
       530
        
             locale = "lt";

     

       531
       531
        
             arch = "linux-i686";

     

       532
       532
       -
             sha256 = "dc44e61c6bbc3efe61310cf8541e33b04f2ad4a38a70826704706dba50622658";

     

       532
       532
       +
             sha256 = "2fc8d9d3fe286efa337d98d033b43d9d0b1c7fec15e566ed6ae98272df6adbb3";

     

       533
       533
        
           }

     

       534
       534
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lv/thunderbird-91.1.0.tar.bz2";

     

       534
       534
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lv/thunderbird-91.1.1.tar.bz2";

     

       535
       535
        
             locale = "lv";

     

       536
       536
        
             arch = "linux-i686";

     

       537
       537
       -
             sha256 = "1ed31684fd7279c051c47a9d032c4c4e77e2ff396977dcd223a0608fc3ecc400";

     

       537
       537
       +
             sha256 = "3a480801c29e7661b73a01d1d29455bbaa4f228a749da467400ebe0c973c5150";

     

       538
       538
        
           }

     

       539
       539
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ms/thunderbird-91.1.0.tar.bz2";

     

       539
       539
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ms/thunderbird-91.1.1.tar.bz2";

     

       540
       540
        
             locale = "ms";

     

       541
       541
        
             arch = "linux-i686";

     

       542
       542
       -
             sha256 = "da27a3e094394650fb86ce53e737502628c12dd7a3c7d179367f7e5f4810bd13";

     

       542
       542
       +
             sha256 = "143e04a636d4e3df7ebab4a26419f0df6131a911c7b158848a1a0f4a51b8c6f5";

     

       543
       543
        
           }

     

       544
       544
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nb-NO/thunderbird-91.1.0.tar.bz2";

     

       544
       544
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nb-NO/thunderbird-91.1.1.tar.bz2";

     

       545
       545
        
             locale = "nb-NO";

     

       546
       546
        
             arch = "linux-i686";

     

       547
       547
       -
             sha256 = "ac7acf9de057d8beded959c557ee1fb42513191c1580784cb710118ff9bbb919";

     

       547
       547
       +
             sha256 = "4f3f731b0a9b2dd7496b9cf9e3df7c54924f821b8afd404848b8bee4c37db7c6";

     

       548
       548
        
           }

     

       549
       549
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nl/thunderbird-91.1.0.tar.bz2";

     

       549
       549
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nl/thunderbird-91.1.1.tar.bz2";

     

       550
       550
        
             locale = "nl";

     

       551
       551
        
             arch = "linux-i686";

     

       552
       552
       -
             sha256 = "6311048f81b579cc49cac62b6b21c138d5d91c8ad3bebbf1c27c63cb1e60afc1";

     

       552
       552
       +
             sha256 = "d6b758c9a5aff775088ebfe3c696d6275ecb2b2a4b7129ab3b79b23fe773e49a";

     

       553
       553
        
           }

     

       554
       554
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nn-NO/thunderbird-91.1.0.tar.bz2";

     

       554
       554
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nn-NO/thunderbird-91.1.1.tar.bz2";

     

       555
       555
        
             locale = "nn-NO";

     

       556
       556
        
             arch = "linux-i686";

     

       557
       557
       -
             sha256 = "840c272897c1bd36e7e182acaf7eb1adda59c59c4b9809fbfe5fe71c14a67074";

     

       557
       557
       +
             sha256 = "89bdee0a436d53cba1acddc9187b8bf7036d3f8b2d6f8a60a1f7d1e7aae4687a";

     

       558
       558
        
           }

     

       559
       559
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pa-IN/thunderbird-91.1.0.tar.bz2";

     

       559
       559
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pa-IN/thunderbird-91.1.1.tar.bz2";

     

       560
       560
        
             locale = "pa-IN";

     

       561
       561
        
             arch = "linux-i686";

     

       562
       562
       -
             sha256 = "b56782bbd782840b9a1e4b9eb721539881443e7cf99f521078f86a220f425ad1";

     

       562
       562
       +
             sha256 = "9def18033f40abd87764ee12a0c9a104df9ffbf5813b398251d86b26676aa57a";

     

       563
       563
        
           }

     

       564
       564
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pl/thunderbird-91.1.0.tar.bz2";

     

       564
       564
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pl/thunderbird-91.1.1.tar.bz2";

     

       565
       565
        
             locale = "pl";

     

       566
       566
        
             arch = "linux-i686";

     

       567
       567
       -
             sha256 = "e8883f496b67b9689e28d9313e038141876cd95e539b05fe020760f62057e934";

     

       567
       567
       +
             sha256 = "e69e2f319a7691af209e517f7624a10e942c052fbff40cbe3e0cf057d5e8ce60";

     

       568
       568
        
           }

     

       569
       569
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-BR/thunderbird-91.1.0.tar.bz2";

     

       569
       569
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-BR/thunderbird-91.1.1.tar.bz2";

     

       570
       570
        
             locale = "pt-BR";

     

       571
       571
        
             arch = "linux-i686";

     

       572
       572
       -
             sha256 = "b5f24053b799799b161a572ad51b591c8145743c6d00ece95a7c9f57753fbb98";

     

       572
       572
       +
             sha256 = "ce0a025976a058e01dcec3c7c22005cc8061dd118cbb5766e34e1fa2e2d24ee6";

     

       573
       573
        
           }

     

       574
       574
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-PT/thunderbird-91.1.0.tar.bz2";

     

       574
       574
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-PT/thunderbird-91.1.1.tar.bz2";

     

       575
       575
        
             locale = "pt-PT";

     

       576
       576
        
             arch = "linux-i686";

     

       577
       577
       -
             sha256 = "83e4a41dab8ba18dd4bf14adcbc5cd27ea3fd9a3c5ad7d49c696eaa7159ec536";

     

       577
       577
       +
             sha256 = "0e46088f48739f26d94f92aeef401f136006f0cfc67b9445573539f08e9175fa";

     

       578
       578
        
           }

     

       579
       579
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/rm/thunderbird-91.1.0.tar.bz2";

     

       579
       579
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/rm/thunderbird-91.1.1.tar.bz2";

     

       580
       580
        
             locale = "rm";

     

       581
       581
        
             arch = "linux-i686";

     

       582
       582
       -
             sha256 = "079756fde88f2701a044b553b5c3076988951efed9029dc4e7a5b4e0e8ba4e93";

     

       582
       582
       +
             sha256 = "7efd235fd88601a74d2e6a2d9e481fbb011e4a3695128997754d97917a94669d";

     

       583
       583
        
           }

     

       584
       584
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ro/thunderbird-91.1.0.tar.bz2";

     

       584
       584
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ro/thunderbird-91.1.1.tar.bz2";

     

       585
       585
        
             locale = "ro";

     

       586
       586
        
             arch = "linux-i686";

     

       587
       587
       -
             sha256 = "8c30ba26f8e8cd684bd72394164e4f9dc1ebc0d8186e78ab39a6ea8fa5119f66";

     

       587
       587
       +
             sha256 = "9ada46d39f4eedb097b177d2c443dccc05af71a12f370b202aa0bf259c0cd7c5";

     

       588
       588
        
           }

     

       589
       589
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ru/thunderbird-91.1.0.tar.bz2";

     

       589
       589
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ru/thunderbird-91.1.1.tar.bz2";

     

       590
       590
        
             locale = "ru";

     

       591
       591
        
             arch = "linux-i686";

     

       592
       592
       -
             sha256 = "718c94a9a7879dcde959665d1b78d8ac78e6e4ff1fa047178587b543cdcdc046";

     

       592
       592
       +
             sha256 = "0e4d029183f9125a4d1efe81cba348155336a37267db346436698430808a3da6";

     

       593
       593
        
           }

     

       594
       594
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sk/thunderbird-91.1.0.tar.bz2";

     

       594
       594
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sk/thunderbird-91.1.1.tar.bz2";

     

       595
       595
        
             locale = "sk";

     

       596
       596
        
             arch = "linux-i686";

     

       597
       597
       -
             sha256 = "46e0a7046c1b87ee70122a499778af86cc7d0af01995a081e8a6f1e9ff3bcbae";

     

       597
       597
       +
             sha256 = "a4712e2e477bb96bcb69eb8ea96200f81b1eb829db3675844380f68b1d264915";

     

       598
       598
        
           }

     

       599
       599
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sl/thunderbird-91.1.0.tar.bz2";

     

       599
       599
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sl/thunderbird-91.1.1.tar.bz2";

     

       600
       600
        
             locale = "sl";

     

       601
       601
        
             arch = "linux-i686";

     

       602
       602
       -
             sha256 = "bb789aefaefa4c12276dd26e97684fd3ef2294b67ca6950f8acbf515377b0848";

     

       602
       602
       +
             sha256 = "46f4f3dfe12614ceb8a249a4d38df2b40728082ce0448af03c2949f0d81d1969";

     

       603
       603
        
           }

     

       604
       604
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sq/thunderbird-91.1.0.tar.bz2";

     

       604
       604
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sq/thunderbird-91.1.1.tar.bz2";

     

       605
       605
        
             locale = "sq";

     

       606
       606
        
             arch = "linux-i686";

     

       607
       607
       -
             sha256 = "47a05b2db86bd268a44fe7a77a8960f11142ecdca16ffcee427603801add1c33";

     

       607
       607
       +
             sha256 = "c5209bea51a081b6707ee79640ab663b3975af8c1bb26df05e480f5ad6dba723";

     

       608
       608
        
           }

     

       609
       609
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sr/thunderbird-91.1.0.tar.bz2";

     

       609
       609
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sr/thunderbird-91.1.1.tar.bz2";

     

       610
       610
        
             locale = "sr";

     

       611
       611
        
             arch = "linux-i686";

     

       612
       612
       -
             sha256 = "cf9789eb0f84697c66ed3ceccdbbe6a9e13fea2c27768e822f4e24a90950dfab";

     

       612
       612
       +
             sha256 = "8cb6bb676a7143f10d5c666e41398b4045f32ca13bfd6a322d308f6b05dda441";

     

       613
       613
        
           }

     

       614
       614
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sv-SE/thunderbird-91.1.0.tar.bz2";

     

       614
       614
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sv-SE/thunderbird-91.1.1.tar.bz2";

     

       615
       615
        
             locale = "sv-SE";

     

       616
       616
        
             arch = "linux-i686";

     

       617
       617
       -
             sha256 = "bf3482ee0f9203acc262984ee886ab32da27f2a75c7681028bc0b3ab1f0a0c71";

     

       617
       617
       +
             sha256 = "33736665f7c38a62ed65340acead5435599dcbb8c7892ce939664662168078cf";

     

       618
       618
        
           }

     

       619
       619
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/th/thunderbird-91.1.0.tar.bz2";

     

       619
       619
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/th/thunderbird-91.1.1.tar.bz2";

     

       620
       620
        
             locale = "th";

     

       621
       621
        
             arch = "linux-i686";

     

       622
       622
       -
             sha256 = "167a81fc42ef0bd51f149695c6acc36ab7df04c10ff727b119c295b7046481f9";

     

       622
       622
       +
             sha256 = "0fd5af0ffc983f58c85756274d9d94f26a44c32aff3852b22ac0554375b8eac3";

     

       623
       623
        
           }

     

       624
       624
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/tr/thunderbird-91.1.0.tar.bz2";

     

       624
       624
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/tr/thunderbird-91.1.1.tar.bz2";

     

       625
       625
        
             locale = "tr";

     

       626
       626
        
             arch = "linux-i686";

     

       627
       627
       -
             sha256 = "f508d7a071fd6c641cbd70944b784e553ab7bd4ec8e084e0ece6746b7ad149ca";

     

       627
       627
       +
             sha256 = "6f8318a023062b306a64cc615bbffb96d06b608c625a0134f28d60629f5986c8";

     

       628
       628
        
           }

     

       629
       629
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uk/thunderbird-91.1.0.tar.bz2";

     

       629
       629
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uk/thunderbird-91.1.1.tar.bz2";

     

       630
       630
        
             locale = "uk";

     

       631
       631
        
             arch = "linux-i686";

     

       632
       632
       -
             sha256 = "2505fe82a01770c279a0c3c9a29d8eb02c3078ea3c6f3be956b531277a6125aa";

     

       632
       632
       +
             sha256 = "fede0c129370c93df5cb9e9f5e9bef69c6ad6bb96db11bdb520c743183ea2b41";

     

       633
       633
        
           }

     

       634
       634
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uz/thunderbird-91.1.0.tar.bz2";

     

       634
       634
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uz/thunderbird-91.1.1.tar.bz2";

     

       635
       635
        
             locale = "uz";

     

       636
       636
        
             arch = "linux-i686";

     

       637
       637
       -
             sha256 = "25ffeef15ef2f0f9d939ce09edc9a5e8d58f23c94c0cfd4bf952e2ad5a373fd1";

     

       637
       637
       +
             sha256 = "23db48eaf9101a4a838487ab4f31d7504036b0204a1624e0ac750bba6de24437";

     

       638
       638
        
           }

     

       639
       639
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/vi/thunderbird-91.1.0.tar.bz2";

     

       639
       639
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/vi/thunderbird-91.1.1.tar.bz2";

     

       640
       640
        
             locale = "vi";

     

       641
       641
        
             arch = "linux-i686";

     

       642
       642
       -
             sha256 = "fab7cdf7def4e8f34d891275c914b42a75d174e5fe807642c6d47ad09622dd07";

     

       642
       642
       +
             sha256 = "55ec78e15967365bc41fc2b1469af78cc9300a0365587ec72463e9e97958020b";

     

       643
       643
        
           }

     

       644
       644
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-CN/thunderbird-91.1.0.tar.bz2";

     

       644
       644
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-CN/thunderbird-91.1.1.tar.bz2";

     

       645
       645
        
             locale = "zh-CN";

     

       646
       646
        
             arch = "linux-i686";

     

       647
       647
       -
             sha256 = "e113f02eba4e13ce2a17098576b87a2b64b969d97c11a4dd8bb561467bf26f3b";

     

       647
       647
       +
             sha256 = "008216b04c79fb96686a747f9756caa2cc02aa052e7e682b0ba9bef0138d2ef6";

     

       648
       648
        
           }

     

       649
       649
       -
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-TW/thunderbird-91.1.0.tar.bz2";

     

       649
       649
       +
           { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-TW/thunderbird-91.1.1.tar.bz2";

     

       650
       650
        
             locale = "zh-TW";

     

       651
       651
        
             arch = "linux-i686";

     

       652
       652
       -
             sha256 = "0a3733c11855cd48504e82c32172e7cedb1a57d402e8f1f4a6e8a305b9eda3ec";

     

       652
       652
       +
             sha256 = "bb222c6f9c8e5ed7681fa920ff6bb6e9d1262e16efb994dd5976e575e4f54a7c";

     

       653
       653
        
           }

     

       654
       654
        
           ];

     

       655
       655
        
       }

-22

pkgs/applications/networking/mailreaders/thunderbird/D124361.diff

···

       1
       1
       -
       diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common

     

       2
       2
       -
       --- a/comm/mail/config/mozconfigs/common

     

       3
       3
       -
       +++ b/comm/mail/config/mozconfigs/common

     

       4
       4
       -
       @@ -1,6 +1,3 @@

     

       5
       5
       -
        ac_add_options --enable-application=comm/mail

     

       6
       6
       -
        

     

       7
       7
       -
       -# Disable enforcing that add-ons are signed by the trusted root.

     

       8
       8
       -
       -MOZ_REQUIRE_SIGNING=

     

       9
       9
       -
       -

     

       10
       10
       -
        . "$topsrcdir/build/mozconfig.common.override"

     

       11
       11
       -
       diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure

     

       12
       12
       -
       --- a/comm/mail/moz.configure

     

       13
       13
       -
       +++ b/comm/mail/moz.configure

     

       14
       14
       -
       @@ -12,6 +12,7 @@

     

       15
       15
       -
        imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/")

     

       16
       16
       -
        

     

       17
       17
       -
        imply_option("--enable-default-browser-agent", False)

     

       18
       18
       -
       +imply_option("MOZ_REQUIRE_SIGNING", False)

     

       19
       19
       -
        

     

       20
       20
       -
        

     

       21
       21
       -
        @depends(target_is_windows, target_is_linux)

     

       22
       22
       -

-13

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch

···

       1
       1
       -
       Remove about:buildconfig.  If used as-is, it would add unnecessary runtime dependencies.

     

       2
       2
       -
       --- a/comm/mail/base/jar.mn

     

       3
       3
       -
       +++ b/comm/mail/base/jar.mn

     

       4
       4
       -
       @@ -119,9 +119,6 @@ messenger.jar:

     

       5
       5
       -
        % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js

     

       6
       6
       -
        % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml

     

       7
       7
       -
        

     

       8
       8
       -
       -*   content/messenger/buildconfig.html              (content/buildconfig.html)

     

       9
       9
       -
       -% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html

     

       10
       10
       -
       -

     

       11
       11
       -
        # L10n resources and overrides.

     

       12
       12
       -
        % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd

     

       13
       13
       -
        % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd

+2 -9

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

···

       10
       10
        
       rec {

     

       11
       11
        
         thunderbird = common rec {

     

       12
       12
        
           pname = "thunderbird";

     

       13
       13
       -
           version = "91.1.0";

     

       13
       13
       +
           version = "91.1.1";

     

       14
       14
        
           application = "comm/mail";

     

       15
       15
        
           binaryName = pname;

     

       16
       16
        
           src = fetchurl {

     

       17
       17
        
             url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

     

       18
       18
       -
             sha512 = "c465ff25d67c5c28db53d3b1ccda10a743276e58c693406bf31bde0253f34123348180ae18765bd60b958c050e3a874dd69ac82d7612007a8c7a2e25939840ff";

     

       18
       18
       +
             sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f";

     

       19
       19
        
           };

     

       20
       20
        
           patches = [

     

       21
       21
       -
             ./no-buildconfig-90.patch

     

       22
       22
       -
       

     

       23
       23
       -
             # There is a bug in Thunderbird 91 where add-ons are required

     

       24
       24
       -
             # to be signed when the build is run with default settings.

     

       25
       25
       -
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1727113

     

       26
       26
       -
             # https://phabricator.services.mozilla.com/D124361

     

       27
       27
       -
             ./D124361.diff

     

       28
       21
        
           ];

     

       29
       22
        
       

     

       30
       23
        
           meta = with lib; {

+1 -1

pkgs/applications/networking/ping/default.nix

···

       61
       61
        
         meta = with lib; {

     

       62
       62
        
           description = "A helpful tool that lets you debug what part of your API is causing you issues";

     

       63
       63
        
           homepage = "https://github.com/jeremyvaartjes/ping";

     

       64
       64
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       64
       64
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       65
       65
        
           platforms = platforms.linux;

     

       66
       66
        
           license = licenses.gpl3;

     

       67
       67
        
         };

+15 -4

pkgs/applications/networking/qv2ray/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , mkDerivation

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , qmake

     

       5
       6
        
       , qttools

     

       6
       7
        
       , cmake

     

       7
       7
       -
       , clang

     

       8
       8
       +
       , clang_8

     

       8
       9
        
       , grpc

     

       9
       10
        
       , protobuf

     

       10
       11
        
       , openssl

     
···

       13
       14
        
       , abseil-cpp

     

       14
       15
        
       , libGL

     

       15
       16
        
       , zlib

     

       17
       17
       +
       , curl

     

       16
       18
        
       }:

     

       17
       19
        
       

     

       18
       20
        
       mkDerivation rec {

     

       19
       21
        
         pname = "qv2ray";

     

       20
       20
       -
         version = "2.6.3";

     

       22
       22
       +
         version = "2.7.0";

     

       21
       23
        
       

     

       22
       24
        
         src = fetchFromGitHub {

     

       23
       25
        
           owner = "Qv2ray";

     

       24
       26
        
           repo = "Qv2ray";

     

       25
       27
        
           rev = "v${version}";

     

       26
       26
       -
           sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI=";

     

       28
       28
       +
           sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M=";

     

       27
       29
        
           fetchSubmodules = true;

     

       28
       30
        
         };

     

       29
       31
        
       

     

       32
       32
       +
         patchPhase = lib.optionals stdenv.isDarwin ''

     

       33
       33
       +
           substituteInPlace cmake/platforms/macos.cmake \

     

       34
       34
       +
             --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       30
       37
        
         cmakeFlags = [

     

       31
       38
        
           "-DCMAKE_BUILD_TYPE=Release"

     

       32
       39
        
           "-DQV2RAY_DISABLE_AUTO_UPDATE=on"

     
···

       50
       57
        
       

     

       51
       58
        
         nativeBuildInputs = [

     

       52
       59
        
           cmake

     

       53
       53
       -
           clang

     

       60
       60
       +
       

     

       61
       61
       +
           # The default clang_7 will result in reproducible ICE.

     

       62
       62
       +
           clang_8

     

       63
       63
       +
       

     

       54
       64
        
           pkg-config

     

       55
       65
        
           qmake

     

       56
       66
        
           qttools

     

       67
       67
       +
           curl

     

       57
       68
        
         ];

     

       58
       69
        
       

     

       59
       70
        
         meta = with lib; {

+1 -1

pkgs/applications/office/agenda/default.nix

···

       59
       59
        
         meta = with lib; {

     

       60
       60
        
           description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS";

     

       61
       61
        
           homepage = "https://github.com/dahenson/agenda";

     

       62
       62
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       62
       62
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       63
       63
        
           platforms = platforms.linux;

     

       64
       64
        
           license = licenses.gpl3;

     

       65
       65
        
         };

+1 -1

pkgs/applications/office/elementary-planner/default.nix

···

       84
       84
        
           description = "Task manager with Todoist support designed for GNU/Linux 🚀️";

     

       85
       85
        
           homepage = "https://planner-todo.web.app";

     

       86
       86
        
           license = licenses.gpl3;

     

       87
       87
       -
           maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers;

     

       87
       87
       +
           maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;

     

       88
       88
        
         };

     

       89
       89
        
       }

     

       90
       90

+1 -1

pkgs/applications/office/khronos/default.nix

···

       60
       60
        
         meta = with lib; {

     

       61
       61
        
           description = "Track each task's time in a simple inobtrusive way";

     

       62
       62
        
           homepage = "https://github.com/lainsce/khronos";

     

       63
       63
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       63
       63
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
        
           license = licenses.gpl3Plus;

     

       66
       66
        
         };

+1 -1

pkgs/applications/office/spice-up/default.nix

···

       70
       70
        
         meta = with lib; {

     

       71
       71
        
           description = "Create simple and beautiful presentations";

     

       72
       72
        
           homepage = "https://github.com/Philip-Scott/Spice-up";

     

       73
       73
       -
           maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers;

     

       73
       73
       +
           maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ teams.pantheon.members;

     

       74
       74
        
           platforms = platforms.linux;

     

       75
       75
        
           # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+

     

       76
       76
        
           license = licenses.gpl3Plus;

pkgs/applications/radio/pyradio/default.nix pkgs/applications/audio/pyradio/default.nix

+1 -1

pkgs/applications/science/math/nasc/default.nix

···

       80
       80
        
             the equations it’s used in.

     

       81
       81
        
           '';

     

       82
       82
        
           homepage = "https://github.com/parnold-x/nasc";

     

       83
       83
       -
           maintainers = pantheon.maintainers;

     

       83
       83
       +
           maintainers = teams.pantheon.members;

     

       84
       84
        
           platforms = platforms.linux;

     

       85
       85
        
           license = licenses.gpl3Plus;

     

       86
       86
        
         };

+3 -3

pkgs/applications/system/monitor/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "monitor";

     

       22
       22
       -
         version = "0.8.1";

     

       22
       22
       +
         version = "0.9.5";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "stsdc";

     

       26
       26
        
           repo = "monitor";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           sha256 = "111g2f3y5lmz91m755jz0x8yx5cx9ym484gch8wcv80dmr7ilb1y";

     

       28
       28
       +
           sha256 = "sha256-eTsPn2Z1++KsZnnBnZ2s9fKK2HguPw+JqaRRkxQDiAk=";

     

       29
       29
        
           fetchSubmodules = true;

     

       30
       30
        
         };

     

       31
       31
        
       

     
···

       69
       69
        
             section in the NixOS manual.

     

       70
       70
        
           '';

     

       71
       71
        
           homepage = "https://github.com/stsdc/monitor";

     

       72
       72
       -
           maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;

     

       72
       72
       +
           maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;

     

       73
       73
        
           platforms = platforms.linux;

     

       74
       74
        
           license = licenses.gpl3;

     

       75
       75
        
         };

+68

pkgs/applications/system/pantheon-tweaks/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , nix-update-script

     

       5
       5
       +
       , meson

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , python3

     

       9
       9
       +
       , vala

     

       10
       10
       +
       , gtk3

     

       11
       11
       +
       , libgee

     

       12
       12
       +
       , pantheon

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       stdenv.mkDerivation rec {

     

       16
       16
       +
         pname = "pantheon-tweaks";

     

       17
       17
       +
         version = "1.0.1";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "pantheon-tweaks";

     

       21
       21
       +
           repo = pname;

     

       22
       22
       +
           rev = version;

     

       23
       23
       +
           sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           ./fix-paths.patch

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [

     

       31
       31
       +
           meson

     

       32
       32
       +
           ninja

     

       33
       33
       +
           pkg-config

     

       34
       34
       +
           python3

     

       35
       35
       +
           vala

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [

     

       39
       39
       +
           gtk3

     

       40
       40
       +
           libgee

     

       41
       41
       +
           pantheon.granite

     

       42
       42
       +
           pantheon.switchboard

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         postPatch = ''

     

       46
       46
       +
           chmod +x meson/post_install.py

     

       47
       47
       +
           patchShebangs meson/post_install.py

     

       48
       48
       +
         '';

     

       49
       49
       +
       

     

       50
       50
       +
         passthru = {

     

       51
       51
       +
           updateScript = nix-update-script {

     

       52
       52
       +
             attrPath = pname;

     

       53
       53
       +
           };

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         meta = with lib; {

     

       57
       57
       +
           description = "Unofficial system settings panel for Pantheon";

     

       58
       58
       +
           longDescription = ''

     

       59
       59
       +
             Unofficial system settings panel for Pantheon

     

       60
       60
       +
             that lets you easily and safely customise your desktop's appearance.

     

       61
       61
       +
             Use programs.pantheon-tweaks.enable to add this to your switchboard.

     

       62
       62
       +
           '';

     

       63
       63
       +
           homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks";

     

       64
       64
       +
           license = licenses.gpl3Plus;

     

       65
       65
       +
           platforms = platforms.linux;

     

       66
       66
       +
           maintainers = teams.pantheon.members;

     

       67
       67
       +
         };

     

       68
       68
       +
       }

+13

pkgs/applications/system/pantheon-tweaks/fix-paths.patch

···

       1
       1
       +
       diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala

     

       2
       2
       +
       index 589121b..8e9c81e 100644

     

       3
       3
       +
       --- a/src/Settings/ThemeSettings.vala

     

       4
       4
       +
       +++ b/src/Settings/ThemeSettings.vala

     

       5
       5
       +
       @@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings {

     

       6
       6
       +
                var themes = new Gee.ArrayList<string> ();

     

       7
       7
       +
        

     

       8
       8
       +
                string[] dirs = {

     

       9
       9
       +
       -            "/usr/share/" + path + "/",

     

       10
       10
       +
       +            "/run/current-system/sw/share/" + path + "/",

     

       11
       11
       +
                    Environment.get_home_dir () + "/." + path + "/",

     

       12
       12
       +
                    Environment.get_home_dir () + "/.local/share/" + path + "/"};

     

       13
       13
       +

+5 -5

pkgs/applications/version-management/gitoxide/default.nix

···

       1
       1
        
       { lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl

     

       2
       2
       -
       , libiconv, Security }:

     

       2
       2
       +
       , libiconv, Security, SystemConfiguration }:

     

       3
       3
        
       

     

       4
       4
        
       rustPlatform.buildRustPackage rec {

     

       5
       5
        
         pname = "gitoxide";

     

       6
       6
       -
         version = "0.7.0";

     

       6
       6
       +
         version = "0.8.4";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "Byron";

     

       10
       10
        
           repo = "gitoxide";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "12f5qrrfjfqp1aph2nmfi9nyzs1ndvgrb3y53mrszm9kf7fa6pyg";

     

       12
       12
       +
           sha256 = "WH8YiW1X7TkURjncm0OefxrZhnhGHaGLwxRNxe17g/0=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6";

     

       15
       15
       +
         cargoSha256 = "eTPJMYl9m81o4PJKfpDs61KmehSvKnY+bgybEodOhAM=";

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       18
       18
        
         buildInputs = if stdenv.isDarwin

     

       19
       19
       -
           then [ libiconv Security ]

     

       19
       19
       +
           then [ libiconv Security SystemConfiguration]

     

       20
       20
        
           else [ openssl ];

     

       21
       21
        
       

     

       22
       22
        
         # Needed to get openssl-sys to use pkg-config.

+3 -11

pkgs/applications/virtualization/catatonit/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "catatonit";

     

       5
       5
       -
         version = "0.1.5";

     

       5
       5
       +
         version = "0.1.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "openSUSE";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI=";

     

       11
       11
       +
           sha256 = "sha256-hokG6o7toZxU984EvIlne33Aa2EZVZ3qu1jTZMm5nt4=";

     

       12
       12
        
         };

     

       13
       13
       -
       

     

       14
       14
       -
         patches = [

     

       15
       15
       -
           # Fix compilation with musl

     

       16
       16
       -
           (fetchpatch {

     

       17
       17
       -
             url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch";

     

       18
       18
       -
             sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g=";

     

       19
       19
       -
           })

     

       20
       20
       -
         ];

     

       21
       13
        
       

     

       22
       14
        
         nativeBuildInputs = [ autoreconfHook ];

     

       23
       15
        
         buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];

+3 -3

pkgs/applications/virtualization/lima/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "lima";

     

       11
       11
       -
         version = "0.6.3";

     

       11
       11
       +
         version = "0.6.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "lima-vm";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs=";

     

       17
       17
       +
           sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ=";

     

       20
       20
       +
         vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs=";

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ makeWrapper installShellFiles ];

     

       23
       23

+1 -1

pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix

···

       129
       129
        
           description = "GNOME Settings Daemon";

     

       130
       130
        
           homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";

     

       131
       131
        
           license = licenses.gpl2Plus;

     

       132
       132
       -
           maintainers = pantheon.maintainers;

     

       132
       132
       +
           maintainers = teams.pantheon.members;

     

       133
       133
        
           platforms = platforms.linux;

     

       134
       134
        
         };

     

       135
       135
        
       }

+1 -1

pkgs/desktops/gnome/core/mutter/3.38/default.nix

···

       157
       157
        
           description = "A window manager for GNOME";

     

       158
       158
        
           homepage = "https://gitlab.gnome.org/GNOME/mutter";

     

       159
       159
        
           license = licenses.gpl2Plus;

     

       160
       160
       -
           maintainers = pantheon.maintainers;

     

       160
       160
       +
           maintainers = teams.pantheon.members;

     

       161
       161
        
           platforms = platforms.linux;

     

       162
       162
        
         };

     

       163
       163
        
       };

+1 -1

pkgs/desktops/pantheon/apps/appcenter/default.nix

···

       97
       97
        
           description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS";

     

       98
       98
        
           license = licenses.gpl3Plus;

     

       99
       99
        
           platforms = platforms.linux;

     

       100
       100
       -
           maintainers = pantheon.maintainers;

     

       100
       100
       +
           maintainers = teams.pantheon.members;

     

       101
       101
        
         };

     

       102
       102
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-calculator/default.nix

···

       68
       68
        
           description = "Calculator app designed for elementary OS";

     

       69
       69
        
           license = licenses.gpl3Plus;

     

       70
       70
        
           platforms = platforms.linux;

     

       71
       71
       -
           maintainers = pantheon.maintainers;

     

       71
       71
       +
           maintainers = teams.pantheon.members;

     

       72
       72
        
         };

     

       73
       73
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-calendar/default.nix

···

       83
       83
        
           homepage = "https://github.com/elementary/calendar";

     

       84
       84
        
           license = licenses.gpl3Plus;

     

       85
       85
        
           platforms = platforms.linux;

     

       86
       86
       -
           maintainers = pantheon.maintainers;

     

       86
       86
       +
           maintainers = teams.pantheon.members;

     

       87
       87
        
         };

     

       88
       88
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-camera/default.nix

···

       80
       80
        
           homepage = "https://github.com/elementary/camera";

     

       81
       81
        
           license = licenses.gpl3Plus;

     

       82
       82
        
           platforms = platforms.linux;

     

       83
       83
       -
           maintainers = pantheon.maintainers;

     

       83
       83
       +
           maintainers = teams.pantheon.members;

     

       84
       84
        
         };

     

       85
       85
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-code/default.nix

···

       107
       107
        
           homepage = "https://github.com/elementary/code";

     

       108
       108
        
           license = licenses.gpl3Plus;

     

       109
       109
        
           platforms = platforms.linux;

     

       110
       110
       -
           maintainers = pantheon.maintainers;

     

       110
       110
       +
           maintainers = teams.pantheon.members;

     

       111
       111
        
         };

     

       112
       112
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-dock/default.nix

···

       75
       75
        
           homepage = "https://github.com/elementary/dock";

     

       76
       76
        
           license = licenses.gpl3Plus;

     

       77
       77
        
           platforms = platforms.linux;

     

       78
       78
       -
           maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;

     

       78
       78
       +
           maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members;

     

       79
       79
        
         };

     

       80
       80
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-feedback/default.nix

···

       79
       79
        
           homepage = "https://github.com/elementary/feedback";

     

       80
       80
        
           license = licenses.gpl3Plus;

     

       81
       81
        
           platforms = platforms.linux;

     

       82
       82
       -
           maintainers = pantheon.maintainers;

     

       82
       82
       +
           maintainers = teams.pantheon.members;

     

       83
       83
        
         };

     

       84
       84
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-files/default.nix

···

       99
       99
        
           homepage = "https://github.com/elementary/files";

     

       100
       100
        
           license = licenses.gpl3Plus;

     

       101
       101
        
           platforms = platforms.linux;

     

       102
       102
       -
           maintainers = pantheon.maintainers;

     

       102
       102
       +
           maintainers = teams.pantheon.members;

     

       103
       103
        
         };

     

       104
       104
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-mail/default.nix

···

       84
       84
        
           homepage = "https://github.com/elementary/mail";

     

       85
       85
        
           license = licenses.gpl3Plus;

     

       86
       86
        
           platforms = platforms.linux;

     

       87
       87
       -
           maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ];

     

       87
       87
       +
           maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members;

     

       88
       88
        
         };

     

       89
       89
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-music/default.nix

···

       107
       107
        
           homepage = "https://github.com/elementary/music";

     

       108
       108
        
           license = licenses.gpl3Plus;

     

       109
       109
        
           platforms = platforms.linux;

     

       110
       110
       -
           maintainers = pantheon.maintainers;

     

       110
       110
       +
           maintainers = teams.pantheon.members;

     

       111
       111
        
         };

     

       112
       112
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-photos/default.nix

···

       113
       113
        
           homepage = "https://github.com/elementary/photos";

     

       114
       114
        
           license = licenses.lgpl21Plus;

     

       115
       115
        
           platforms = platforms.linux;

     

       116
       116
       -
           maintainers = pantheon.maintainers;

     

       116
       116
       +
           maintainers = teams.pantheon.members;

     

       117
       117
        
         };

     

       118
       118
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix

···

       65
       65
        
           homepage = "https://github.com/elementary/screenshot";

     

       66
       66
        
           license = licenses.lgpl3;

     

       67
       67
        
           platforms = platforms.linux;

     

       68
       68
       -
           maintainers = pantheon.maintainers;

     

       68
       68
       +
           maintainers = teams.pantheon.members;

     

       69
       69
        
         };

     

       70
       70
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-tasks/default.nix

···

       79
       79
        
           description = "Synced tasks and reminders on elementary OS";

     

       80
       80
        
           license = licenses.gpl3Plus;

     

       81
       81
        
           platforms = platforms.linux;

     

       82
       82
       -
           maintainers = pantheon.maintainers;

     

       82
       82
       +
           maintainers = teams.pantheon.members;

     

       83
       83
        
         };

     

       84
       84
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-terminal/default.nix

···

       90
       90
        
           homepage = "https://github.com/elementary/terminal";

     

       91
       91
        
           license = licenses.lgpl3;

     

       92
       92
        
           platforms = platforms.linux;

     

       93
       93
       -
           maintainers = pantheon.maintainers;

     

       93
       93
       +
           maintainers = teams.pantheon.members;

     

       94
       94
        
         };

     

       95
       95
        
       }

+1 -1

pkgs/desktops/pantheon/apps/elementary-videos/default.nix

···

       82
       82
        
           homepage = "https://github.com/elementary/videos";

     

       83
       83
        
           license = licenses.gpl3Plus;

     

       84
       84
        
           platforms = platforms.linux;

     

       85
       85
       -
           maintainers = pantheon.maintainers;

     

       85
       85
       +
           maintainers = teams.pantheon.members;

     

       86
       86
        
         };

     

       87
       87
        
       }

+1 -1

pkgs/desktops/pantheon/apps/sideload/default.nix

···

       71
       71
        
           description = "Flatpak installer, designed for elementary OS";

     

       72
       72
        
           license = licenses.gpl3Plus;

     

       73
       73
        
           platforms = platforms.linux;

     

       74
       74
       -
           maintainers = pantheon.maintainers;

     

       74
       74
       +
           maintainers = teams.pantheon.members;

     

       75
       75
        
         };

     

       76
       76
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix

···

       66
       66
        
           homepage = "https://github.com/elementary/switchboard-plug-a11y";

     

       67
       67
        
           license = licenses.gpl3Plus;

     

       68
       68
        
           platforms = platforms.linux;

     

       69
       69
       -
           maintainers = pantheon.maintainers;

     

       69
       69
       +
           maintainers = teams.pantheon.members;

     

       70
       70
        
         };

     

       71
       71
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix

···

       63
       63
        
           homepage = "https://github.com/elementary/switchboard-plug-about";

     

       64
       64
        
           license = licenses.gpl3Plus;

     

       65
       65
        
           platforms = platforms.linux;

     

       66
       66
       -
           maintainers = pantheon.maintainers;

     

       66
       66
       +
           maintainers = teams.pantheon.members;

     

       67
       67
        
         };

     

       68
       68
        
       

     

       69
       69
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix

···

       60
       60
        
           homepage = "https://github.com/elementary/switchboard-plug-applications";

     

       61
       61
        
           license = licenses.gpl3Plus;

     

       62
       62
        
           platforms = platforms.linux;

     

       63
       63
       -
           maintainers = pantheon.maintainers;

     

       63
       63
       +
           maintainers = teams.pantheon.members;

     

       64
       64
        
         };

     

       65
       65
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix

···

       60
       60
        
           homepage = "https://github.com/elementary/switchboard-plug-bluetooth";

     

       61
       61
        
           license = licenses.gpl3Plus;

     

       62
       62
        
           platforms = platforms.linux;

     

       63
       63
       -
           maintainers = pantheon.maintainers;

     

       63
       63
       +
           maintainers = teams.pantheon.members;

     

       64
       64
        
         };

     

       65
       65
        
       

     

       66
       66
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix

···

       66
       66
        
           homepage = "https://github.com/elementary/switchboard-plug-datetime";

     

       67
       67
        
           license = licenses.gpl3Plus;

     

       68
       68
        
           platforms = platforms.linux;

     

       69
       69
       -
           maintainers = pantheon.maintainers;

     

       69
       69
       +
           maintainers = teams.pantheon.members;

     

       70
       70
        
         };

     

       71
       71
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix

···

       48
       48
        
           homepage = "https://github.com/elementary/switchboard-plug-display";

     

       49
       49
        
           license = licenses.gpl3Plus;

     

       50
       50
        
           platforms = platforms.linux;

     

       51
       51
       -
           maintainers = pantheon.maintainers;

     

       51
       51
       +
           maintainers = teams.pantheon.members;

     

       52
       52
        
         };

     

       53
       53
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix

···

       74
       74
        
           homepage = "https://github.com/elementary/switchboard-plug-keyboard";

     

       75
       75
        
           license = licenses.gpl2Plus;

     

       76
       76
        
           platforms = platforms.linux;

     

       77
       77
       -
           maintainers = pantheon.maintainers;

     

       77
       77
       +
           maintainers = teams.pantheon.members;

     

       78
       78
        
         };

     

       79
       79
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix

···

       73
       73
        
           homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad";

     

       74
       74
        
           license = licenses.gpl3Plus;

     

       75
       75
        
           platforms = platforms.linux;

     

       76
       76
       -
           maintainers = pantheon.maintainers;

     

       76
       76
       +
           maintainers = teams.pantheon.members;

     

       77
       77
        
         };

     

       78
       78
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix

···

       62
       62
        
           homepage = "https://github.com/elementary/switchboard-plug-network";

     

       63
       63
        
           license = licenses.gpl3Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix

···

       60
       60
        
           homepage = "https://github.com/elementary/switchboard-plug-notifications";

     

       61
       61
        
           license = licenses.gpl2Plus;

     

       62
       62
        
           platforms = platforms.linux;

     

       63
       63
       -
           maintainers = pantheon.maintainers;

     

       63
       63
       +
           maintainers = teams.pantheon.members;

     

       64
       64
        
         };

     

       65
       65
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix

···

       71
       71
        
           homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts";

     

       72
       72
        
           license = licenses.gpl3Plus;

     

       73
       73
        
           platforms = platforms.linux;

     

       74
       74
       -
           maintainers = pantheon.maintainers;

     

       74
       74
       +
           maintainers = teams.pantheon.members;

     

       75
       75
        
         };

     

       76
       76
        
       

     

       77
       77
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix

···

       78
       78
        
           homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";

     

       79
       79
        
           license = licenses.gpl3Plus;

     

       80
       80
        
           platforms = platforms.linux;

     

       81
       81
       -
           maintainers = pantheon.maintainers;

     

       81
       81
       +
           maintainers = teams.pantheon.members;

     

       82
       82
        
         };

     

       83
       83
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix

···

       58
       58
        
           homepage = "https://github.com/elementary/switchboard-plug-power";

     

       59
       59
        
           license = licenses.gpl2Plus;

     

       60
       60
        
           platforms = platforms.linux;

     

       61
       61
       -
           maintainers = pantheon.maintainers;

     

       61
       61
       +
           maintainers = teams.pantheon.members;

     

       62
       62
        
         };

     

       63
       63
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix

···

       60
       60
        
           homepage = "https://github.com/elementary/switchboard-plug-printers";

     

       61
       61
        
           license = licenses.gpl3Plus;

     

       62
       62
        
           platforms = platforms.linux;

     

       63
       63
       -
           maintainers = pantheon.maintainers;

     

       63
       63
       +
           maintainers = teams.pantheon.members;

     

       64
       64
        
         };

     

       65
       65
        
       

     

       66
       66
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix

···

       73
       73
        
           homepage = "https://github.com/elementary/switchboard-plug-security-privacy";

     

       74
       74
        
           license = licenses.gpl3Plus;

     

       75
       75
        
           platforms = platforms.linux;

     

       76
       76
       -
           maintainers = pantheon.maintainers;

     

       76
       76
       +
           maintainers = teams.pantheon.members;

     

       77
       77
        
         };

     

       78
       78
        
       

     

       79
       79
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix

···

       58
       58
        
           homepage = "https://github.com/elementary/switchboard-plug-sharing";

     

       59
       59
        
           license = licenses.gpl3Plus;

     

       60
       60
        
           platforms = platforms.linux;

     

       61
       61
       -
           maintainers = pantheon.maintainers;

     

       61
       61
       +
           maintainers = teams.pantheon.members;

     

       62
       62
        
         };

     

       63
       63
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix

···

       62
       62
        
           homepage = "https://github.com/elementary/switchboard-plug-sound";

     

       63
       63
        
           license = licenses.lgpl21Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix

···

       67
       67
        
           homepage = "https://github.com/elementary/switchboard-plug-wacom";

     

       68
       68
        
           license = licenses.gpl3Plus;

     

       69
       69
        
           platforms = platforms.linux;

     

       70
       70
       -
           maintainers = pantheon.maintainers;

     

       70
       70
       +
           maintainers = teams.pantheon.members;

     

       71
       71
        
         };

     

       72
       72
        
       }

+1 -1

pkgs/desktops/pantheon/apps/switchboard/default.nix

···

       74
       74
        
           homepage = "https://github.com/elementary/switchboard";

     

       75
       75
        
           license = licenses.lgpl21Plus;

     

       76
       76
        
           platforms = platforms.linux;

     

       77
       77
       -
           maintainers = pantheon.maintainers;

     

       77
       77
       +
           maintainers = teams.pantheon.members;

     

       78
       78
        
         };

     

       79
       79
        
       }

+1 -1

pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix

···

       39
       39
        
           homepage = "https://github.com/elementary/stylesheet";

     

       40
       40
        
           license = licenses.gpl3;

     

       41
       41
        
           platforms = platforms.linux;

     

       42
       42
       -
           maintainers = pantheon.maintainers;

     

       42
       42
       +
           maintainers = teams.pantheon.members;

     

       43
       43
        
         };

     

       44
       44
        
       }

+1 -1

pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix

···

       65
       65
        
           homepage = "https://github.com/elementary/icons";

     

       66
       66
        
           license = licenses.gpl3;

     

       67
       67
        
           platforms = platforms.linux;

     

       68
       68
       -
           maintainers = pantheon.maintainers;

     

       68
       68
       +
           maintainers = teams.pantheon.members;

     

       69
       69
        
         };

     

       70
       70
        
       }

+1 -1

pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix

···

       25
       25
        
           description = "Font for concealing text";

     

       26
       26
        
           homepage = "https://github.com/png2378/redacted-elementary";

     

       27
       27
        
           license = licenses.ofl;

     

       28
       28
       -
           maintainers = pantheon.maintainers;

     

       28
       28
       +
           maintainers = teams.pantheon.members;

     

       29
       29
        
           platforms = platforms.linux;

     

       30
       30
        
         };

     

       31
       31
        
       }

+1 -1

pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix

···

       37
       37
        
           homepage = "https://github.com/elementary/sound-theme";

     

       38
       38
        
           license = licenses.unlicense;

     

       39
       39
        
           platforms = platforms.linux;

     

       40
       40
       -
           maintainers = pantheon.maintainers;

     

       40
       40
       +
           maintainers = teams.pantheon.members;

     

       41
       41
        
         };

     

       42
       42
        
       }

+1 -1

pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix

···

       37
       37
        
           homepage = "https://github.com/elementary/wallpapers";

     

       38
       38
        
           license = licenses.publicDomain;

     

       39
       39
        
           platforms = platforms.linux;

     

       40
       40
       -
           maintainers = pantheon.maintainers;

     

       40
       40
       +
           maintainers = teams.pantheon.members;

     

       41
       41
        
         };

     

       42
       42
        
       }

     

       43
       43

+1 -1

pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix

···

       85
       85
        
           homepage = "https://github.com/elementary/default-settings";

     

       86
       86
        
           license = licenses.gpl2Plus;

     

       87
       87
        
           platforms = platforms.linux;

     

       88
       88
       -
           maintainers = pantheon.maintainers;

     

       88
       88
       +
           maintainers = teams.pantheon.members;

     

       89
       89
        
         };

     

       90
       90
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix

···

       134
       134
        
           homepage = "https://github.com/elementary/greeter";

     

       135
       135
        
           license = licenses.gpl3Plus;

     

       136
       136
        
           platforms = platforms.linux;

     

       137
       137
       -
           maintainers = pantheon.maintainers;

     

       137
       137
       +
           maintainers = teams.pantheon.members;

     

       138
       138
        
         };

     

       139
       139
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix

···

       76
       76
        
           homepage = "https://github.com/elementary/onboarding";

     

       77
       77
        
           license = licenses.gpl3Plus;

     

       78
       78
        
           platforms = platforms.linux;

     

       79
       79
       -
           maintainers = pantheon.maintainers;

     

       79
       79
       +
           maintainers = teams.pantheon.members;

     

       80
       80
        
         };

     

       81
       81
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix

···

       42
       42
        
           homepage = "https://github.com/elementary/print";

     

       43
       43
        
           license = licenses.gpl3Plus;

     

       44
       44
        
           platforms = platforms.linux;

     

       45
       45
       -
           maintainers = pantheon.maintainers;

     

       45
       45
       +
           maintainers = teams.pantheon.members;

     

       46
       46
        
         };

     

       47
       47
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix

···

       155
       155
        
           homepage = "https://github.com/elementary/session-settings";

     

       156
       156
        
           license = licenses.gpl2Plus;

     

       157
       157
        
           platforms = platforms.linux;

     

       158
       158
       -
           maintainers = pantheon.maintainers;

     

       158
       158
       +
           maintainers = teams.pantheon.members;

     

       159
       159
        
         };

     

       160
       160
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix

···

       70
       70
        
           homepage = "https://github.com/elementary/shortcut-overlay";

     

       71
       71
        
           license = licenses.gpl3Plus;

     

       72
       72
        
           platforms = platforms.linux;

     

       73
       73
       -
           maintainers = pantheon.maintainers;

     

       73
       73
       +
           maintainers = teams.pantheon.members;

     

       74
       74
        
         };

     

       75
       75
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/gala/default.nix

···

       94
       94
        
           homepage = "https://github.com/elementary/gala";

     

       95
       95
        
           license = licenses.gpl3Plus;

     

       96
       96
        
           platforms = platforms.linux;

     

       97
       97
       -
           maintainers = pantheon.maintainers;

     

       97
       97
       +
           maintainers = teams.pantheon.members;

     

       98
       98
        
         };

     

       99
       99
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix

···

       65
       65
        
           homepage = "https://github.com/elementary/wingpanel-indicator-a11y";

     

       66
       66
        
           license = licenses.gpl2Plus;

     

       67
       67
        
           platforms = platforms.linux;

     

       68
       68
       -
           maintainers = pantheon.maintainers;

     

       68
       68
       +
           maintainers = teams.pantheon.members;

     

       69
       69
        
         };

     

       70
       70
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix

···

       95
       95
        
           homepage = "https://github.com/elementary/applications-menu";

     

       96
       96
        
           license = licenses.gpl3Plus;

     

       97
       97
        
           platforms = platforms.linux;

     

       98
       98
       -
           maintainers = pantheon.maintainers;

     

       98
       98
       +
           maintainers = teams.pantheon.members;

     

       99
       99
        
         };

     

       100
       100
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix

···

       62
       62
        
           homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth";

     

       63
       63
        
           license = licenses.lgpl21Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix

···

       83
       83
        
           homepage = "https://github.com/elementary/wingpanel-indicator-datetime";

     

       84
       84
        
           license = licenses.gpl3Plus;

     

       85
       85
        
           platforms = platforms.linux;

     

       86
       86
       -
           maintainers = pantheon.maintainers;

     

       86
       86
       +
           maintainers = teams.pantheon.members;

     

       87
       87
        
         };

     

       88
       88
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix

···

       70
       70
        
           homepage = "https://github.com/elementary/wingpanel-indicator-keyboard";

     

       71
       71
        
           license = licenses.gpl3Plus;

     

       72
       72
        
           platforms = platforms.linux;

     

       73
       73
       -
           maintainers = pantheon.maintainers;

     

       73
       73
       +
           maintainers = teams.pantheon.members;

     

       74
       74
        
         };

     

       75
       75
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix

···

       68
       68
        
           homepage = "https://github.com/elementary/wingpanel-indicator-network";

     

       69
       69
        
           license = licenses.lgpl21Plus;

     

       70
       70
        
           platforms = platforms.linux;

     

       71
       71
       -
           maintainers = pantheon.maintainers;

     

       71
       71
       +
           maintainers = teams.pantheon.members;

     

       72
       72
        
         };

     

       73
       73
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix

···

       60
       60
        
           homepage = "https://github.com/elementary/wingpanel-indicator-nightlight";

     

       61
       61
        
           license = licenses.gpl2Plus;

     

       62
       62
        
           platforms = platforms.linux;

     

       63
       63
       -
           maintainers = pantheon.maintainers;

     

       63
       63
       +
           maintainers = teams.pantheon.members;

     

       64
       64
        
         };

     

       65
       65
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix

···

       62
       62
        
           homepage = "https://github.com/elementary/wingpanel-indicator-notifications";

     

       63
       63
        
           license = licenses.lgpl21Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix

···

       72
       72
        
           homepage = "https://github.com/elementary/wingpanel-indicator-power";

     

       73
       73
        
           license = licenses.gpl3Plus;

     

       74
       74
        
           platforms = platforms.linux;

     

       75
       75
       -
           maintainers = pantheon.maintainers;

     

       75
       75
       +
           maintainers = teams.pantheon.members;

     

       76
       76
        
         };

     

       77
       77
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix

···

       62
       62
        
           homepage = "https://github.com/elementary/wingpanel-indicator-session";

     

       63
       63
        
           license = licenses.gpl2Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix

···

       73
       73
        
           homepage = "https://github.com/elementary/wingpanel-indicator-sound";

     

       74
       74
        
           license = licenses.gpl3Plus;

     

       75
       75
        
           platforms = platforms.linux;

     

       76
       76
       -
           maintainers = pantheon.maintainers;

     

       76
       76
       +
           maintainers = teams.pantheon.members;

     

       77
       77
        
         };

     

       78
       78
        
       }

+1 -1

pkgs/desktops/pantheon/desktop/wingpanel/default.nix

···

       84
       84
        
           homepage = "https://github.com/elementary/wingpanel";

     

       85
       85
        
           license = licenses.gpl3Plus;

     

       86
       86
        
           platforms = platforms.linux;

     

       87
       87
       -
           maintainers = pantheon.maintainers;

     

       87
       87
       +
           maintainers = teams.pantheon.members;

     

       88
       88
        
         };

     

       89
       89
        
       }

+1 -1

pkgs/desktops/pantheon/granite/default.nix

···

       67
       67
        
           homepage = "https://github.com/elementary/granite";

     

       68
       68
        
           license = licenses.lgpl3Plus;

     

       69
       69
        
           platforms = platforms.linux;

     

       70
       70
       -
           maintainers = pantheon.maintainers;

     

       70
       70
       +
           maintainers = teams.pantheon.members;

     

       71
       71
        
         };

     

       72
       72
        
       }

+1 -1

pkgs/desktops/pantheon/services/contractor/default.nix

···

       54
       54
        
           homepage = "https://github.com/elementary/contractor";

     

       55
       55
        
           license = licenses.gpl3Plus;

     

       56
       56
        
           platforms = platforms.linux;

     

       57
       57
       -
           maintainers = pantheon.maintainers;

     

       57
       57
       +
           maintainers = teams.pantheon.members;

     

       58
       58
        
         };

     

       59
       59
        
       }

+1 -1

pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix

···

       70
       70
        
           homepage = "https://github.com/elementary/capnet-assist";

     

       71
       71
        
           license = licenses.gpl3Plus;

     

       72
       72
        
           platforms = platforms.linux;

     

       73
       73
       -
           maintainers = pantheon.maintainers;

     

       73
       73
       +
           maintainers = teams.pantheon.members;

     

       74
       74
        
         };

     

       75
       75
        
       }

+1 -1

pkgs/desktops/pantheon/services/elementary-notifications/default.nix

···

       56
       56
        
           description = "GTK notification server for Pantheon";

     

       57
       57
        
           homepage = "https://github.com/elementary/notifications";

     

       58
       58
        
           license = licenses.gpl3Plus;

     

       59
       59
       -
           maintainers = pantheon.maintainers;

     

       59
       59
       +
           maintainers = teams.pantheon.members;

     

       60
       60
        
           platforms = platforms.linux;

     

       61
       61
        
         };

     

       62
       62
        
       }

+1 -1

pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix

···

       61
       61
        
           description = "Settings daemon for Pantheon";

     

       62
       62
        
           homepage = "https://github.com/elementary/settings-daemon";

     

       63
       63
        
           license = licenses.gpl3Plus;

     

       64
       64
       -
           maintainers = pantheon.maintainers;

     

       64
       64
       +
           maintainers = teams.pantheon.members;

     

       65
       65
        
           platforms = platforms.linux;

     

       66
       66
        
         };

     

       67
       67
        
       }

+1 -1

pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix

···

       56
       56
        
           homepage = "https://github.com/elementary/pantheon-agent-geoclue2";

     

       57
       57
        
           license = licenses.gpl3Plus;

     

       58
       58
        
           platforms = platforms.linux;

     

       59
       59
       -
           maintainers = pantheon.maintainers;

     

       59
       59
       +
           maintainers = teams.pantheon.members;

     

       60
       60
        
         };

     

       61
       61
        
       }

+1 -1

pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix

···

       50
       50
        
           homepage = "https://github.com/elementary/pantheon-agent-polkit";

     

       51
       51
        
           license = licenses.lgpl21Plus;

     

       52
       52
        
           platforms = platforms.linux;

     

       53
       53
       -
           maintainers = pantheon.maintainers;

     

       53
       53
       +
           maintainers = teams.pantheon.members;

     

       54
       54
        
         };

     

       55
       55
        
       }

+1 -1

pkgs/development/libraries/bamf/default.nix

···

       94
       94
        
           homepage = "https://launchpad.net/bamf";

     

       95
       95
        
           license = licenses.lgpl3;

     

       96
       96
        
           platforms = platforms.linux;

     

       97
       97
       -
           maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;

     

       97
       97
       +
           maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members;

     

       98
       98
        
         };

     

       99
       99
        
       }

+2 -2

pkgs/development/libraries/cmark-gfm/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "cmark-gfm";

     

       4
       4
       -
         version = "0.29.0.gfm.1";

     

       4
       4
       +
         version = "0.29.0.gfm.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "github";

     

       8
       8
        
           repo = "cmark-gfm";

     

       9
       9
        
           rev = version;

     

       10
       10
       -
           sha256 = "sha256-GxWA5CjdXPBh1BJzENIijPDCoth0BTNu5ayX0cXT5z0=";

     

       10
       10
       +
           sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/intel-gmmlib/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "intel-gmmlib";

     

       9
       9
       -
         version = "21.2.2";

     

       9
       9
       +
         version = "21.3.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "intel";

     

       13
       13
        
           repo = "gmmlib";

     

       14
       14
        
           rev = "${pname}-${version}";

     

       15
       15
       -
           sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";

     

       15
       15
       +
           sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake ];

+7

pkgs/development/libraries/md4c/default.nix

···

       16
       16
        
           hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so

     

       21
       21
       +
           # prefix and exec_prefix cannot be $out, too

     

       22
       22
       +
           # Use CMake's _FULL_ variables instead of `prefix` concatenation.

     

       23
       23
       +
           ./fix-pkgconfig.patch

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       19
       26
        
         nativeBuildInputs = [

     

       20
       27
        
           cmake

     

       21
       28
        
           pkg-config

+44

pkgs/development/libraries/md4c/fix-pkgconfig.patch

···

       1
       1
       +
       From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>

     

       3
       3
       +
       Date: Fri, 17 Sep 2021 16:16:17 +0200

     

       4
       4
       +
       Subject: [PATCH] pc.in: use _FULL_ variable variants

     

       5
       5
       +
       

     

       6
       6
       +
       Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR

     

       7
       7
       +
       with the absolute path. Which break package

     

       8
       8
       +
       portability (i.e. `prefix`-usage).

     

       9
       9
       +
       ---

     

       10
       10
       +
        src/md4c-html.pc.in | 6 ++----

     

       11
       11
       +
        src/md4c.pc.in      | 6 ++----

     

       12
       12
       +
        2 files changed, 4 insertions(+), 8 deletions(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in

     

       15
       15
       +
       index 504bb52..fec7df4 100644

     

       16
       16
       +
       --- a/src/md4c-html.pc.in

     

       17
       17
       +
       +++ b/src/md4c-html.pc.in

     

       18
       18
       +
       @@ -1,7 +1,5 @@

     

       19
       19
       +
       -prefix=@CMAKE_INSTALL_PREFIX@

     

       20
       20
       +
       -exec_prefix=@CMAKE_INSTALL_PREFIX@

     

       21
       21
       +
       -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

     

       22
       22
       +
       -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

     

       23
       23
       +
       +libdir=@CMAKE_INSTALL_FULL_LIBDIR@

     

       24
       24
       +
       +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

     

       25
       25
       +
        

     

       26
       26
       +
        Name: @PROJECT_NAME@ HTML renderer

     

       27
       27
       +
        Description: Markdown to HTML converter library.

     

       28
       28
       +
       diff --git a/src/md4c.pc.in b/src/md4c.pc.in

     

       29
       29
       +
       index cd8842d..b5d81f8 100644

     

       30
       30
       +
       --- a/src/md4c.pc.in

     

       31
       31
       +
       +++ b/src/md4c.pc.in

     

       32
       32
       +
       @@ -1,7 +1,5 @@

     

       33
       33
       +
       -prefix=@CMAKE_INSTALL_PREFIX@

     

       34
       34
       +
       -exec_prefix=@CMAKE_INSTALL_PREFIX@

     

       35
       35
       +
       -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

     

       36
       36
       +
       -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

     

       37
       37
       +
       +libdir=@CMAKE_INSTALL_FULL_LIBDIR@

     

       38
       38
       +
       +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

     

       39
       39
       +
        

     

       40
       40
       +
        Name: @PROJECT_NAME@

     

       41
       41
       +
        Description: Markdown parser library with a SAX-like callback-based interface.

     

       42
       42
       +
       -- 

     

       43
       43
       +
       2.31.0

     

       44
       44
       +

+3 -1

pkgs/development/libraries/memorymapping/default.nix

···

       37
       37
        
           description = "fmemopen for Mac OS and iOS";

     

       38
       38
        
           license = licenses.asl20;

     

       39
       39
        
           maintainers = with maintainers; [ veprbl ];

     

       40
       40
       -
           platforms = platforms.unix;

     

       40
       40
       +
           # Uses BSD-style funopen() to implement glibc-style fmemopen().

     

       41
       41
       +
           # Add more BSDs if you need to.

     

       42
       42
       +
           platforms = platforms.darwin;

     

       41
       43
        
           broken = stdenv.isAarch64;

     

       42
       44
        
         };

     

       43
       45
        
       }

+2 -2

pkgs/development/libraries/orocos-kdl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "orocos-kdl";

     

       5
       5
       -
         version = "1.5.0";

     

       5
       5
       +
         version = "1.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "orocos";

     

       9
       9
        
           repo = "orocos_kinematics_dynamics";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca";

     

       11
       11
       +
           sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419";

     

       12
       12
        
           # Needed to build Python bindings

     

       13
       13
        
           fetchSubmodules = true;

     

       14
       14
        
         };

+2 -2

pkgs/development/python-modules/aioswitcher/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "aioswitcher";

     

       16
       16
       -
         version = "2.0.5";

     

       16
       16
       +
         version = "2.0.6";

     

       17
       17
        
         format = "pyproject";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "TomerFi";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           sha256 = "sha256-q1toEKEqTJuZbsrqDjfbUWsQmrwiu2MtcoWqKKRUEJA=";

     

       23
       23
       +
           sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+54

pkgs/development/python-modules/intensity-normalization/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , matplotlib

     

       7
       7
       +
       , nibabel

     

       8
       8
       +
       , numpy

     

       9
       9
       +
       , scikit-fuzzy

     

       10
       10
       +
       , scikitimage

     

       11
       11
       +
       , scikit-learn

     

       12
       12
       +
       , scipy

     

       13
       13
       +
       , statsmodels

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "intensity-normalization";

     

       18
       18
       +
         version = "2.0.1";

     

       19
       19
       +
         disabled = pythonOlder "3.6";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchPypi {

     

       22
       22
       +
           inherit pname version;

     

       23
       23
       +
           sha256 = "1c6inlhpxarvkniq8j5j2pgl32dmggn14s8c3c0xx15j7cg90413";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           substituteInPlace setup.cfg --replace "pytest-runner" ""

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         checkInputs = [ pytestCheckHook ];

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "intensity_normalization"

     

       33
       33
       +
           "intensity_normalization.normalize"

     

       34
       34
       +
           "intensity_normalization.plot"

     

       35
       35
       +
           "intensity_normalization.util"

     

       36
       36
       +
         ];

     

       37
       37
       +
         propagatedBuildInputs = [

     

       38
       38
       +
           matplotlib

     

       39
       39
       +
           nibabel

     

       40
       40
       +
           numpy

     

       41
       41
       +
           scikit-fuzzy

     

       42
       42
       +
           scikitimage

     

       43
       43
       +
           scikit-learn

     

       44
       44
       +
           scipy

     

       45
       45
       +
           statsmodels

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with lib; {

     

       49
       49
       +
           homepage = "https://github.com/jcreinhold/intensity-normalization";

     

       50
       50
       +
           description = "MRI intensity normalization tools";

     

       51
       51
       +
           maintainers = with maintainers; [ bcdarwin ];

     

       52
       52
       +
           license = licenses.asl20;

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+61

pkgs/development/python-modules/orjson/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , rustPlatform

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , buildPythonPackage

     

       7
       7
       +
       , libiconv

     

       8
       8
       +
       , numpy

     

       9
       9
       +
       , psutil

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , python-dateutil

     

       12
       12
       +
       , pytz

     

       13
       13
       +
       , xxhash

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "orjson";

     

       18
       18
       +
         version = "3.6.3";

     

       19
       19
       +
         disabled = pythonOlder "3.7";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "ijl";

     

       23
       23
       +
           repo = pname;

     

       24
       24
       +
           rev = version;

     

       25
       25
       +
           sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       29
       29
       +
           inherit src;

     

       30
       30
       +
           name = "${pname}-${version}";

     

       31
       31
       +
           sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w";

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         format = "pyproject";

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = with rustPlatform; [

     

       37
       37
       +
           cargoSetupHook

     

       38
       38
       +
           maturinBuildHook

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       42
       42
       +
       

     

       43
       43
       +
         checkInputs = [

     

       44
       44
       +
           numpy

     

       45
       45
       +
           psutil

     

       46
       46
       +
           pytestCheckHook

     

       47
       47
       +
           python-dateutil

     

       48
       48
       +
           pytz

     

       49
       49
       +
           xxhash

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         pythonImportsCheck = [ pname ];

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with lib; {

     

       55
       55
       +
           description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy";

     

       56
       56
       +
           homepage = "https://github.com/ijl/orjson";

     

       57
       57
       +
           license = with licenses; [ asl20 mit ];

     

       58
       58
       +
           platforms = platforms.unix;

     

       59
       59
       +
           maintainers = with maintainers; [ misuzu ];

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+2 -2

pkgs/development/python-modules/plexapi/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "plexapi";

     

       12
       12
       -
         version = "4.7.0";

     

       12
       12
       +
         version = "4.7.1";

     

       13
       13
        
         disabled = pythonOlder "3.5";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "pkkid";

     

       17
       17
        
           repo = "python-plexapi";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "1gh36ln9ki69rs7ml9syqq956i996rdi145qffjwb3736zylrzkp";

     

       19
       19
       +
           sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/pychromecast/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "PyChromecast";

     

       5
       5
       -
         version = "9.2.0";

     

       5
       5
       +
         version = "9.2.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a";

     

       9
       9
       +
           sha256 = "sha256-iD1ug2/18QaKi9ADZKFbTJhUKTCGSV6f2crNm01UwL8=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         disabled = !isPy3k;

+2 -2

pkgs/development/python-modules/pykodi/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pykodi";

     

       11
       11
       -
         version = "0.2.5";

     

       11
       11
       +
         version = "0.2.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "1al2q4jiqxjnz0j2xvs2hqzrz6fm3hmda5zjnkp8gdvgchd1cmn7";

     

       15
       15
       +
           sha256 = "sha256-SDp2S9HeqejRM3cf4x+5RLUQMPhjieQaXoubwf9Q/d4=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/pyopenuv/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "pyopenuv";

     

       17
       17
       -
         version = "2.2.0";

     

       17
       17
       +
         version = "2.2.1";

     

       18
       18
        
         format = "pyproject";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "bachya";

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = version;

     

       24
       24
       -
           sha256 = "sha256-WYCIQTQbDh9U4nB+dgLXbBJXErC4l5Hnk8K5n4CctCw=";

     

       24
       24
       +
           sha256 = "sha256-9hpXVKCpVbUAoTxd5mHP9NK1dZxbrQUxrQrOEVHpaPo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ poetry-core ];

+2 -2

pkgs/development/python-modules/pyturbojpeg/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pyturbojpeg";

     

       13
       13
       -
         version = "1.5.1";

     

       13
       13
       +
         version = "1.5.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           pname = "PyTurboJPEG";

     

       17
       17
        
           inherit version;

     

       18
       18
       -
           sha256 = "sha256-56FnJpnQzFPlz0v506CrwIHf9uV3R1LibnuEL7RcFCg=";

     

       18
       18
       +
           sha256 = "sha256-KU24J6iU2y8iLyxjJiuh6Zqx+t1PVBrleOf/mWnfA4I=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         patches = [

+6 -3

pkgs/development/python-modules/scikit-fuzzy/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "scikit-fuzzy";

     

       15
       15
       -
         version = "unstable-2020-10-03";

     

       15
       15
       +
         version = "unstable-2021-03-31";

     

       16
       16
        
         disabled = isPy27;

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = pname;

     

       20
       20
        
           repo = pname;

     

       21
       21
       -
           rev = "eecf303b701e3efacdc9b9066207ef605d4facaa";

     

       22
       22
       -
           sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062";

     

       21
       21
       +
           rev = "92ad3c382ac19707086204ac6cdf6e81353345a7";

     

       22
       22
       +
           sha256 = "0q89p385nsg3lymlsqm3mw6y45vgrk6w9p30igbm59b7r9mkgdj8";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ networkx numpy scipy ];

     

       26
       26
        
         checkInputs = [ matplotlib nose pytestCheckHook ];

     

       27
       27
       +
       

     

       28
       28
       +
         # test error: "ValueError: could not convert string to float: '2.6.2'"

     

       29
       29
       +
         disabledTestPaths = [ "skfuzzy/control/tests/test_controlsystem.py" ];

     

       27
       30
        
       

     

       28
       31
        
         meta = with lib; {

     

       29
       32
        
           homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy";

+2 -2

pkgs/development/python-modules/scikit-hep-testdata/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "scikit-hep-testdata";

     

       14
       14
       -
         version = "0.4.7";

     

       14
       14
       +
         version = "0.4.8";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         # fetch from github as we want the data files

     
···

       20
       20
        
           owner = "scikit-hep";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           sha256 = "0bydqgl7pxmj7nb952p08q64d15d8hbvfdnzkbx9wr71mw7cf3vm";

     

       23
       23
       +
           sha256 = "0x5p42c9iqwdx15gdvccddlx4a5a8aix7h01345afrlgpnnpqcv4";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+3 -3

pkgs/development/tools/conftest/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "conftest";

     

       5
       5
       -
         version = "0.27.0";

     

       5
       5
       +
         version = "0.28.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "open-policy-agent";

     

       9
       9
        
           repo = "conftest";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-Yc/aejGLMbAqpIRTVQQ3lv7/oyr7tVAy41Gx6198Eos=";

     

       11
       11
       +
           sha256 = "1fb2i2pkpf0dv2g17zii68hkxk2ni6xn5xyrhb3gmkc6afz96ni0";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA=";

     

       14
       14
       +
         vendorSha256 = "sha256-jt1gQDtbZiBm5o5qwkRNeZDJJoRbXnRUcQ4GoTp+otc=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [

     

       17
       17
        
           "-s"

+5

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix

···

       3
       3
        
         tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json));

     

       4
       4
        
         tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json));

     

       5
       5
        
         tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json));

     

       6
       6
       +
         tree-sitter-clojure = (builtins.fromJSON (builtins.readFile ./tree-sitter-clojure.json));

     

       6
       7
        
         tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json));

     

       7
       8
        
         tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json));

     

       8
       9
        
         tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json));

     

       10
       10
       +
         tree-sitter-dart = (builtins.fromJSON (builtins.readFile ./tree-sitter-dart.json));

     

       9
       11
        
         tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json));

     

       12
       12
       +
         tree-sitter-elisp = (builtins.fromJSON (builtins.readFile ./tree-sitter-elisp.json));

     

       10
       13
        
         tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json));

     

       11
       14
        
         tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json));

     

       12
       15
        
         tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json));

     
···

       28
       31
        
         tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json));

     

       29
       32
        
         tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json));

     

       30
       33
        
         tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json));

     

       34
       34
       +
         tree-sitter-rst = (builtins.fromJSON (builtins.readFile ./tree-sitter-rst.json));

     

       31
       35
        
         tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json));

     

       32
       36
        
         tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json));

     

       33
       37
        
         tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json));

     
···

       37
       41
        
         tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json));

     

       38
       42
        
         tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json));

     

       39
       43
        
         tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json));

     

       44
       44
       +
         tree-sitter-vim = (builtins.fromJSON (builtins.readFile ./tree-sitter-vim.json));

     

       40
       45
        
         tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json));

     

       41
       46
        
         tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json));

     

       42
       47
        
       }

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/tree-sitter/tree-sitter-c",

     

       3
       3
       -
         "rev": "d09ab34013de8a30d97a1912fc30811f1172515f",

     

       4
       4
       -
         "date": "2021-08-16T09:37:46-07:00",

     

       5
       5
       -
         "path": "/nix/store/94lp3b3hgap1baci006329zl2i168scm-tree-sitter-c",

     

       6
       6
       -
         "sha256": "0wf85g82p5j1vlw7rphfcpwch4b8sbvp4kk095aqmmcsm7d7dxl4",

     

       3
       3
       +
         "rev": "f71e80b9f20c3968c131518ae8d272a3cf81a60b",

     

       4
       4
       +
         "date": "2021-09-18T14:26:00-05:00",

     

       5
       5
       +
         "path": "/nix/store/22iw8rdpmvxmyrsmxxbyx8yi44jq05qd-tree-sitter-c",

     

       6
       6
       +
         "sha256": "13qr8ms8w7y92a33p0wisg4kzj4q3dzi2bn7wd6x815j8hfz627q",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+11

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/sogaiu/tree-sitter-clojure",

     

       3
       3
       +
         "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92",

     

       4
       4
       +
         "date": "2021-08-15T13:16:31+09:00",

     

       5
       5
       +
         "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure",

     

       6
       6
       +
         "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b",

     

       7
       7
       +
         "fetchLFS": false,

     

       8
       8
       +
         "fetchSubmodules": false,

     

       9
       9
       +
         "deepClone": false,

     

       10
       10
       +
         "leaveDotGit": false

     

       11
       11
       +
       }

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/tree-sitter/tree-sitter-cpp",

     

       3
       3
       -
         "rev": "f53c3c013a1c223f7ca4614895bef4fe05928101",

     

       4
       4
       -
         "date": "2021-09-14T15:11:36-05:00",

     

       5
       5
       -
         "path": "/nix/store/lc1jjys6lgp19d52n6qgymfqx9pwg0xa-tree-sitter-cpp",

     

       6
       6
       -
         "sha256": "05al4yrb39cfa96cf4armv47ja5qccmc3mvbmzfwc7hh1rq621n7",

     

       3
       3
       +
         "rev": "8b112a131b910ec009853fc9dd1c27eae267a7a6",

     

       4
       4
       +
         "date": "2021-09-18T10:53:12-05:00",

     

       5
       5
       +
         "path": "/nix/store/bpfw6wckk0yfpr99nrv473g3r3b84vbv-tree-sitter-cpp",

     

       6
       6
       +
         "sha256": "0rskvx5krakfkkcmiv9qd0zf8rf63iaigv76x3dq7v00sj8m0xsn",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/tree-sitter/tree-sitter-css",

     

       3
       3
       -
         "rev": "7c390622166517b01445e0bb08f72831731d3088",

     

       4
       4
       -
         "date": "2021-08-17T11:20:41-07:00",

     

       5
       5
       -
         "path": "/nix/store/wx5dzm92k2zv53r5p2s3jv1sak8xdk57-tree-sitter-css",

     

       6
       6
       -
         "sha256": "01r63dqxhgvsc1gkfy0mqsq98dmvc2hdw3c5zdkzdbry8zqpyn8s",

     

       3
       3
       +
         "rev": "a03f1d2d1dfbf6f8e0fdca5f9ff030228241eb57",

     

       4
       4
       +
         "date": "2021-09-15T14:32:51-07:00",

     

       5
       5
       +
         "path": "/nix/store/zamdl9ixsmgi7rdsb7mx2a1g0i8gfvdy-tree-sitter-css",

     

       6
       6
       +
         "sha256": "0i5xf97m6vxgcpa21h2gzlgj9n5rlv9mz3w738bwvcz5k6nbx6np",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+11

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/usernobody14/tree-sitter-dart",

     

       3
       3
       +
         "rev": "6a25376685d1d47968c2cef06d4db8d84a70025e",

     

       4
       4
       +
         "date": "2021-06-04T09:39:40-06:00",

     

       5
       5
       +
         "path": "/nix/store/vdygn1702kn92k222kygk9i50h10z9km-tree-sitter-dart",

     

       6
       6
       +
         "sha256": "0z06sphmgjggx5j2rjfy3f85fh1m9s79sql8a7d4kvsamz9rwakl",

     

       7
       7
       +
         "fetchLFS": false,

     

       8
       8
       +
         "fetchSubmodules": false,

     

       9
       9
       +
         "deepClone": false,

     

       10
       10
       +
         "leaveDotGit": false

     

       11
       11
       +
       }

+11

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/wilfred/tree-sitter-elisp",

     

       3
       3
       +
         "rev": "166777abacfe5821d3b7b6873e6d2fd70a99f348",

     

       4
       4
       +
         "date": "2021-09-05T23:34:46-07:00",

     

       5
       5
       +
         "path": "/nix/store/gfyr8hl9pj2i0dj0qqpwh53jphff2bcd-tree-sitter-elisp",

     

       6
       6
       +
         "sha256": "18798jb3cisrvhkmzhq2qxly19hxvznf9k1n5pzl8l1dhw1yvl2a",

     

       7
       7
       +
         "fetchLFS": false,

     

       8
       8
       +
         "fetchSubmodules": false,

     

       9
       9
       +
         "deepClone": false,

     

       10
       10
       +
         "leaveDotGit": false

     

       11
       11
       +
       }

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/travonted/tree-sitter-fennel",

     

       3
       3
       -
         "rev": "e10b04389094d9b96aa8489121c1f285562d701d",

     

       4
       4
       -
         "date": "2021-08-18T16:21:04-04:00",

     

       5
       5
       -
         "path": "/nix/store/rmlldcr0yq9c87lp96jrajbf5n4xin6r-tree-sitter-fennel",

     

       6
       6
       -
         "sha256": "1bavjjy8wbp1hkj1nps1lsqa9ihwhnj039hfi1fvgxv5j7il74ir",

     

       3
       3
       +
         "rev": "42823442a18dd2aa7b0b22dc719abb54abb3fe2e",

     

       4
       4
       +
         "date": "2021-09-08T19:22:08-04:00",

     

       5
       5
       +
         "path": "/nix/store/2v174r3fc3cqsy8yanq2kdcjqvzl1jx9-tree-sitter-fennel",

     

       6
       6
       +
         "sha256": "0a59hgx7mmdicw9fq2q8dcd2ffmcgjdkk3rpwj84ya1qiyvs5x5s",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/tree-sitter/tree-sitter-python",

     

       3
       3
       -
         "rev": "d6210ceab11e8d812d4ab59c07c81458ec6e5184",

     

       4
       4
       -
         "date": "2021-03-27T09:41:53-07:00",

     

       5
       5
       -
         "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python",

     

       6
       6
       -
         "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk",

     

       3
       3
       +
         "rev": "9b84b7fd9da1aa74c8a8afae58b7dcc4c109cda4",

     

       4
       4
       +
         "date": "2021-09-16T13:02:06+02:00",

     

       5
       5
       +
         "path": "/nix/store/vxh1bdkdqj3n6knlz6bbdyl5l4qj2a2v-tree-sitter-python",

     

       6
       6
       +
         "sha256": "0r5daw3pbqcaf08gnhghjr15n7vv43njvh4ky6vz985sjzdnjz02",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+11

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/stsewd/tree-sitter-rst",

     

       3
       3
       +
         "rev": "a9281c2250e0d32750de159413cdd87120407389",

     

       4
       4
       +
         "date": "2021-09-17T19:21:59-05:00",

     

       5
       5
       +
         "path": "/nix/store/3cnj1q9xfl0yh096pahqvlrf66azyhsr-tree-sitter-rst",

     

       6
       6
       +
         "sha256": "1fxknsmkn3pz1km77mii3w917fdl6h57h4mnw20b0syn4v1ag07d",

     

       7
       7
       +
         "fetchLFS": false,

     

       8
       8
       +
         "fetchSubmodules": false,

     

       9
       9
       +
         "deepClone": false,

     

       10
       10
       +
         "leaveDotGit": false

     

       11
       11
       +
       }

+4 -4

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json

···

       1
       1
        
       {

     

       2
       2
        
         "url": "https://github.com/tree-sitter/tree-sitter-typescript",

     

       3
       3
       -
         "rev": "98ef311701c51f72c83e5285366e00adb7a446c8",

     

       4
       4
       -
         "date": "2021-09-14T18:18:35-07:00",

     

       5
       5
       -
         "path": "/nix/store/fcl3abkk7blcq8hfk7l70j32nhx4ka24-tree-sitter-typescript",

     

       6
       6
       -
         "sha256": "1jpfmpisyz020h3vj7i4km8ha9axl6kqn75ikd26bvyxqir38cnr",

     

       3
       3
       +
         "rev": "3383cebec9c9546587d9fe00c2e565d91163014a",

     

       4
       4
       +
         "date": "2021-09-16T13:01:51-07:00",

     

       5
       5
       +
         "path": "/nix/store/ml188xckf51g1r6gw380svxsg639kjgc-tree-sitter-typescript",

     

       6
       6
       +
         "sha256": "0vgkhn36cyg134ygx5wzld3ic9rd4lq9s2rp2dkxh0zg610ilcms",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+11

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "url": "https://github.com/vigoux/tree-sitter-viml",

     

       3
       3
       +
         "rev": "59595443fb486449f42db839934117221358a85f",

     

       4
       4
       +
         "date": "2021-08-31T08:57:29+02:00",

     

       5
       5
       +
         "path": "/nix/store/9sixkkk37c2bl09aik32cd1jd322ywri-tree-sitter-viml",

     

       6
       6
       +
         "sha256": "1kh3il5vwlz5qxi9553ks7a0dpwx1n7wnqkv5v8jhslhn7w1c1l1",

     

       7
       7
       +
         "fetchLFS": false,

     

       8
       8
       +
         "fetchSubmodules": false,

     

       9
       9
       +
         "deepClone": false,

     

       10
       10
       +
         "leaveDotGit": false

     

       11
       11
       +
       }

+5 -5

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json

···

       1
       1
        
       {

     

       2
       2
       -
         "url": "https://github.com/GrayJack/tree-sitter-zig",

     

       3
       3
       -
         "rev": "41bbc7f7b94bde3e948e41e4d42673945238ff03",

     

       4
       4
       -
         "date": "2021-03-30T12:55:10-03:00",

     

       5
       5
       -
         "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig",

     

       6
       6
       -
         "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0",

     

       2
       2
       +
         "url": "https://github.com/maxxnino/tree-sitter-zig",

     

       3
       3
       +
         "rev": "5ca53bb7bd649069a6af48f4dfd32f3187491db1",

     

       4
       4
       +
         "date": "2021-09-06T21:30:14+09:00",

     

       5
       5
       +
         "path": "/nix/store/x2dfgc97jmvyq5fnbyg9w7rsjz8cknj6-tree-sitter-zig",

     

       6
       6
       +
         "sha256": "1c50pvza6l4snmvgj3by053j4z7asy828i9pi1zwm6121sl7ffpd",

     

       7
       7
        
         "fetchLFS": false,

     

       8
       8
        
         "fetchSubmodules": false,

     

       9
       9
        
         "deepClone": false,

+21 -1

pkgs/development/tools/parsing/tree-sitter/update.nix

···

       70
       70
        
         # If you need a grammar that already exists in the official orga,

     

       71
       71
        
         # make sure to give it a different name.

     

       72
       72
        
         otherGrammars = {

     

       73
       73
       +
           "tree-sitter-clojure" = {

     

       74
       74
       +
             orga = "sogaiu";

     

       75
       75
       +
             repo = "tree-sitter-clojure";

     

       76
       76
       +
           };

     

       73
       77
        
           "tree-sitter-comment" = {

     

       74
       78
        
             orga = "stsewd";

     

       75
       79
        
             repo = "tree-sitter-comment";

     

       76
       80
        
           };

     

       81
       81
       +
           "tree-sitter-dart" = {

     

       82
       82
       +
             orga = "usernobody14";

     

       83
       83
       +
             repo = "tree-sitter-dart";

     

       84
       84
       +
           };

     

       85
       85
       +
           "tree-sitter-elisp" = {

     

       86
       86
       +
             orga = "wilfred";

     

       87
       87
       +
             repo = "tree-sitter-elisp";

     

       88
       88
       +
           };

     

       77
       89
        
           "tree-sitter-nix" = {

     

       78
       90
        
             orga = "cstrahan";

     

       79
       91
        
             repo = "tree-sitter-nix";

     
···

       94
       106
        
             orga = "ikatyang";

     

       95
       107
        
             repo = "tree-sitter-markdown";

     

       96
       108
        
           };

     

       109
       109
       +
           "tree-sitter-rst" = {

     

       110
       110
       +
             orga = "stsewd";

     

       111
       111
       +
             repo = "tree-sitter-rst";

     

       112
       112
       +
           };

     

       97
       113
        
           "tree-sitter-svelte" = {

     

       98
       114
        
             orga = "Himujjal";

     

       99
       115
        
             repo = "tree-sitter-svelte";

     

       100
       116
        
           };

     

       117
       117
       +
           "tree-sitter-vim" = {

     

       118
       118
       +
             orga = "vigoux";

     

       119
       119
       +
             repo = "tree-sitter-viml";

     

       120
       120
       +
           };

     

       101
       121
        
           "tree-sitter-yaml" = {

     

       102
       122
        
             orga = "ikatyang";

     

       103
       123
        
             repo = "tree-sitter-yaml";

     
···

       107
       127
        
             repo = "tree-sitter-toml";

     

       108
       128
        
           };

     

       109
       129
        
           "tree-sitter-zig" = {

     

       110
       110
       -
             orga = "GrayJack";

     

       130
       130
       +
             orga = "maxxnino";

     

       111
       131
        
             repo = "tree-sitter-zig";

     

       112
       132
        
           };

     

       113
       133
        
           "tree-sitter-fish" = {

+32

pkgs/development/tools/rust/cargo-spellcheck/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , libclang

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       rustPlatform.buildRustPackage rec {

     

       8
       8
       +
         pname = "cargo-spellcheck";

     

       9
       9
       +
         version = "0.8.13";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "drahnr";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = "v${version}";

     

       15
       15
       +
           sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x";

     

       19
       19
       +
       

     

       20
       20
       +
         LIBCLANG_PATH = "${libclang.lib}/lib";

     

       21
       21
       +
       

     

       22
       22
       +
         checkFlags = [

     

       23
       23
       +
           "--skip checker::hunspell::tests::hunspell_binding_is_sane"

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           description = "Checks rust documentation for spelling and grammar mistakes";

     

       28
       28
       +
           homepage = "https://github.com/drahnr/cargo-spellcheck";

     

       29
       29
       +
           license = with licenses; [ asl20 /* or */ mit ];

     

       30
       30
       +
           maintainers = with maintainers; [ newam ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+3 -3

pkgs/development/tools/rust/cargo-udeps/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-udeps";

     

       5
       5
       -
         version = "0.1.22";

     

       5
       5
       +
         version = "0.1.23";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "est31";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE=";

     

       11
       11
       +
           sha256 = "sha256-SDB2Xk2bEheXT0Lc1lrTkOyJAcAEsmUPU5R8Hy1SAUE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g=";

     

       14
       14
       +
         cargoSha256 = "sha256-gCGOXEjhT9bx3FYvtu3AoIOmgsU2WO1rmi/cKvD9WMY=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+3 -3

pkgs/development/tools/stylua/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "stylua";

     

       11
       11
       -
         version = "0.10.1";

     

       11
       11
       +
         version = "0.11.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "johnnymorganz";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9";

     

       17
       17
       +
           sha256 = "sha256-mHmLwgAyLEWfhSVy7WmJN1Z5BdA+3hoHujbKn2Q9fxI=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks";

     

       20
       20
       +
         cargoSha256 = "sha256-1aze1U6NrL8KPK5v5NYCdyTTqoczkg32xR5V0jApQWw=";

     

       21
       21
        
       

     

       22
       22
        
         cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]

     

       23
       23
        
           ++ lib.optionals luauSupport [ "--features" "luau" ];

+1 -1

pkgs/development/tools/vala-lint/default.nix

···

       46
       46
        
           '';

     

       47
       47
        
           license = licenses.gpl2Plus;

     

       48
       48
        
           platforms = platforms.linux;

     

       49
       49
       -
           maintainers = pantheon.maintainers;

     

       49
       49
       +
           maintainers = teams.pantheon.members;

     

       50
       50
        
         };

     

       51
       51
        
       }

+2 -2

pkgs/development/tools/vendir/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "vendir";

     

       5
       5
       -
         version = "0.22.0";

     

       5
       5
       +
         version = "0.23.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vmware-tanzu";

     

       9
       9
        
           repo = "carvel-vendir";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-LvpzynT+ibrE1F1uv7X0pVtzOrVFIxFqbZwM04e1Do0=";

     

       11
       11
       +
           sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

+3 -3

pkgs/games/cataclysm-dda/stable.nix

···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         self = common.overrideAttrs (common: rec {

     

       13
       13
       -
           version = "0.F-1";

     

       13
       13
       +
           version = "0.F-2";

     

       14
       14
        
       

     

       15
       15
        
           src = fetchFromGitHub {

     

       16
       16
        
             owner = "CleverRaven";

     

       17
       17
        
             repo = "Cataclysm-DDA";

     

       18
       18
        
             rev = version;

     

       19
       19
       -
             sha256 = "sha256-bVIln8cLZ15qXpW5iB8Odqk0OQbNLLM8OiKybTzARA0=";

     

       19
       19
       +
             sha256 = "sha256-8AZOrO/Wxui+LqAZo8hURktMTycecIgOONUJmE3M+vM=";

     

       20
       20
        
           };

     

       21
       21
        
       

     

       22
       22
        
           makeFlags = common.makeFlags ++ [

     

       23
       23
       -
             # Makefile declares version as 0.F, even under 0.F-1

     

       23
       23
       +
             # Makefile declares version as 0.F, even under 0.F-2

     

       24
       24
        
             "VERSION=${version}"

     

       25
       25
        
           ];

     

       26
       26

+1 -1

pkgs/misc/screensavers/light-locker/default.nix

···

       84
       84
        
             ConsoleKit/UPower or logind/systemd.

     

       85
       85
        
           '';

     

       86
       86
        
           license = licenses.gpl2;

     

       87
       87
       -
           maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers;

     

       87
       87
       +
           maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members;

     

       88
       88
        
           platforms = platforms.linux;

     

       89
       89
        
         };

     

       90
       90
        
       }

+282 -270

pkgs/misc/vim-plugins/generated.nix

···

       77
       77
        
       

     

       78
       78
        
         ale = buildVimPluginFrom2Nix {

     

       79
       79
        
           pname = "ale";

     

       80
       80
       -
           version = "2021-09-11";

     

       80
       80
       +
           version = "2021-09-17";

     

       81
       81
        
           src = fetchFromGitHub {

     

       82
       82
        
             owner = "dense-analysis";

     

       83
       83
        
             repo = "ale";

     

       84
       84
       -
             rev = "19437e25d05950ab83dce285b4b8ec5166e06dba";

     

       85
       85
       -
             sha256 = "1pc99l00ir145b0i7g1m857v1318ji1p8bzhs0cmql0hdp4cvyd3";

     

       84
       84
       +
             rev = "2f72a3ed1972d23a5ef50c78715ec68f090932e8";

     

       85
       85
       +
             sha256 = "1vjg0y02cnnknjgj0zp9f4s84y7dbcy80aw1jp6qizb6cfbkv39v";

     

       86
       86
        
           };

     

       87
       87
        
           meta.homepage = "https://github.com/dense-analysis/ale/";

     

       88
       88
        
         };

     
···

       197
       197
        
       

     

       198
       198
        
         aurora = buildVimPluginFrom2Nix {

     

       199
       199
        
           pname = "aurora";

     

       200
       200
       -
           version = "2021-07-17";

     

       200
       200
       +
           version = "2021-09-18";

     

       201
       201
        
           src = fetchFromGitHub {

     

       202
       202
        
             owner = "ray-x";

     

       203
       203
        
             repo = "aurora";

     

       204
       204
       -
             rev = "af110b7f6080bdc4685cdd5551ba1f79a81910f1";

     

       205
       205
       -
             sha256 = "1h2czb183lliib95jn4dxq8cn713s22dc4hd1cj19bzqy4j39qhi";

     

       204
       204
       +
             rev = "cd4c8ceff0109e76b9c919267e1791f505a75815";

     

       205
       205
       +
             sha256 = "172653xjmyz9a1m0zx3l5njybra5dmsv7b6i01s4w5dzlha5c2jn";

     

       206
       206
        
           };

     

       207
       207
        
           meta.homepage = "https://github.com/ray-x/aurora/";

     

       208
       208
        
         };

     
···

       389
       389
        
       

     

       390
       390
        
         bufferline-nvim = buildVimPluginFrom2Nix {

     

       391
       391
        
           pname = "bufferline.nvim";

     

       392
       392
       -
           version = "2021-09-12";

     

       392
       392
       +
           version = "2021-09-16";

     

       393
       393
        
           src = fetchFromGitHub {

     

       394
       394
        
             owner = "akinsho";

     

       395
       395
        
             repo = "bufferline.nvim";

     

       396
       396
       -
             rev = "15923279b719ce77911caf34e5f4c83a0b5397c9";

     

       397
       397
       -
             sha256 = "0rmmr0c2jxsl4b4dzs0jdp3dinldczw3s6mnf80k4jvswy28rd9h";

     

       396
       396
       +
             rev = "be5866b77c713d92cf3d383a387bec1d55e3f798";

     

       397
       397
       +
             sha256 = "1v4fw3idhbhnnnn08zw92g7pyb2x5ss8zbi7hfbxvn5jkpzyqz6p";

     

       398
       398
        
           };

     

       399
       399
        
           meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

     

       400
       400
        
         };

     
···

       413
       413
        
       

     

       414
       414
        
         calendar-vim = buildVimPluginFrom2Nix {

     

       415
       415
        
           pname = "calendar.vim";

     

       416
       416
       -
           version = "2021-01-30";

     

       416
       416
       +
           version = "2021-09-18";

     

       417
       417
        
           src = fetchFromGitHub {

     

       418
       418
        
             owner = "itchyny";

     

       419
       419
        
             repo = "calendar.vim";

     

       420
       420
       -
             rev = "4e454c2ca9a489f2631df24845615744bd594b61";

     

       421
       421
       -
             sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66";

     

       420
       420
       +
             rev = "eebee3aa5da63188b70c4fd75509dcfce77e2030";

     

       421
       421
       +
             sha256 = "0n8i5jg3hvx6mj6grxcvdsanbyvg67gjiq18aq6kpdb1rcip0270";

     

       422
       422
        
           };

     

       423
       423
        
           meta.homepage = "https://github.com/itchyny/calendar.vim/";

     

       424
       424
        
         };

     
···

       437
       437
        
       

     

       438
       438
        
         caw-vim = buildVimPluginFrom2Nix {

     

       439
       439
        
           pname = "caw.vim";

     

       440
       440
       -
           version = "2021-08-21";

     

       440
       440
       +
           version = "2021-09-16";

     

       441
       441
        
           src = fetchFromGitHub {

     

       442
       442
        
             owner = "tyru";

     

       443
       443
        
             repo = "caw.vim";

     

       444
       444
       -
             rev = "2c0cd18aa113cc255daf4366f1d01a7a25ce0110";

     

       445
       445
       -
             sha256 = "1sa7mhqvfgyr3fsdyl9bjb7scw8ii4y9ig4n3qq77lm4k7snzp2v";

     

       444
       444
       +
             rev = "8978f977a2a80396ab3a536a0df0a3727fca9882";

     

       445
       445
       +
             sha256 = "0rskyi56rhq6l3iv1695xl049ji2l3y5y7fm272hyb18ggq1rzja";

     

       446
       446
        
           };

     

       447
       447
        
           meta.homepage = "https://github.com/tyru/caw.vim/";

     

       448
       448
        
         };

     

       449
       449
        
       

     

       450
       450
        
         chadtree = buildVimPluginFrom2Nix {

     

       451
       451
        
           pname = "chadtree";

     

       452
       452
       -
           version = "2021-09-13";

     

       452
       452
       +
           version = "2021-09-18";

     

       453
       453
        
           src = fetchFromGitHub {

     

       454
       454
        
             owner = "ms-jpq";

     

       455
       455
        
             repo = "chadtree";

     

       456
       456
       -
             rev = "356863bbe896fbea6450b652c60a27b0a1cb3dbd";

     

       457
       457
       -
             sha256 = "0s4vhw8qkg89a9afy9mqa42sl95dmapaqqhzz6gxvamqbk6kgj6y";

     

       456
       456
       +
             rev = "566ed3821410954826e2e5b55b3cbdd1333f1723";

     

       457
       457
       +
             sha256 = "1f1k1hqvjjip0i6hqdhaaihw57krb6bafaaq4xh1dk3h83gkx96m";

     

       458
       458
        
           };

     

       459
       459
        
           meta.homepage = "https://github.com/ms-jpq/chadtree/";

     

       460
       460
        
         };

     
···

       581
       581
        
       

     

       582
       582
        
         cmp-conjure = buildVimPluginFrom2Nix {

     

       583
       583
        
           pname = "cmp-conjure";

     

       584
       584
       -
           version = "2021-08-29";

     

       584
       584
       +
           version = "2021-09-10";

     

       585
       585
        
           src = fetchFromGitHub {

     

       586
       586
        
             owner = "PaterJason";

     

       587
       587
        
             repo = "cmp-conjure";

     

       588
       588
       -
             rev = "4c2a2233de7d2c8ccbf8652b4c741921498ceaec";

     

       589
       589
       -
             sha256 = "1ivrag7gch7mc72rim939z5gh7v532j29hgiy0pxgw3m6lvxdhwq";

     

       588
       588
       +
             rev = "27cfdac78ec099a8d1e82b7a810f451ff0f80a30";

     

       589
       589
       +
             sha256 = "1hbkafpqpzf4bzy8cyzg1zxnnpmhfkpz2vj8v8by5ym4qx8b747p";

     

       590
       590
        
           };

     

       591
       591
        
           meta.homepage = "https://github.com/PaterJason/cmp-conjure/";

     

       592
       592
        
         };

     

       593
       593
        
       

     

       594
       594
        
         cmp-emoji = buildVimPluginFrom2Nix {

     

       595
       595
        
           pname = "cmp-emoji";

     

       596
       596
       -
           version = "2021-08-25";

     

       596
       596
       +
           version = "2021-09-18";

     

       597
       597
        
           src = fetchFromGitHub {

     

       598
       598
        
             owner = "hrsh7th";

     

       599
       599
        
             repo = "cmp-emoji";

     

       600
       600
       -
             rev = "bbdcc00ecbae3bba18c648a6520d78f354853ce0";

     

       601
       601
       -
             sha256 = "0zsda2dhhvqd1968xr6p8ndpai4vhb8xmk08nv038zg9csrqkqac";

     

       600
       600
       +
             rev = "49f33af4609b0c306176e4f1408b3d7d845411a6";

     

       601
       601
       +
             sha256 = "0x5yihz6b5shsz5kkwh95xqw6y66bhlvfwcp207khqk5vmvrk4mk";

     

       602
       602
        
           };

     

       603
       603
        
           meta.homepage = "https://github.com/hrsh7th/cmp-emoji/";

     

       604
       604
        
         };

     
···

       617
       617
        
       

     

       618
       618
        
         cmp-nvim-lsp = buildVimPluginFrom2Nix {

     

       619
       619
        
           pname = "cmp-nvim-lsp";

     

       620
       620
       -
           version = "2021-09-03";

     

       620
       620
       +
           version = "2021-09-17";

     

       621
       621
        
           src = fetchFromGitHub {

     

       622
       622
        
             owner = "hrsh7th";

     

       623
       623
        
             repo = "cmp-nvim-lsp";

     

       624
       624
       -
             rev = "f6f471898bc4b45eacd36eef9887847b73130e0e";

     

       625
       625
       -
             sha256 = "1asr32w5q618pqggq9jwrbqs4kjp3ssbw5pca5wc7j2496vm2lhg";

     

       624
       624
       +
             rev = "246a41c55668d5f84afcd805ee73b6e419375ae0";

     

       625
       625
       +
             sha256 = "0ybnrs31i61l6z02fjz65ankxccd5587pnky4lsczcz12kpj6s4n";

     

       626
       626
        
           };

     

       627
       627
        
           meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";

     

       628
       628
        
         };

     
···

       689
       689
        
       

     

       690
       690
        
         cmp_luasnip = buildVimPluginFrom2Nix {

     

       691
       691
        
           pname = "cmp_luasnip";

     

       692
       692
       -
           version = "2021-09-11";

     

       692
       692
       +
           version = "2021-09-13";

     

       693
       693
        
           src = fetchFromGitHub {

     

       694
       694
        
             owner = "saadparwaiz1";

     

       695
       695
        
             repo = "cmp_luasnip";

     

       696
       696
       -
             rev = "7284dd6ee87b05203932db6f9d28516efa5dc981";

     

       697
       697
       -
             sha256 = "0wffibd4vfmgrhwzymfqkqn8klvv0mhgbjkzjgxl15hpxhz62i5d";

     

       696
       696
       +
             rev = "e22fe57aec4f9e7029b8e547657fbee1b16cbaf7";

     

       697
       697
       +
             sha256 = "0fkzxhs8gj5vbcbs2s8n66fjzmrxvzh1bn3kxijszmcm706d3nyq";

     

       698
       698
        
           };

     

       699
       699
        
           meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";

     

       700
       700
        
         };

     

       701
       701
        
       

     

       702
       702
        
         coc-clap = buildVimPluginFrom2Nix {

     

       703
       703
        
           pname = "coc-clap";

     

       704
       704
       -
           version = "2021-05-10";

     

       704
       704
       +
           version = "2021-09-18";

     

       705
       705
        
           src = fetchFromGitHub {

     

       706
       706
        
             owner = "vn-ki";

     

       707
       707
        
             repo = "coc-clap";

     

       708
       708
       -
             rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6";

     

       709
       709
       -
             sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx";

     

       708
       708
       +
             rev = "0f43b736899b9444704b11bd1835fa337f31ac11";

     

       709
       709
       +
             sha256 = "03glw1mz1pbn2paj7bhmmwcb7f25p1fqm755mpzrs9phra8bnyis";

     

       710
       710
        
           };

     

       711
       711
        
           meta.homepage = "https://github.com/vn-ki/coc-clap/";

     

       712
       712
        
         };

     
···

       882
       882
        
       

     

       883
       883
        
         compe-tabnine = buildVimPluginFrom2Nix {

     

       884
       884
        
           pname = "compe-tabnine";

     

       885
       885
       -
           version = "2021-09-04";

     

       885
       885
       +
           version = "2021-09-14";

     

       886
       886
        
           src = fetchFromGitHub {

     

       887
       887
        
             owner = "tzachar";

     

       888
       888
        
             repo = "compe-tabnine";

     

       889
       889
       -
             rev = "b00e1f9d597673bfcba39b6bfc620cea9e6c815a";

     

       890
       890
       -
             sha256 = "0ryj8b60vvxb1q58xyv4hgrc1d7rjsbr21wn677xr13836knb5bw";

     

       889
       889
       +
             rev = "33e4af509c27da9ef2c9c3002c01e3ec031797d4";

     

       890
       890
       +
             sha256 = "1lzyia2s66kcxpr6d3db4rcgxlcddfg6gpz8rbg333hdasly383w";

     

       891
       891
        
           };

     

       892
       892
        
           meta.homepage = "https://github.com/tzachar/compe-tabnine/";

     

       893
       893
        
         };

     
···

       1026
       1026
        
       

     

       1027
       1027
        
         Coqtail = buildVimPluginFrom2Nix {

     

       1028
       1028
        
           pname = "Coqtail";

     

       1029
       1029
       -
           version = "2021-08-29";

     

       1029
       1029
       +
           version = "2021-09-17";

     

       1030
       1030
        
           src = fetchFromGitHub {

     

       1031
       1031
        
             owner = "whonore";

     

       1032
       1032
        
             repo = "Coqtail";

     

       1033
       1033
       -
             rev = "13147545ffe61def7d3bb1123c5c843715e9565c";

     

       1034
       1034
       -
             sha256 = "0jr6c0s7g54ra8w5r5b8j6hx16ch7cg9rj60jakbqfc1qdi5y9jm";

     

       1033
       1033
       +
             rev = "ca2ca0d874670ae78192b465501e9a061f9f8f06";

     

       1034
       1034
       +
             sha256 = "07hg0sf2k1f3n67pj5abvalnd33vr1sdhyh1i7syk201a3kzj57n";

     

       1035
       1035
        
           };

     

       1036
       1036
        
           meta.homepage = "https://github.com/whonore/Coqtail/";

     

       1037
       1037
        
         };

     
···

       1062
       1062
        
       

     

       1063
       1063
        
         crates-nvim = buildVimPluginFrom2Nix {

     

       1064
       1064
        
           pname = "crates.nvim";

     

       1065
       1065
       -
           version = "2021-09-06";

     

       1065
       1065
       +
           version = "2021-09-18";

     

       1066
       1066
        
           src = fetchFromGitHub {

     

       1067
       1067
        
             owner = "saecki";

     

       1068
       1068
        
             repo = "crates.nvim";

     

       1069
       1069
       -
             rev = "736033d59b2940e35565ae37c3fd5cb024c2a134";

     

       1070
       1070
       -
             sha256 = "09v5frr2mlqgvdw1kswv0r683xvg0j3k4wm3h00m0r929prqd6ll";

     

       1069
       1069
       +
             rev = "89d1032cc53fc7f846af98d1c63a0bdb6d9b5a34";

     

       1070
       1070
       +
             sha256 = "01xqkadd85a91z1did0d7mj1m805ilm88bsk0a893s66viyvqx57";

     

       1071
       1071
        
           };

     

       1072
       1072
        
           meta.homepage = "https://github.com/saecki/crates.nvim/";

     

       1073
       1073
        
         };

     
···

       1194
       1194
        
       

     

       1195
       1195
        
         defx-nvim = buildVimPluginFrom2Nix {

     

       1196
       1196
        
           pname = "defx.nvim";

     

       1197
       1197
       -
           version = "2021-09-09";

     

       1197
       1197
       +
           version = "2021-09-18";

     

       1198
       1198
        
           src = fetchFromGitHub {

     

       1199
       1199
        
             owner = "Shougo";

     

       1200
       1200
        
             repo = "defx.nvim";

     

       1201
       1201
       -
             rev = "7db19db1b1b6a82b763331b1719151a927d494e6";

     

       1202
       1202
       -
             sha256 = "1v435j2qm395kvrq1vcrg4i76av2nzp5vywlhq4mk54q9gmb5xlp";

     

       1201
       1201
       +
             rev = "9983f2cee6374da84be1d0189cc9add7605eeb56";

     

       1202
       1202
       +
             sha256 = "0r7illv3v53fqq9xvic10hgqgd2863gv0s0x94i8vj6y04g3h2lj";

     

       1203
       1203
        
           };

     

       1204
       1204
        
           meta.homepage = "https://github.com/Shougo/defx.nvim/";

     

       1205
       1205
        
         };

     
···

       1254
       1254
        
       

     

       1255
       1255
        
         deol-nvim = buildVimPluginFrom2Nix {

     

       1256
       1256
        
           pname = "deol.nvim";

     

       1257
       1257
       -
           version = "2021-09-09";

     

       1257
       1257
       +
           version = "2021-09-13";

     

       1258
       1258
        
           src = fetchFromGitHub {

     

       1259
       1259
        
             owner = "Shougo";

     

       1260
       1260
        
             repo = "deol.nvim";

     

       1261
       1261
       -
             rev = "9859e06d7a478eb3c2d26ca0270501581bd95a0b";

     

       1262
       1262
       -
             sha256 = "1r6hr0lfbhdl86a5k2vy3vaiqnnl9pgvgpak0lvswrjzjkz4nn7h";

     

       1261
       1261
       +
             rev = "03b772ed3e91b8bdbf5260d76f84c5e90a42a8f0";

     

       1262
       1262
       +
             sha256 = "0nbwb2kcmd88zqk1v1zndbrjfpsj5jy99bzm81sx5k9yslhl854n";

     

       1263
       1263
        
           };

     

       1264
       1264
        
           meta.homepage = "https://github.com/Shougo/deol.nvim/";

     

       1265
       1265
        
         };

     
···

       1592
       1592
        
       

     

       1593
       1593
        
         echodoc-vim = buildVimPluginFrom2Nix {

     

       1594
       1594
        
           pname = "echodoc.vim";

     

       1595
       1595
       -
           version = "2021-08-12";

     

       1595
       1595
       +
           version = "2021-09-16";

     

       1596
       1596
        
           src = fetchFromGitHub {

     

       1597
       1597
        
             owner = "Shougo";

     

       1598
       1598
        
             repo = "echodoc.vim";

     

       1599
       1599
       -
             rev = "3e907e05d0495f999149f50a1e6cd72972ee7cbe";

     

       1600
       1600
       -
             sha256 = "0bdiz108l4aa5ma49lbmmp8ks8n17i6wzjsawd94rgsyl3j4j3ri";

     

       1599
       1599
       +
             rev = "b77548dcebf3a3324fec44ba361f3cd8dbe89f18";

     

       1600
       1600
       +
             sha256 = "0fqd3fqfg7zri0y4mm0d4rpp87wjf8kpy0gphkha5r4lpd2mjgv4";

     

       1601
       1601
        
           };

     

       1602
       1602
        
           meta.homepage = "https://github.com/Shougo/echodoc.vim/";

     

       1603
       1603
        
         };

     

       1604
       1604
        
       

     

       1605
       1605
        
         edge = buildVimPluginFrom2Nix {

     

       1606
       1606
        
           pname = "edge";

     

       1607
       1607
       -
           version = "2021-09-03";

     

       1607
       1607
       +
           version = "2021-09-18";

     

       1608
       1608
        
           src = fetchFromGitHub {

     

       1609
       1609
        
             owner = "sainnhe";

     

       1610
       1610
        
             repo = "edge";

     

       1611
       1611
       -
             rev = "9653ebf5bf63c4ea31c3b6cf758d6253c672a838";

     

       1612
       1612
       -
             sha256 = "0qmpk36brpwl8wi7jw3sv3mvlrrzlww1kn5sa669g3sbdjkk7zpj";

     

       1611
       1611
       +
             rev = "25fbb8d382aa43432ae76ac8c4725de3e4ce3551";

     

       1612
       1612
       +
             sha256 = "0s2vihz6z33h5r1nly9h40s5yvrgpm8maa9xfbxqk6xf960kydi2";

     

       1613
       1613
        
           };

     

       1614
       1614
        
           meta.homepage = "https://github.com/sainnhe/edge/";

     

       1615
       1615
        
         };

     
···

       1629
       1629
        
       

     

       1630
       1630
        
         editorconfig-nvim = buildVimPluginFrom2Nix {

     

       1631
       1631
        
           pname = "editorconfig.nvim";

     

       1632
       1632
       -
           version = "2021-09-02";

     

       1632
       1632
       +
           version = "2021-09-15";

     

       1633
       1633
        
           src = fetchFromGitHub {

     

       1634
       1634
        
             owner = "gpanders";

     

       1635
       1635
        
             repo = "editorconfig.nvim";

     

       1636
       1636
       -
             rev = "d9df2225615071bec85e5956a146ae0fabc960f6";

     

       1637
       1637
       -
             sha256 = "02jjzmgjcaqvgnfnc81xnqfsgfnyyv9mv1xjz6s4vm823gmhi2li";

     

       1636
       1636
       +
             rev = "4ebcc2fa7c2663d29df6ccffa5be95b8f266a138";

     

       1637
       1637
       +
             sha256 = "13lwv7f0c6sgmpgxx07dpqc59czv69qz30jkgz2dsvjdnd6rvzif";

     

       1638
       1638
        
           };

     

       1639
       1639
        
           meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";

     

       1640
       1640
        
         };

     
···

       1762
       1762
        
       

     

       1763
       1763
        
         feline-nvim = buildVimPluginFrom2Nix {

     

       1764
       1764
        
           pname = "feline.nvim";

     

       1765
       1765
       -
           version = "2021-09-12";

     

       1765
       1765
       +
           version = "2021-09-17";

     

       1766
       1766
        
           src = fetchFromGitHub {

     

       1767
       1767
        
             owner = "famiu";

     

       1768
       1768
        
             repo = "feline.nvim";

     

       1769
       1769
       -
             rev = "0506b42b11e9ef6c5c9a3710cb29f8829b33aaa8";

     

       1770
       1770
       -
             sha256 = "17c8fm8yjzic6ys5p6cy3dkpxjlqp1ziqx537wdqylfa9q177gbg";

     

       1769
       1769
       +
             rev = "5d152e2cc28c172b42f4caba8baf0973f6a6ece6";

     

       1770
       1770
       +
             sha256 = "0mzvh62zphb35kjzx9d09k7sak6fqsk1lcmycgjxk4kydjiw68za";

     

       1771
       1771
        
           };

     

       1772
       1772
        
           meta.homepage = "https://github.com/famiu/feline.nvim/";

     

       1773
       1773
        
         };

     
···

       1883
       1883
        
       

     

       1884
       1884
        
         formatter-nvim = buildVimPluginFrom2Nix {

     

       1885
       1885
        
           pname = "formatter.nvim";

     

       1886
       1886
       -
           version = "2021-08-27";

     

       1886
       1886
       +
           version = "2021-09-15";

     

       1887
       1887
        
           src = fetchFromGitHub {

     

       1888
       1888
        
             owner = "mhartington";

     

       1889
       1889
        
             repo = "formatter.nvim";

     

       1890
       1890
       -
             rev = "c80405aca78fda2f8da586d7d087c13fdd500d85";

     

       1891
       1891
       -
             sha256 = "07s7yw0l9xbf55x67yqcxi5r1y9nj5pjx69rl38jffw1l6lnnbgj";

     

       1890
       1890
       +
             rev = "42aa771f34843f1583be98bfabc8f4a71f20a001";

     

       1891
       1891
       +
             sha256 = "0zrrsisil9z1w6xcf9r5f52w0mnhv9qcl3zsl5c2hkw8ar7im27j";

     

       1892
       1892
        
           };

     

       1893
       1893
        
           meta.homepage = "https://github.com/mhartington/formatter.nvim/";

     

       1894
       1894
        
         };

     
···

       1907
       1907
        
       

     

       1908
       1908
        
         friendly-snippets = buildVimPluginFrom2Nix {

     

       1909
       1909
        
           pname = "friendly-snippets";

     

       1910
       1910
       -
           version = "2021-09-11";

     

       1910
       1910
       +
           version = "2021-09-16";

     

       1911
       1911
        
           src = fetchFromGitHub {

     

       1912
       1912
        
             owner = "rafamadriz";

     

       1913
       1913
        
             repo = "friendly-snippets";

     

       1914
       1914
       -
             rev = "9b1804bf6b6db18b1e056a92e0e03ddecff8e721";

     

       1915
       1915
       -
             sha256 = "08gvxbq8i6hw4s2h6d68bdb27gm97sxj00zcamhpj6gi2h4wbzwl";

     

       1914
       1914
       +
             rev = "31cdf6ab00898ae80e2bfe870378a499697da725";

     

       1915
       1915
       +
             sha256 = "0iafqh05h3v5bnvigrb6bnv0sn6lps64blqfnksr35i60yljw878";

     

       1916
       1916
        
           };

     

       1917
       1917
        
           meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

     

       1918
       1918
        
         };

     
···

       1931
       1931
        
       

     

       1932
       1932
        
         fugitive-gitlab-vim = buildVimPluginFrom2Nix {

     

       1933
       1933
        
           pname = "fugitive-gitlab.vim";

     

       1934
       1934
       -
           version = "2021-09-07";

     

       1934
       1934
       +
           version = "2021-09-14";

     

       1935
       1935
        
           src = fetchFromGitHub {

     

       1936
       1936
        
             owner = "shumphrey";

     

       1937
       1937
        
             repo = "fugitive-gitlab.vim";

     

       1938
       1938
       -
             rev = "befd5438ad55a80c6abb415f6c5a9a44275550bc";

     

       1939
       1939
       -
             sha256 = "1m57c11b7q1sv6va0xzikha19bck6rgr539sjhnhppdy7nlk55lw";

     

       1938
       1938
       +
             rev = "36155d4b9f7a7abc2e6e94936952c661314f141f";

     

       1939
       1939
       +
             sha256 = "1y0fpzgrqvnk2bgks1icbidc60z07syiaf8912rncmx4pdc2gzv1";

     

       1940
       1940
        
           };

     

       1941
       1941
        
           meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";

     

       1942
       1942
        
         };

     

       1943
       1943
        
       

     

       1944
       1944
       +
         futhark-vim = buildVimPluginFrom2Nix {

     

       1945
       1945
       +
           pname = "futhark-vim";

     

       1946
       1946
       +
           version = "2021-08-24";

     

       1947
       1947
       +
           src = fetchFromGitHub {

     

       1948
       1948
       +
             owner = "BeneCollyridam";

     

       1949
       1949
       +
             repo = "futhark-vim";

     

       1950
       1950
       +
             rev = "fd7d053c74f150712eaa73999f44a3f95c8f08ff";

     

       1951
       1951
       +
             sha256 = "17iwpqxkvflcimc066n5ljjbx603hpaqzk271r37qxdvk58jpn0w";

     

       1952
       1952
       +
           };

     

       1953
       1953
       +
           meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/";

     

       1954
       1954
       +
         };

     

       1955
       1955
       +
       

     

       1944
       1956
        
         fwatch-nvim = buildVimPluginFrom2Nix {

     

       1945
       1957
        
           pname = "fwatch.nvim";

     

       1946
       1958
        
           version = "2021-07-25";

     
···

       1967
       1979
        
       

     

       1968
       1980
        
         fzf-lsp-nvim = buildVimPluginFrom2Nix {

     

       1969
       1981
        
           pname = "fzf-lsp.nvim";

     

       1970
       1970
       -
           version = "2021-09-11";

     

       1982
       1982
       +
           version = "2021-09-14";

     

       1971
       1983
        
           src = fetchFromGitHub {

     

       1972
       1984
        
             owner = "gfanto";

     

       1973
       1985
        
             repo = "fzf-lsp.nvim";

     

       1974
       1974
       -
             rev = "a08c0417fb910e06ad08d13bc8f9c12848722618";

     

       1975
       1975
       -
             sha256 = "1m5khwj4mbhrhzs5yxipnzja1av9vvnpb460axswcdji9w0niv9y";

     

       1986
       1986
       +
             rev = "8757eccc3948aa6107448d7fee2de226f0b7040b";

     

       1987
       1987
       +
             sha256 = "0fjjwqkb5xl2prk8im8ndci73zlaaazr5x92aa69qvsjkbzvq7fw";

     

       1976
       1988
        
           };

     

       1977
       1989
        
           meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";

     

       1978
       1990
        
         };

     

       1979
       1991
        
       

     

       1980
       1992
        
         fzf-vim = buildVimPluginFrom2Nix {

     

       1981
       1993
        
           pname = "fzf.vim";

     

       1982
       1982
       -
           version = "2021-09-02";

     

       1994
       1994
       +
           version = "2021-09-16";

     

       1983
       1995
        
           src = fetchFromGitHub {

     

       1984
       1996
        
             owner = "junegunn";

     

       1985
       1997
        
             repo = "fzf.vim";

     

       1986
       1986
       -
             rev = "980cd074395110964b66bfbc5c1f1ee237be3c86";

     

       1987
       1987
       -
             sha256 = "0wpih3xcyr6nnmpqfikp47ay2pmxp1lr0fp7fxwql8sfjc29i76r";

     

       1998
       1998
       +
             rev = "bd703a7a7d7afd113634a346290acc27dd314bfc";

     

       1999
       1999
       +
             sha256 = "1q4kdcnwyivwddgn3svvi0zp9n1hbx0bfnfrzdfn327kgljsdfnr";

     

       1988
       2000
        
           };

     

       1989
       2001
        
           meta.homepage = "https://github.com/junegunn/fzf.vim/";

     

       1990
       2002
        
         };

     
···

       2123
       2135
        
       

     

       2124
       2136
        
         gitsigns-nvim = buildVimPluginFrom2Nix {

     

       2125
       2137
        
           pname = "gitsigns.nvim";

     

       2126
       2126
       -
           version = "2021-09-11";

     

       2138
       2138
       +
           version = "2021-09-14";

     

       2127
       2139
        
           src = fetchFromGitHub {

     

       2128
       2140
        
             owner = "lewis6991";

     

       2129
       2141
        
             repo = "gitsigns.nvim";

     

       2130
       2130
       -
             rev = "cef4e6f26cd52f6a9725f0af4798b35cf6807404";

     

       2131
       2131
       -
             sha256 = "01asl51liflhpdgmcmqw1djq24wpyhb051y87fxq6nnlyg92smpc";

     

       2142
       2142
       +
             rev = "42acbae18327c53b8a82011074bcb529c3c75c8a";

     

       2143
       2143
       +
             sha256 = "1m5wczqigx3a73a97p0qgqj5121mjawslj596jd18v5scbr39gv0";

     

       2132
       2144
        
           };

     

       2133
       2145
        
           meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

     

       2134
       2146
        
         };

     
···

       2195
       2207
        
       

     

       2196
       2208
        
         goto-preview = buildVimPluginFrom2Nix {

     

       2197
       2209
        
           pname = "goto-preview";

     

       2198
       2198
       -
           version = "2021-09-06";

     

       2210
       2210
       +
           version = "2021-09-17";

     

       2199
       2211
        
           src = fetchFromGitHub {

     

       2200
       2212
        
             owner = "rmagatti";

     

       2201
       2213
        
             repo = "goto-preview";

     

       2202
       2202
       -
             rev = "8093ded366e2e71e87f5e40da29994187c06fce1";

     

       2203
       2203
       -
             sha256 = "0mm7vrmibcdsxn9b89q7skc0xcm9z5fi1bv0gg3cc8kb1gislnwf";

     

       2214
       2214
       +
             rev = "88ebcb56214ace7f52f2a846b40ff1f3e098af35";

     

       2215
       2215
       +
             sha256 = "17xpdh5q62d97v5akq52b7qpfqmnvai5ggn46c0ysgl0r5cdycrv";

     

       2204
       2216
        
           };

     

       2205
       2217
        
           meta.homepage = "https://github.com/rmagatti/goto-preview/";

     

       2206
       2218
        
         };

     
···

       2255
       2267
        
       

     

       2256
       2268
        
         gruvbox-material = buildVimPluginFrom2Nix {

     

       2257
       2269
        
           pname = "gruvbox-material";

     

       2258
       2258
       -
           version = "2021-09-03";

     

       2270
       2270
       +
           version = "2021-09-18";

     

       2259
       2271
        
           src = fetchFromGitHub {

     

       2260
       2272
        
             owner = "sainnhe";

     

       2261
       2273
        
             repo = "gruvbox-material";

     

       2262
       2262
       -
             rev = "99260ca49fa587e4e3c75da429f6c76866651a6a";

     

       2263
       2263
       -
             sha256 = "0rx2ma52q8pwwq8yr61wg3v0z3s7nb5zr5p15i596aa69a84a9pn";

     

       2274
       2274
       +
             rev = "94477f86aba2eef070497c1624c7b8d06e183b15";

     

       2275
       2275
       +
             sha256 = "1wpmk6addq754172fp4pxcad6sik85kssqzg23asjvk0sviaf9i7";

     

       2264
       2276
        
           };

     

       2265
       2277
        
           meta.homepage = "https://github.com/sainnhe/gruvbox-material/";

     

       2266
       2278
        
         };

     
···

       2447
       2459
        
       

     

       2448
       2460
        
         increment-activator = buildVimPluginFrom2Nix {

     

       2449
       2461
        
           pname = "increment-activator";

     

       2450
       2450
       -
           version = "2020-03-09";

     

       2462
       2462
       +
           version = "2021-09-16";

     

       2451
       2463
        
           src = fetchFromGitHub {

     

       2452
       2464
        
             owner = "nishigori";

     

       2453
       2465
        
             repo = "increment-activator";

     

       2454
       2454
       -
             rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb";

     

       2455
       2455
       -
             sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y";

     

       2466
       2466
       +
             rev = "55efcff88be45bd98cfdf7333dd718399373d10c";

     

       2467
       2467
       +
             sha256 = "0q8990q9yxc85h69hssk4lry01qiqyi0hlnnx8l1kk218yar4q6h";

     

       2456
       2468
        
           };

     

       2457
       2469
        
           meta.homepage = "https://github.com/nishigori/increment-activator/";

     

       2458
       2470
        
         };

     
···

       2483
       2495
        
       

     

       2484
       2496
        
         indent-blankline-nvim = buildVimPluginFrom2Nix {

     

       2485
       2497
        
           pname = "indent-blankline.nvim";

     

       2486
       2486
       -
           version = "2021-09-12";

     

       2498
       2498
       +
           version = "2021-09-15";

     

       2487
       2499
        
           src = fetchFromGitHub {

     

       2488
       2500
        
             owner = "lukas-reineke";

     

       2489
       2501
        
             repo = "indent-blankline.nvim";

     

       2490
       2490
       -
             rev = "0a3792cfc978ce30632bb0b10968849f1b9604eb";

     

       2491
       2491
       -
             sha256 = "0ggxdcsdwb686rqwqga34cic94i45zp9aykqrqy13iv49gvspyxv";

     

       2502
       2502
       +
             rev = "aed095e367bead0784a72e946ddfa2337b59ace8";

     

       2503
       2503
       +
             sha256 = "0w90k6zd26a5zsfni10m509gcv7w5gfrcwx9xazhkz4bqwzc8jjr";

     

       2492
       2504
        
           };

     

       2493
       2505
        
           meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";

     

       2494
       2506
        
         };

     
···

       2868
       2880
        
       

     

       2869
       2881
        
         lightline-bufferline = buildVimPluginFrom2Nix {

     

       2870
       2882
        
           pname = "lightline-bufferline";

     

       2871
       2871
       -
           version = "2021-08-19";

     

       2883
       2883
       +
           version = "2021-09-17";

     

       2872
       2884
        
           src = fetchFromGitHub {

     

       2873
       2885
        
             owner = "mengelbrecht";

     

       2874
       2886
        
             repo = "lightline-bufferline";

     

       2875
       2875
       -
             rev = "0b1ec6fbb1fceebd88694e99fbc905d916c8b30a";

     

       2876
       2876
       -
             sha256 = "19mwdnnvps3dr5125al5yqlbziirl100xz11jkp2rbk250pc5h8d";

     

       2887
       2887
       +
             rev = "4d1ddf0508069395ed54e7eb38a47f04fb03a387";

     

       2888
       2888
       +
             sha256 = "06x3zdfss58ky5z8kgca1gq2zvdqv1nfw3mgnlsj0qq52mj0jwgj";

     

       2877
       2889
        
           };

     

       2878
       2890
        
           meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

     

       2879
       2891
        
         };

     
···

       2904
       2916
        
       

     

       2905
       2917
        
         lightspeed-nvim = buildVimPluginFrom2Nix {

     

       2906
       2918
        
           pname = "lightspeed.nvim";

     

       2907
       2907
       -
           version = "2021-09-11";

     

       2919
       2919
       +
           version = "2021-09-17";

     

       2908
       2920
        
           src = fetchFromGitHub {

     

       2909
       2921
        
             owner = "ggandor";

     

       2910
       2922
        
             repo = "lightspeed.nvim";

     

       2911
       2911
       -
             rev = "01909f4e4e46777ca808ce91dc1088f8aba40b45";

     

       2912
       2912
       -
             sha256 = "00szivifmkngq14s3n58hdc3mws0hs2h4ypcykyxc9sypc44ygzs";

     

       2923
       2923
       +
             rev = "6ca32a155406d11093f64fa97e0ba8c6802fb7e1";

     

       2924
       2924
       +
             sha256 = "0f886hldkv4ws18m492lhymp92mxympp2maqr8zy4hh06i7k123a";

     

       2913
       2925
        
           };

     

       2914
       2926
        
           meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";

     

       2915
       2927
        
         };

     
···

       2976
       2988
        
       

     

       2977
       2989
        
         lsp-status-nvim = buildVimPluginFrom2Nix {

     

       2978
       2990
        
           pname = "lsp-status.nvim";

     

       2979
       2979
       -
           version = "2021-09-11";

     

       2991
       2991
       +
           version = "2021-09-15";

     

       2980
       2992
        
           src = fetchFromGitHub {

     

       2981
       2993
        
             owner = "nvim-lua";

     

       2982
       2994
        
             repo = "lsp-status.nvim";

     

       2983
       2983
       -
             rev = "d12d7c62efdfd9151aa1b11bebe8cd8655a61368";

     

       2984
       2984
       -
             sha256 = "0vsfih3dn0rmnwbmrd2p0y5fw1h5ii62a9fzjvpjkgw7i9s8d4lp";

     

       2995
       2995
       +
             rev = "e8e5303f9ee3d8dc327c97891eaa1257ba5d4eee";

     

       2996
       2996
       +
             sha256 = "106l23n01czd8ndzfixggj8ifv80w0n19mjakac575sjrxhwbl52";

     

       2985
       2997
        
           };

     

       2986
       2998
        
           meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";

     

       2987
       2999
        
         };

     
···

       3000
       3012
        
       

     

       3001
       3013
        
         lsp_signature-nvim = buildVimPluginFrom2Nix {

     

       3002
       3014
        
           pname = "lsp_signature.nvim";

     

       3003
       3003
       -
           version = "2021-09-12";

     

       3015
       3015
       +
           version = "2021-09-17";

     

       3004
       3016
        
           src = fetchFromGitHub {

     

       3005
       3017
        
             owner = "ray-x";

     

       3006
       3018
        
             repo = "lsp_signature.nvim";

     

       3007
       3007
       -
             rev = "5668ffc9b8cbe472cf0c85938e51c4a22a183da1";

     

       3008
       3008
       -
             sha256 = "1dqy6m4lwb77zizncr0kyyra3a2ylmgiwr2hrxl3s8f4asggiy6z";

     

       3019
       3019
       +
             rev = "5ee2b1fff09463e22679f5f3f8040d1200d6f848";

     

       3020
       3020
       +
             sha256 = "18pa21ia9mvla19glf0k20l73mm8kam81xqq73ns16ww9mmql51z";

     

       3009
       3021
        
           };

     

       3010
       3022
        
           meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

     

       3011
       3023
        
         };

     
···

       3060
       3072
        
       

     

       3061
       3073
        
         luasnip = buildVimPluginFrom2Nix {

     

       3062
       3074
        
           pname = "luasnip";

     

       3063
       3063
       -
           version = "2021-09-12";

     

       3075
       3075
       +
           version = "2021-09-18";

     

       3064
       3076
        
           src = fetchFromGitHub {

     

       3065
       3077
        
             owner = "l3mon4d3";

     

       3066
       3078
        
             repo = "luasnip";

     

       3067
       3067
       -
             rev = "80085bcf4a0f5b6a1008cac29eda9c9242b11520";

     

       3068
       3068
       -
             sha256 = "0jlc2vnyqplzjns3av1h74kfl1jh36aqbffggd59xz2bp10jmwh3";

     

       3079
       3079
       +
             rev = "ccf8d5da2370877ccf7b3ea164d0530ff1f59a87";

     

       3080
       3080
       +
             sha256 = "04646vmfkpzby0dimxs2xaim4isjnvfivildjskl8frbabkfwkrw";

     

       3069
       3081
        
           };

     

       3070
       3082
        
           meta.homepage = "https://github.com/l3mon4d3/luasnip/";

     

       3071
       3083
        
         };

     
···

       3168
       3180
        
       

     

       3169
       3181
        
         minsnip-nvim = buildVimPluginFrom2Nix {

     

       3170
       3182
        
           pname = "minsnip.nvim";

     

       3171
       3171
       -
           version = "2021-09-06";

     

       3183
       3183
       +
           version = "2021-09-16";

     

       3172
       3184
        
           src = fetchFromGitHub {

     

       3173
       3185
        
             owner = "jose-elias-alvarez";

     

       3174
       3186
        
             repo = "minsnip.nvim";

     

       3175
       3175
       -
             rev = "0bcc73cb716b07d4286ef714f5a07d94204d484c";

     

       3176
       3176
       -
             sha256 = "0k6dmqmw52scvwfr5w8dg7388cy95vdvgfw3f4prwyls60i9x55w";

     

       3187
       3187
       +
             rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e";

     

       3188
       3188
       +
             sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj";

     

       3177
       3189
        
           };

     

       3178
       3190
        
           meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";

     

       3179
       3191
        
         };

     
···

       3480
       3492
        
       

     

       3481
       3493
        
         neoformat = buildVimPluginFrom2Nix {

     

       3482
       3494
        
           pname = "neoformat";

     

       3483
       3483
       -
           version = "2021-09-12";

     

       3495
       3495
       +
           version = "2021-09-14";

     

       3484
       3496
        
           src = fetchFromGitHub {

     

       3485
       3497
        
             owner = "sbdchd";

     

       3486
       3498
        
             repo = "neoformat";

     

       3487
       3487
       -
             rev = "88570b2f9c42fbf7ecbaeac3c52d941c461e65b0";

     

       3488
       3488
       -
             sha256 = "13blkgc1sfkpkrr15vgx8s2nz7np358qv9sr10znv8wjdn9wp2dd";

     

       3499
       3499
       +
             rev = "f072ef425be8a51d2130edeb7d773a1f8dc20313";

     

       3500
       3500
       +
             sha256 = "0av57z1smv6nj64d5hdqgvzcrd3h0bypi1hcl22k5zpwmaqf40m2";

     

       3489
       3501
        
           };

     

       3490
       3502
        
           meta.homepage = "https://github.com/sbdchd/neoformat/";

     

       3491
       3503
        
         };

     

       3492
       3504
        
       

     

       3493
       3505
        
         neogit = buildVimPluginFrom2Nix {

     

       3494
       3506
        
           pname = "neogit";

     

       3495
       3495
       -
           version = "2021-09-12";

     

       3507
       3507
       +
           version = "2021-09-16";

     

       3496
       3508
        
           src = fetchFromGitHub {

     

       3497
       3509
        
             owner = "TimUntersberger";

     

       3498
       3510
        
             repo = "neogit";

     

       3499
       3499
       -
             rev = "8d0adf5420314e98577c9a1974cf0f0f34ec16eb";

     

       3500
       3500
       -
             sha256 = "0fl7zk81z54166428ff42dbhzz347scqaajr5qzgin20sydj66qk";

     

       3511
       3511
       +
             rev = "28e652d110e7bda263bd4b0cb3c1484dce89cd93";

     

       3512
       3512
       +
             sha256 = "0106iy1zkd13i26dviv6w8jgm9hapimpj97passh2khac3ajln5c";

     

       3501
       3513
        
           };

     

       3502
       3514
        
           meta.homepage = "https://github.com/TimUntersberger/neogit/";

     

       3503
       3515
        
         };

     
···

       3516
       3528
        
       

     

       3517
       3529
        
         neomake = buildVimPluginFrom2Nix {

     

       3518
       3530
        
           pname = "neomake";

     

       3519
       3519
       -
           version = "2021-09-07";

     

       3531
       3531
       +
           version = "2021-09-17";

     

       3520
       3532
        
           src = fetchFromGitHub {

     

       3521
       3533
        
             owner = "neomake";

     

       3522
       3534
        
             repo = "neomake";

     

       3523
       3523
       -
             rev = "053d6bd3605a64f05de11a179cbab423fe759ebe";

     

       3524
       3524
       -
             sha256 = "0qk3bhpjqi06jj1haydalvvsj7f7jbxbb168jc6i949694v406zj";

     

       3535
       3535
       +
             rev = "8df876172fd9b8f6c023fcd5b84728a675cbdf91";

     

       3536
       3536
       +
             sha256 = "0dqr9b2h0f2rxiw4lvws2gamwxdmnqb2qsk2ish47v7lnc772l2l";

     

       3525
       3537
        
           };

     

       3526
       3538
        
           meta.homepage = "https://github.com/neomake/neomake/";

     

       3527
       3539
        
         };

     
···

       3588
       3600
        
       

     

       3589
       3601
        
         neosnippet-vim = buildVimPluginFrom2Nix {

     

       3590
       3602
        
           pname = "neosnippet.vim";

     

       3591
       3591
       -
           version = "2021-08-22";

     

       3603
       3603
       +
           version = "2021-09-15";

     

       3592
       3604
        
           src = fetchFromGitHub {

     

       3593
       3605
        
             owner = "Shougo";

     

       3594
       3606
        
             repo = "neosnippet.vim";

     

       3595
       3595
       -
             rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528";

     

       3596
       3596
       -
             sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2";

     

       3607
       3607
       +
             rev = "5d07842911b485240719b781dfd7817b85c8eb96";

     

       3608
       3608
       +
             sha256 = "0igrsgvaa36p42gp375w17dp9iz652lr91mmbznbbbb71d7y7l1y";

     

       3597
       3609
        
           };

     

       3598
       3610
        
           meta.homepage = "https://github.com/Shougo/neosnippet.vim/";

     

       3599
       3611
        
         };

     
···

       3624
       3636
        
       

     

       3625
       3637
        
         neovim-ayu = buildVimPluginFrom2Nix {

     

       3626
       3638
        
           pname = "neovim-ayu";

     

       3627
       3627
       -
           version = "2021-09-10";

     

       3639
       3639
       +
           version = "2021-09-13";

     

       3628
       3640
        
           src = fetchFromGitHub {

     

       3629
       3641
        
             owner = "Shatur";

     

       3630
       3642
        
             repo = "neovim-ayu";

     

       3631
       3631
       -
             rev = "441d9db65ef7fb3ced17d0d88b2114b925302ec2";

     

       3632
       3632
       -
             sha256 = "1wmvclkrkdmx5ng6hs4yyvlvhwbbv767shsn2yqg6p5hx67sa4d2";

     

       3643
       3643
       +
             rev = "9841e30f2cff5b1929620565c9289eb561bae75a";

     

       3644
       3644
       +
             sha256 = "0h25wgv5fvkycfsvw6jb82jl3fb94fvay1ii91yqiailpwa2ig76";

     

       3633
       3645
        
           };

     

       3634
       3646
        
           meta.homepage = "https://github.com/Shatur/neovim-ayu/";

     

       3635
       3647
        
         };

     
···

       3684
       3696
        
       

     

       3685
       3697
        
         nerdtree = buildVimPluginFrom2Nix {

     

       3686
       3698
        
           pname = "nerdtree";

     

       3687
       3687
       -
           version = "2021-09-11";

     

       3699
       3699
       +
           version = "2021-09-15";

     

       3688
       3700
        
           src = fetchFromGitHub {

     

       3689
       3701
        
             owner = "preservim";

     

       3690
       3702
        
             repo = "nerdtree";

     

       3691
       3691
       -
             rev = "aa7e97b7ff2ace7ed434b09bd33f3ad449d294e9";

     

       3692
       3692
       -
             sha256 = "0ylfls91m65hhargnv1gqlqak61qv63zldh6ri91h7nidrxi7m1m";

     

       3703
       3703
       +
             rev = "7eee457efae1bf9b96d7a266ac097639720a68fe";

     

       3704
       3704
       +
             sha256 = "0lm58labs6jr1yyax839ks67ij30ijlknf0lnwijv2alf5rzqsc2";

     

       3693
       3705
        
           };

     

       3694
       3706
        
           meta.homepage = "https://github.com/preservim/nerdtree/";

     

       3695
       3707
        
         };

     
···

       3756
       3768
        
       

     

       3757
       3769
        
         nnn-vim = buildVimPluginFrom2Nix {

     

       3758
       3770
        
           pname = "nnn.vim";

     

       3759
       3759
       -
           version = "2021-09-11";

     

       3771
       3771
       +
           version = "2021-09-14";

     

       3760
       3772
        
           src = fetchFromGitHub {

     

       3761
       3773
        
             owner = "mcchrish";

     

       3762
       3774
        
             repo = "nnn.vim";

     

       3763
       3763
       -
             rev = "07c3ccda0f4b579aa26f882bf771c6096e783e30";

     

       3764
       3764
       -
             sha256 = "19f4m4djfs5szwc5v9zwc0ki8w59glxcv5mxps88gyns1c07qbvn";

     

       3775
       3775
       +
             rev = "8833bbfa7b341896cbb9f3ed9a3b4687461e6aad";

     

       3776
       3776
       +
             sha256 = "0ilkspfnlqflp0854gmha4v6zlnmslb83laab25a972svpqrg8pf";

     

       3765
       3777
        
           };

     

       3766
       3778
        
           meta.homepage = "https://github.com/mcchrish/nnn.vim/";

     

       3767
       3779
        
         };

     
···

       3816
       3828
        
       

     

       3817
       3829
        
         null-ls-nvim = buildVimPluginFrom2Nix {

     

       3818
       3830
        
           pname = "null-ls.nvim";

     

       3819
       3819
       -
           version = "2021-09-10";

     

       3831
       3831
       +
           version = "2021-09-17";

     

       3820
       3832
        
           src = fetchFromGitHub {

     

       3821
       3833
        
             owner = "jose-elias-alvarez";

     

       3822
       3834
        
             repo = "null-ls.nvim";

     

       3823
       3823
       -
             rev = "da8bb757c630b96fd26030df56fd3a070fbf16a1";

     

       3824
       3824
       -
             sha256 = "1n6gqikw4fsypchvb5hna1l7b54638qrhny0w84xamadmv4nj4kr";

     

       3835
       3835
       +
             rev = "2c6a20434de6b1d09f76c20eea34e37e7432e06c";

     

       3836
       3836
       +
             sha256 = "1z58wqvw8xslz9yzbrnmsjn0mdn9kpvrrv7hmydfc2a8vir55mlk";

     

       3825
       3837
        
           };

     

       3826
       3838
        
           meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

     

       3827
       3839
        
         };

     
···

       3864
       3876
        
       

     

       3865
       3877
        
         nvim-autopairs = buildVimPluginFrom2Nix {

     

       3866
       3878
        
           pname = "nvim-autopairs";

     

       3867
       3867
       -
           version = "2021-09-11";

     

       3879
       3879
       +
           version = "2021-09-18";

     

       3868
       3880
        
           src = fetchFromGitHub {

     

       3869
       3881
        
             owner = "windwp";

     

       3870
       3882
        
             repo = "nvim-autopairs";

     

       3871
       3871
       -
             rev = "c80b4ac3faec6fa60637f1ac785b311c26b06b1f";

     

       3872
       3872
       -
             sha256 = "1w2m278g0hl3yc32x8rr4wxmhshsv53a6k59ihgjdk703n66cp7a";

     

       3883
       3883
       +
             rev = "e465f581f9dce556a37366587ab1fabd2bb75fbf";

     

       3884
       3884
       +
             sha256 = "0l4r3ba7rqiab47fqzbzbxvkxirpw7f9lsvif4agm1hdm5hqpgxi";

     

       3873
       3885
        
           };

     

       3874
       3886
        
           meta.homepage = "https://github.com/windwp/nvim-autopairs/";

     

       3875
       3887
        
         };

     
···

       3924
       3936
        
       

     

       3925
       3937
        
         nvim-cmp = buildVimPluginFrom2Nix {

     

       3926
       3938
        
           pname = "nvim-cmp";

     

       3927
       3927
       -
           version = "2021-09-13";

     

       3939
       3939
       +
           version = "2021-09-18";

     

       3928
       3940
        
           src = fetchFromGitHub {

     

       3929
       3941
        
             owner = "hrsh7th";

     

       3930
       3942
        
             repo = "nvim-cmp";

     

       3931
       3931
       -
             rev = "e46ae3b62e11704ace7f1f14c1398bcfaf70b217";

     

       3932
       3932
       -
             sha256 = "1nb0insrhsa0d2mwhk42b07wkfb28j7ylscj0hqr6n69jg5jc0vz";

     

       3943
       3943
       +
             rev = "7c8876330df6e11cf91ca42ab6e52f37d81cc003";

     

       3944
       3944
       +
             sha256 = "1z0kyffycwrl7izdmss9k9ldqqynhq1j2js4izbgpp1660iqsfja";

     

       3933
       3945
        
           };

     

       3934
       3946
        
           meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

     

       3935
       3947
        
         };

     
···

       3972
       3984
        
       

     

       3973
       3985
        
         nvim-dap = buildVimPluginFrom2Nix {

     

       3974
       3986
        
           pname = "nvim-dap";

     

       3975
       3975
       -
           version = "2021-09-10";

     

       3987
       3987
       +
           version = "2021-09-18";

     

       3976
       3988
        
           src = fetchFromGitHub {

     

       3977
       3989
        
             owner = "mfussenegger";

     

       3978
       3990
        
             repo = "nvim-dap";

     

       3979
       3979
       -
             rev = "55971c4f5cf83177a38bdec9de7bea6711c94880";

     

       3980
       3980
       -
             sha256 = "149zhqwfv8ciw1ik5c258gwx71y7i0517qzqzw9qq5p66bxsxsdx";

     

       3991
       3991
       +
             rev = "5ecabb093c360786321bce1b618c324bde3dae70";

     

       3992
       3992
       +
             sha256 = "1gxp0x6b4f08xbvl8w5s17v665b59r8nqky27vvz0pmwwnkjxwlp";

     

       3981
       3993
        
           };

     

       3982
       3994
        
           meta.homepage = "https://github.com/mfussenegger/nvim-dap/";

     

       3983
       3995
        
         };

     
···

       4044
       4056
        
       

     

       4045
       4057
        
         nvim-highlite = buildVimPluginFrom2Nix {

     

       4046
       4058
        
           pname = "nvim-highlite";

     

       4047
       4047
       -
           version = "2021-09-10";

     

       4059
       4059
       +
           version = "2021-09-18";

     

       4048
       4060
        
           src = fetchFromGitHub {

     

       4049
       4061
        
             owner = "Iron-E";

     

       4050
       4062
        
             repo = "nvim-highlite";

     

       4051
       4051
       -
             rev = "6b06fdec591ff93ce47b0489ad524929a323ff59";

     

       4052
       4052
       -
             sha256 = "10wfs6s76f2vx47q48ihx5y6fxgq0iq3ixifv2z0l1r6n9x5rkr6";

     

       4063
       4063
       +
             rev = "d380c831f7d0cb65d3ec3fc468392f79a79f678a";

     

       4064
       4064
       +
             sha256 = "10s6qzma4fk8yd9yvfq52lslr2kzj7skl91yz0b19vv7mg9pclb1";

     

       4053
       4065
        
           };

     

       4054
       4066
        
           meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

     

       4055
       4067
        
         };

     

       4056
       4068
        
       

     

       4057
       4069
        
         nvim-hlslens = buildVimPluginFrom2Nix {

     

       4058
       4070
        
           pname = "nvim-hlslens";

     

       4059
       4059
       -
           version = "2021-09-09";

     

       4071
       4071
       +
           version = "2021-09-16";

     

       4060
       4072
        
           src = fetchFromGitHub {

     

       4061
       4073
        
             owner = "kevinhwang91";

     

       4062
       4074
        
             repo = "nvim-hlslens";

     

       4063
       4063
       -
             rev = "df0eb031cdc0688381f6c059ecd3545ecfffe89b";

     

       4064
       4064
       -
             sha256 = "03mv11724jx5s811gisl6xc62qc31xknydsg67nz81mrya3559jb";

     

       4075
       4075
       +
             rev = "fc8a5a3dfafd703a454a5a294ef8cc69d17b4ee6";

     

       4076
       4076
       +
             sha256 = "1jn3ay74sf1z7mwm4sv4nz7lcq7qpyr2vx6h8j844nkb0azvhi5q";

     

       4065
       4077
        
           };

     

       4066
       4078
        
           meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";

     

       4067
       4079
        
         };

     
···

       4092
       4104
        
       

     

       4093
       4105
        
         nvim-lightbulb = buildVimPluginFrom2Nix {

     

       4094
       4106
        
           pname = "nvim-lightbulb";

     

       4095
       4095
       -
           version = "2021-09-09";

     

       4107
       4107
       +
           version = "2021-09-18";

     

       4096
       4108
        
           src = fetchFromGitHub {

     

       4097
       4109
        
             owner = "kosayoda";

     

       4098
       4110
        
             repo = "nvim-lightbulb";

     

       4099
       4099
       -
             rev = "7411586f6b431a9c49a50fa962b6d6eae25aeb20";

     

       4100
       4100
       -
             sha256 = "0maba6mzkpvnjdz8x0lifdqlbw55bd58ggavbhyxd8279887bph6";

     

       4111
       4111
       +
             rev = "7180e64d7f8dcde0fd162d6ca55b73e2d9d9621b";

     

       4112
       4112
       +
             sha256 = "1sv3xgjgbm3d9v1mwln9zfwllxjn37virzb9fmr6m1axc2vn5lj4";

     

       4101
       4113
        
           };

     

       4102
       4114
        
           meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

     

       4103
       4115
        
         };

     

       4104
       4116
        
       

     

       4105
       4117
        
         nvim-lspconfig = buildVimPluginFrom2Nix {

     

       4106
       4118
        
           pname = "nvim-lspconfig";

     

       4107
       4107
       -
           version = "2021-09-12";

     

       4119
       4119
       +
           version = "2021-09-16";

     

       4108
       4120
        
           src = fetchFromGitHub {

     

       4109
       4121
        
             owner = "neovim";

     

       4110
       4122
        
             repo = "nvim-lspconfig";

     

       4111
       4111
       -
             rev = "974d15fa2809dff691d6a50a6759bf2c8bf39b4a";

     

       4112
       4112
       -
             sha256 = "1nb5k8hsxm8anjmvavxniv4k0rgrgl068czczs9x8z6dsd2865il";

     

       4123
       4123
       +
             rev = "aa0b9fd746d73a5ebbc72c732c645e96423d4504";

     

       4124
       4124
       +
             sha256 = "01jgxf8bgra4sgh63zpb5xga9lyb3bvpqcdzjk3vp6gyks66fb6h";

     

       4113
       4125
        
           };

     

       4114
       4126
        
           meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

     

       4115
       4127
        
         };

     

       4116
       4128
        
       

     

       4117
       4129
        
         nvim-lsputils = buildVimPluginFrom2Nix {

     

       4118
       4130
        
           pname = "nvim-lsputils";

     

       4119
       4119
       -
           version = "2021-09-07";

     

       4131
       4131
       +
           version = "2021-09-17";

     

       4120
       4132
        
           src = fetchFromGitHub {

     

       4121
       4133
        
             owner = "RishabhRD";

     

       4122
       4134
        
             repo = "nvim-lsputils";

     

       4123
       4123
       -
             rev = "0800dfa7307a64a3e195e62b775f20bb14f557af";

     

       4124
       4124
       -
             sha256 = "0s9pp4azvvss8h38hx6r0b5a2nvsf72iqckmzhjnqnxs2w14b839";

     

       4135
       4135
       +
             rev = "e09390daebda810e24c7feb060fde2ea51f99a6c";

     

       4136
       4136
       +
             sha256 = "1638an4mx5z0w9w3sinr4s3h6y3wsmymqh59pb5s6rx9pimqw7b2";

     

       4125
       4137
        
           };

     

       4126
       4138
        
           meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";

     

       4127
       4139
        
         };

     

       4128
       4140
        
       

     

       4129
       4141
        
         nvim-nonicons = buildVimPluginFrom2Nix {

     

       4130
       4142
        
           pname = "nvim-nonicons";

     

       4131
       4131
       -
           version = "2021-07-03";

     

       4143
       4143
       +
           version = "2021-09-14";

     

       4132
       4144
        
           src = fetchFromGitHub {

     

       4133
       4145
        
             owner = "yamatsum";

     

       4134
       4146
        
             repo = "nvim-nonicons";

     

       4135
       4135
       -
             rev = "93450b02533516231e16ddc71f8ab1caf5005eaa";

     

       4136
       4136
       -
             sha256 = "1mfvi3mzid0fwhgwrg8w4bjy0x6hz78jij60h0ivblvlfai6w0qr";

     

       4147
       4147
       +
             rev = "c38ff086e0157b91d0951f83741170bdcf501a9d";

     

       4148
       4148
       +
             sha256 = "1vjh82kjs4ki61r0lnidd8xpj6zvc0j4k76fbs7fy0ndzsbph6gw";

     

       4137
       4149
        
           };

     

       4138
       4150
        
           meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";

     

       4139
       4151
        
         };

     
···

       4224
       4236
        
       

     

       4225
       4237
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       4226
       4238
        
           pname = "nvim-treesitter";

     

       4227
       4227
       -
           version = "2021-07-18";

     

       4239
       4239
       +
           version = "2021-09-17";

     

       4228
       4240
        
           src = fetchFromGitHub {

     

       4229
       4241
        
             owner = "nvim-treesitter";

     

       4230
       4242
        
             repo = "nvim-treesitter";

     

       4231
       4231
       -
             rev = "27f5e99cdd1b4e7f6a5cc30016d990ebf81a561c";

     

       4232
       4232
       -
             sha256 = "1msnzijwz4bj7hv8zkzp0x3y3dwwm3v5n63pmdx865d8ggb8dln6";

     

       4243
       4243
       +
             rev = "47cfda2c6711077625c90902d7722238a8294982";

     

       4244
       4244
       +
             sha256 = "14di7qm37m176r0qsbb0vmc3csya72rd5bszm6yk7lby8izfnqxa";

     

       4233
       4245
        
           };

     

       4234
       4246
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       4235
       4247
        
         };

     
···

       4404
       4416
        
       

     

       4405
       4417
        
         onedark-nvim = buildVimPluginFrom2Nix {

     

       4406
       4418
        
           pname = "onedark.nvim";

     

       4407
       4407
       -
           version = "2021-08-30";

     

       4419
       4419
       +
           version = "2021-09-16";

     

       4408
       4420
        
           src = fetchFromGitHub {

     

       4409
       4421
        
             owner = "olimorris";

     

       4410
       4422
        
             repo = "onedark.nvim";

     

       4411
       4411
       -
             rev = "7dc9734260e8af794ab69d6976a693e8c631d617";

     

       4412
       4412
       -
             sha256 = "1hw9m6fasbpy67a4h2a0zw7231gpc4995aj6p4ljk4kw6672mnlw";

     

       4423
       4423
       +
             rev = "8eceb078f8093c10b4a68d68203f4edf99db112a";

     

       4424
       4424
       +
             sha256 = "1wnhgbi8hgrsnsq78iz7z1v7acfjrbhs08dykf0g4km03s4wa7qb";

     

       4413
       4425
        
           };

     

       4414
       4426
        
           meta.homepage = "https://github.com/olimorris/onedark.nvim/";

     

       4415
       4427
        
         };

     
···

       4464
       4476
        
       

     

       4465
       4477
        
         orgmode-nvim = buildVimPluginFrom2Nix {

     

       4466
       4478
        
           pname = "orgmode.nvim";

     

       4467
       4467
       -
           version = "2021-09-10";

     

       4479
       4479
       +
           version = "2021-09-17";

     

       4468
       4480
        
           src = fetchFromGitHub {

     

       4469
       4481
        
             owner = "kristijanhusak";

     

       4470
       4482
        
             repo = "orgmode.nvim";

     

       4471
       4471
       -
             rev = "e7fff702db42ed1d90bc9fa46c3b3a102024041f";

     

       4472
       4472
       -
             sha256 = "0fxz0j7mjbs64x18kx3jsj3h8l124ndxf576k8vh9cwgz1g66bcj";

     

       4483
       4483
       +
             rev = "09ecdefb8f7a6d13a2dde1efe271e406ffa407c6";

     

       4484
       4484
       +
             sha256 = "1s1mg8hvlz4n3fjfdhakihwpqcnrs1p5hdnwin6fx3wifbb55gp3";

     

       4473
       4485
        
           };

     

       4474
       4486
        
           meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/";

     

       4475
       4487
        
         };

     

       4476
       4488
        
       

     

       4477
       4489
        
         packer-nvim = buildVimPluginFrom2Nix {

     

       4478
       4490
        
           pname = "packer.nvim";

     

       4479
       4479
       -
           version = "2021-09-10";

     

       4491
       4491
       +
           version = "2021-09-17";

     

       4480
       4492
        
           src = fetchFromGitHub {

     

       4481
       4493
        
             owner = "wbthomason";

     

       4482
       4494
        
             repo = "packer.nvim";

     

       4483
       4483
       -
             rev = "0dc37ac2e93895d0adc872b7ce69ad864a1fa45a";

     

       4484
       4484
       -
             sha256 = "0a4mnfhrv4g5zqvjj3mv3bv5l7py9s4iqwy0f9xnh0f92c631q0b";

     

       4495
       4495
       +
             rev = "b6b568cb790b10bd2a83c2af27af8393ddc4832d";

     

       4496
       4496
       +
             sha256 = "07pyvf4gqwr2qjdq5yjf5zgxx9g173jv6nlx2qwa01pp0jxca0x1";

     

       4485
       4497
        
           };

     

       4486
       4498
        
           meta.homepage = "https://github.com/wbthomason/packer.nvim/";

     

       4487
       4499
        
         };

     
···

       4500
       4512
        
       

     

       4501
       4513
        
         papercolor-theme = buildVimPluginFrom2Nix {

     

       4502
       4514
        
           pname = "papercolor-theme";

     

       4503
       4503
       -
           version = "2020-12-04";

     

       4515
       4515
       +
           version = "2021-09-17";

     

       4504
       4516
        
           src = fetchFromGitHub {

     

       4505
       4517
        
             owner = "NLKNguyen";

     

       4506
       4518
        
             repo = "papercolor-theme";

     

       4507
       4507
       -
             rev = "845cfa94d95d404ff59e0bdc578b299279e1dc07";

     

       4508
       4508
       -
             sha256 = "1r6p9ll3bfblz9sfzg0391zjswvmi8wwcc010w8mjsayjclmpwf8";

     

       4519
       4519
       +
             rev = "643afbb7158b77cbd491fd9874a8758d0484255a";

     

       4520
       4520
       +
             sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h";

     

       4509
       4521
        
           };

     

       4510
       4522
        
           meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

     

       4511
       4523
        
         };

     
···

       4572
       4584
        
       

     

       4573
       4585
        
         playground = buildVimPluginFrom2Nix {

     

       4574
       4586
        
           pname = "playground";

     

       4575
       4575
       -
           version = "2021-07-27";

     

       4587
       4587
       +
           version = "2021-09-15";

     

       4576
       4588
        
           src = fetchFromGitHub {

     

       4577
       4589
        
             owner = "nvim-treesitter";

     

       4578
       4590
        
             repo = "playground";

     

       4579
       4579
       -
             rev = "deb887b3f49d66654d9faa9778e8949fe0d80bc3";

     

       4580
       4580
       -
             sha256 = "10jlgsqkplisa1fd7i36yb46fdsa0cx069bpwp2yl4ki2jys953j";

     

       4591
       4591
       +
             rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643";

     

       4592
       4592
       +
             sha256 = "1y4dwbs40qn942x0hd93yrk04yiphy73b45vcjrknmxq9szhvhk0";

     

       4581
       4593
        
           };

     

       4582
       4594
        
           meta.homepage = "https://github.com/nvim-treesitter/playground/";

     

       4583
       4595
        
         };

     

       4584
       4596
        
       

     

       4585
       4597
        
         plenary-nvim = buildVimPluginFrom2Nix {

     

       4586
       4598
        
           pname = "plenary.nvim";

     

       4587
       4587
       -
           version = "2021-09-12";

     

       4599
       4599
       +
           version = "2021-09-16";

     

       4588
       4600
        
           src = fetchFromGitHub {

     

       4589
       4601
        
             owner = "nvim-lua";

     

       4590
       4602
        
             repo = "plenary.nvim";

     

       4591
       4591
       -
             rev = "6c80b83cd57ff3b029fae37b6145bcaeb4f69ee3";

     

       4592
       4592
       -
             sha256 = "1jzyxnjs2zg02ib7h2vshhiq873n04bsg4g829v7d46bsw1337kw";

     

       4603
       4603
       +
             rev = "ce8f7fa999b5c091d3e7badcc2340df62b94abf9";

     

       4604
       4604
       +
             sha256 = "0v7yidq75yhcghg7bz86r3r59aj6ls7n9w5dhj1s4zskbmqvr94h";

     

       4593
       4605
        
           };

     

       4594
       4606
        
           meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";

     

       4595
       4607
        
         };

     
···

       4837
       4849
        
       

     

       4838
       4850
        
         Recover-vim = buildVimPluginFrom2Nix {

     

       4839
       4851
        
           pname = "Recover.vim";

     

       4840
       4840
       -
           version = "2021-07-22";

     

       4852
       4852
       +
           version = "2021-09-16";

     

       4841
       4853
        
           src = fetchFromGitHub {

     

       4842
       4854
        
             owner = "chrisbra";

     

       4843
       4855
        
             repo = "Recover.vim";

     

       4844
       4844
       -
             rev = "48b6bc12b560d3013cd30c7959e235993374c24b";

     

       4845
       4845
       -
             sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94";

     

       4856
       4856
       +
             rev = "222c311cd9495ee2fce8945eb5b846832f14ccac";

     

       4857
       4857
       +
             sha256 = "0xmzm88fyf7z4crc6gadnxyaagzskgpvfd54ddcchfw90jl47n6a";

     

       4846
       4858
        
           };

     

       4847
       4859
        
           meta.homepage = "https://github.com/chrisbra/Recover.vim/";

     

       4848
       4860
        
         };

     

       4849
       4861
        
       

     

       4850
       4862
        
         refactoring-nvim = buildVimPluginFrom2Nix {

     

       4851
       4863
        
           pname = "refactoring.nvim";

     

       4852
       4852
       -
           version = "2021-09-10";

     

       4864
       4864
       +
           version = "2021-09-16";

     

       4853
       4865
        
           src = fetchFromGitHub {

     

       4854
       4866
        
             owner = "theprimeagen";

     

       4855
       4867
        
             repo = "refactoring.nvim";

     

       4856
       4856
       -
             rev = "dcb0c790f20c4970a9d0e9b1f1c0c5f71b613547";

     

       4857
       4857
       -
             sha256 = "1adjalqqa27f27nlwkj8pybk6sp8l9fic9fikvlqgnfg7v1r8gkw";

     

       4868
       4868
       +
             rev = "fbea6d958aa337194d4c4fbcac9a983d7b99815e";

     

       4869
       4869
       +
             sha256 = "0wpdy8ng64c0nn6fakg4yc4z8wrkligwfg70sdlyfcg2qi1skj87";

     

       4858
       4870
        
           };

     

       4859
       4871
        
           meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

     

       4860
       4872
        
         };

     
···

       4957
       4969
        
       

     

       4958
       4970
        
         rust-tools-nvim = buildVimPluginFrom2Nix {

     

       4959
       4971
        
           pname = "rust-tools.nvim";

     

       4960
       4960
       -
           version = "2021-09-07";

     

       4972
       4972
       +
           version = "2021-09-18";

     

       4961
       4973
        
           src = fetchFromGitHub {

     

       4962
       4974
        
             owner = "simrat39";

     

       4963
       4975
        
             repo = "rust-tools.nvim";

     

       4964
       4964
       -
             rev = "cd5105d76fc124634b53039c02ea253cc06bc9b9";

     

       4965
       4965
       -
             sha256 = "1bhjzng02yfnlfr3kvh6lkl5vbpcmcd51kpgg7yjxmlzlga5k2k3";

     

       4976
       4976
       +
             rev = "83bf0cabe040a6e02b59296622c838831a2b5c4f";

     

       4977
       4977
       +
             sha256 = "0d2gl768rgd5l1wh9sq2z24rdmg5g27ib6fjfdcvxdlc2s5g333l";

     

       4966
       4978
        
           };

     

       4967
       4979
        
           meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

     

       4968
       4980
        
         };

     
···

       5113
       5125
        
       

     

       5114
       5126
        
         sideways-vim = buildVimPluginFrom2Nix {

     

       5115
       5127
        
           pname = "sideways.vim";

     

       5116
       5116
       -
           version = "2021-07-15";

     

       5128
       5128
       +
           version = "2021-09-18";

     

       5117
       5129
        
           src = fetchFromGitHub {

     

       5118
       5130
        
             owner = "AndrewRadev";

     

       5119
       5131
        
             repo = "sideways.vim";

     

       5120
       5120
       -
             rev = "960afef88aef374d3525e1536bdd505727b42d67";

     

       5121
       5121
       -
             sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61";

     

       5132
       5132
       +
             rev = "56296bd82973139e6fc394689854b959e35c7cdd";

     

       5133
       5133
       +
             sha256 = "1x93bnrywypqlywj5f70y5aaici5yqlpky456w15psfs84piyil7";

     

       5122
       5134
        
             fetchSubmodules = true;

     

       5123
       5135
        
           };

     

       5124
       5136
        
           meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";

     
···

       5198
       5210
        
       

     

       5199
       5211
        
         sonokai = buildVimPluginFrom2Nix {

     

       5200
       5212
        
           pname = "sonokai";

     

       5201
       5201
       -
           version = "2021-09-03";

     

       5213
       5213
       +
           version = "2021-09-18";

     

       5202
       5214
        
           src = fetchFromGitHub {

     

       5203
       5215
        
             owner = "sainnhe";

     

       5204
       5216
        
             repo = "sonokai";

     

       5205
       5205
       -
             rev = "61b796d94e7b0110f1bdf321cc1d19a841697a42";

     

       5206
       5206
       -
             sha256 = "1jan5ahp3rpr71qvjnd4jf4kxl7ijknaw3d3h0svlzhqd0pbq92p";

     

       5217
       5217
       +
             rev = "7722b4b25bd6319ed059ecebeb7857471b8357c9";

     

       5218
       5218
       +
             sha256 = "129lcawsg31xbbw0h63f92g0dy5idgdb4v8sd1rl5sp9qqvzfp5a";

     

       5207
       5219
        
           };

     

       5208
       5220
        
           meta.homepage = "https://github.com/sainnhe/sonokai/";

     

       5209
       5221
        
         };

     
···

       5319
       5331
        
       

     

       5320
       5332
        
         sqlite-lua = buildVimPluginFrom2Nix {

     

       5321
       5333
        
           pname = "sqlite.lua";

     

       5322
       5322
       -
           version = "2021-09-09";

     

       5334
       5334
       +
           version = "2021-09-18";

     

       5323
       5335
        
           src = fetchFromGitHub {

     

       5324
       5336
        
             owner = "tami5";

     

       5325
       5337
        
             repo = "sqlite.lua";

     

       5326
       5326
       -
             rev = "92ebda8bfd719668279ea82f84e5c2e13db5b658";

     

       5327
       5327
       -
             sha256 = "0yxcak88lvmsxji6wai23wycwj0mmc95jwhh29i916jsk0xc20n5";

     

       5338
       5338
       +
             rev = "edf642e2f2088a7a4bafa5a3850fd2b338566c2c";

     

       5339
       5339
       +
             sha256 = "06l604b2jfj1735dpgprkd00f02mfwbl43bjj08nsnpbjsd541mn";

     

       5328
       5340
        
           };

     

       5329
       5341
        
           meta.homepage = "https://github.com/tami5/sqlite.lua/";

     

       5330
       5342
        
         };

     
···

       5439
       5451
        
       

     

       5440
       5452
        
         symbols-outline-nvim = buildVimPluginFrom2Nix {

     

       5441
       5453
        
           pname = "symbols-outline.nvim";

     

       5442
       5442
       -
           version = "2021-09-07";

     

       5454
       5454
       +
           version = "2021-09-15";

     

       5443
       5455
        
           src = fetchFromGitHub {

     

       5444
       5456
        
             owner = "simrat39";

     

       5445
       5457
        
             repo = "symbols-outline.nvim";

     

       5446
       5446
       -
             rev = "02ce2dab138a12a36c422ac58fabe9f5a35c664c";

     

       5447
       5447
       -
             sha256 = "0z5a5q49csfgz0zdad11q75r8ck150ypj866199cl4j1mzb0xdgv";

     

       5458
       5458
       +
             rev = "a8cab53271c97ff6d2a0c18756d7b4e71012d41c";

     

       5459
       5459
       +
             sha256 = "1nkc0qj4birsydd278hkkjyvkyi69gva367h8fpnk0ss2i621rcc";

     

       5448
       5460
        
           };

     

       5449
       5461
        
           meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";

     

       5450
       5462
        
         };

     
···

       5475
       5487
        
       

     

       5476
       5488
        
         tabnine-vim = buildVimPluginFrom2Nix {

     

       5477
       5489
        
           pname = "tabnine-vim";

     

       5478
       5478
       -
           version = "2021-09-12";

     

       5490
       5490
       +
           version = "2021-09-14";

     

       5479
       5491
        
           src = fetchFromGitHub {

     

       5480
       5492
        
             owner = "codota";

     

       5481
       5493
        
             repo = "tabnine-vim";

     

       5482
       5482
       -
             rev = "25b1afe68ab77097fc029389f0b46a1f2a606c57";

     

       5483
       5483
       -
             sha256 = "1n3714zywqkw3a3wdyp3vnlgly2i51b8f4csyk7nd8giwg3c1428";

     

       5494
       5494
       +
             rev = "b7fdf200d309f024bb035a65611422d22abe8710";

     

       5495
       5495
       +
             sha256 = "1bvky5gsxhh9ldxk1l9fsaqmqvi7m248dgpwc4f6hh1xdyi9gvcf";

     

       5484
       5496
        
             fetchSubmodules = true;

     

       5485
       5497
        
           };

     

       5486
       5498
        
           meta.homepage = "https://github.com/codota/tabnine-vim/";

     
···

       5572
       5584
        
       

     

       5573
       5585
        
         taskwiki = buildVimPluginFrom2Nix {

     

       5574
       5586
        
           pname = "taskwiki";

     

       5575
       5575
       -
           version = "2021-08-13";

     

       5587
       5587
       +
           version = "2021-09-18";

     

       5576
       5588
        
           src = fetchFromGitHub {

     

       5577
       5589
        
             owner = "tools-life";

     

       5578
       5590
        
             repo = "taskwiki";

     

       5579
       5579
       -
             rev = "832293f9f797ce56a35be1a9c28ed8ddc3113364";

     

       5580
       5580
       -
             sha256 = "0568xnfhf7kd31nf0l10rxd5gnp90wph3623wrxrg3al5ix7jy6n";

     

       5591
       5591
       +
             rev = "146d0891a62e6f9202d3d4795668626cb0f79494";

     

       5592
       5592
       +
             sha256 = "1js1sq8arr9c8bzcyga64vblpq5qfy8dx16xvkyahakz2fk7rz40";

     

       5581
       5593
        
           };

     

       5582
       5594
        
           meta.homepage = "https://github.com/tools-life/taskwiki/";

     

       5583
       5595
        
         };

     
···

       5596
       5608
        
       

     

       5597
       5609
        
         telescope-coc-nvim = buildVimPluginFrom2Nix {

     

       5598
       5610
        
           pname = "telescope-coc.nvim";

     

       5599
       5599
       -
           version = "2021-08-26";

     

       5611
       5611
       +
           version = "2021-09-14";

     

       5600
       5612
        
           src = fetchFromGitHub {

     

       5601
       5613
        
             owner = "fannheyward";

     

       5602
       5614
        
             repo = "telescope-coc.nvim";

     

       5603
       5603
       -
             rev = "1037a9186b5889dc3145ce9494956006c8b20f17";

     

       5604
       5604
       -
             sha256 = "0i2g168q57pfbm63idl054sdbflkgd8a754pvk0q9w7w1mzpql2q";

     

       5615
       5615
       +
             rev = "7b8aa399b31998b7adf3da505a1952b1310d429c";

     

       5616
       5616
       +
             sha256 = "1x1m13yk222lay6j4w76y9ydbvn52022gif34d452n2x7jk0cvbf";

     

       5605
       5617
        
           };

     

       5606
       5618
        
           meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";

     

       5607
       5619
        
         };

     
···

       5632
       5644
        
       

     

       5633
       5645
        
         telescope-fzf-native-nvim = buildVimPluginFrom2Nix {

     

       5634
       5646
        
           pname = "telescope-fzf-native.nvim";

     

       5635
       5635
       -
           version = "2021-09-12";

     

       5647
       5647
       +
           version = "2021-09-15";

     

       5636
       5648
        
           src = fetchFromGitHub {

     

       5637
       5649
        
             owner = "nvim-telescope";

     

       5638
       5650
        
             repo = "telescope-fzf-native.nvim";

     

       5639
       5639
       -
             rev = "c507c54786e8ce389a6a6aca1f406522fa3d88d3";

     

       5640
       5640
       -
             sha256 = "1v4gr1bgb1li8xdz78sjn4gms72pa615h5cy2af0zx0akhbk28ql";

     

       5651
       5651
       +
             rev = "59e38e1661ffdd586cb7fc22ca0b5a05c7caf988";

     

       5652
       5652
       +
             sha256 = "0ipdrzivz04921i1l81bc1xck5smi0c61isfj5g8zyl0mwa0dvrm";

     

       5641
       5653
        
           };

     

       5642
       5654
        
           meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";

     

       5643
       5655
        
         };

     
···

       5705
       5717
        
       

     

       5706
       5718
        
         telescope-nvim = buildVimPluginFrom2Nix {

     

       5707
       5719
        
           pname = "telescope.nvim";

     

       5708
       5708
       -
           version = "2021-09-12";

     

       5720
       5720
       +
           version = "2021-09-17";

     

       5709
       5721
        
           src = fetchFromGitHub {

     

       5710
       5722
        
             owner = "nvim-telescope";

     

       5711
       5723
        
             repo = "telescope.nvim";

     

       5712
       5712
       -
             rev = "1d17cc4abc493d20b4aba36569e8805c2382ea7b";

     

       5713
       5713
       -
             sha256 = "1ycq09ip2dhlzf2bmjayb3zj9zhl1scznls2krzvmzfq46g93ira";

     

       5724
       5724
       +
             rev = "2e7584f1cfdffb32bf26039a050cd2cf74ede4cd";

     

       5725
       5725
       +
             sha256 = "16gdsx9yv5kwg8girmf51l6wb4v2kzg5snc1d2lhilizhs35qzmw";

     

       5714
       5726
        
           };

     

       5715
       5727
        
           meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

     

       5716
       5728
        
         };

     
···

       5850
       5862
        
       

     

       5851
       5863
        
         toggleterm-nvim = buildVimPluginFrom2Nix {

     

       5852
       5864
        
           pname = "toggleterm.nvim";

     

       5853
       5853
       -
           version = "2021-08-24";

     

       5865
       5865
       +
           version = "2021-09-18";

     

       5854
       5866
        
           src = fetchFromGitHub {

     

       5855
       5867
        
             owner = "akinsho";

     

       5856
       5868
        
             repo = "toggleterm.nvim";

     

       5857
       5857
       -
             rev = "ef7a882a818d1bf2598bc58ca0bc158d097d499d";

     

       5858
       5858
       -
             sha256 = "0sdp260jnal7qmdqskxwk5cg1c846fz65xr66b18s0y0lm5z53c2";

     

       5869
       5869
       +
             rev = "f725433e59422d0514ffa2582c534da965b0e44f";

     

       5870
       5870
       +
             sha256 = "0pd7cjzyiygybalqh7a0x84jdir8lrd2q5x7q9yjjnwy936k89c1";

     

       5859
       5871
        
           };

     

       5860
       5872
        
           meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";

     

       5861
       5873
        
         };

     
···

       6426
       6438
        
       

     

       6427
       6439
        
         vim-autoformat = buildVimPluginFrom2Nix {

     

       6428
       6440
        
           pname = "vim-autoformat";

     

       6429
       6429
       -
           version = "2021-07-22";

     

       6441
       6441
       +
           version = "2021-09-13";

     

       6430
       6442
        
           src = fetchFromGitHub {

     

       6431
       6443
        
             owner = "vim-autoformat";

     

       6432
       6444
        
             repo = "vim-autoformat";

     

       6433
       6433
       -
             rev = "80ba8b13a9699db20754623a0933095be65fc203";

     

       6434
       6434
       -
             sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp";

     

       6445
       6445
       +
             rev = "a65a58db77ad1b5889a68bedbea890c8161b7f8c";

     

       6446
       6446
       +
             sha256 = "1frvyb3xpd4njh7ixg1ywj8x11ga343kqrmrgncb45scv12i7hx4";

     

       6435
       6447
        
           };

     

       6436
       6448
        
           meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";

     

       6437
       6449
        
         };

     
···

       6498
       6510
        
       

     

       6499
       6511
        
         vim-better-whitespace = buildVimPluginFrom2Nix {

     

       6500
       6512
        
           pname = "vim-better-whitespace";

     

       6501
       6501
       -
           version = "2021-09-12";

     

       6513
       6513
       +
           version = "2021-09-18";

     

       6502
       6514
        
           src = fetchFromGitHub {

     

       6503
       6515
        
             owner = "ntpeters";

     

       6504
       6516
        
             repo = "vim-better-whitespace";

     

       6505
       6505
       -
             rev = "c63394d4da842b6fd547d072a4f22dbd3a0e3168";

     

       6506
       6506
       -
             sha256 = "1kpq5bjp8wr8r1kfkq4dx3ypgv9jn3y91bfi2sszbn4i882j4ka7";

     

       6517
       6517
       +
             rev = "c5afbe91d29c5e3be81d5125ddcdc276fd1f1322";

     

       6518
       6518
       +
             sha256 = "10xzxavz010a8ildkfmikyi0ly6rqi5d6a2ndzr0frd9ingbk79r";

     

       6507
       6519
        
           };

     

       6508
       6520
        
           meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/";

     

       6509
       6521
        
         };

     
···

       6630
       6642
        
       

     

       6631
       6643
        
         vim-clap = buildVimPluginFrom2Nix {

     

       6632
       6644
        
           pname = "vim-clap";

     

       6633
       6633
       -
           version = "2021-09-11";

     

       6645
       6645
       +
           version = "2021-09-15";

     

       6634
       6646
        
           src = fetchFromGitHub {

     

       6635
       6647
        
             owner = "liuchengxu";

     

       6636
       6648
        
             repo = "vim-clap";

     

       6637
       6637
       -
             rev = "33f194a70ec85dd493449f730030167c213b41e0";

     

       6638
       6638
       -
             sha256 = "0bqvis6nkgfld8vs20k95vlpg28rigv9pjbqp58lqrjhk5h5lab0";

     

       6649
       6649
       +
             rev = "c88f7fdd1c9a394a203785ed791261e7f9e159c7";

     

       6650
       6650
       +
             sha256 = "1y7mzlns37a62zys87zd0zbzkwhb7216arjym9bf1n5gfllfbgcl";

     

       6639
       6651
        
           };

     

       6640
       6652
        
           meta.homepage = "https://github.com/liuchengxu/vim-clap/";

     

       6641
       6653
        
         };

     
···

       6774
       6786
        
       

     

       6775
       6787
        
         vim-commentary = buildVimPluginFrom2Nix {

     

       6776
       6788
        
           pname = "vim-commentary";

     

       6777
       6777
       -
           version = "2021-03-23";

     

       6789
       6789
       +
           version = "2021-09-14";

     

       6778
       6790
        
           src = fetchFromGitHub {

     

       6779
       6791
        
             owner = "tpope";

     

       6780
       6792
        
             repo = "vim-commentary";

     

       6781
       6781
       -
             rev = "349340debb34f6302931f0eb7139b2c11dfdf427";

     

       6782
       6782
       -
             sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd";

     

       6793
       6793
       +
             rev = "627308e30639be3e2d5402808ce18690557e8292";

     

       6794
       6794
       +
             sha256 = "0d056h2vh3bzc3mcijq90y5c7rvg01zzxyfc826h4f79y1fz8jnp";

     

       6783
       6795
        
           };

     

       6784
       6796
        
           meta.homepage = "https://github.com/tpope/vim-commentary/";

     

       6785
       6797
        
         };

     
···

       7422
       7434
        
       

     

       7423
       7435
        
         vim-fugitive = buildVimPluginFrom2Nix {

     

       7424
       7436
        
           pname = "vim-fugitive";

     

       7425
       7425
       -
           version = "2021-09-10";

     

       7437
       7437
       +
           version = "2021-09-17";

     

       7426
       7438
        
           src = fetchFromGitHub {

     

       7427
       7439
        
             owner = "tpope";

     

       7428
       7440
        
             repo = "vim-fugitive";

     

       7429
       7429
       -
             rev = "e2927fb4676b499931a3c27a2dc8a8a8bc52ab55";

     

       7430
       7430
       -
             sha256 = "0bqnq5ayws8dlg4zmp4ra0y9343dncg2v588311kxb3vc5m42vp2";

     

       7441
       7441
       +
             rev = "a67e1f8189938c44f295fc97e6c9dd13b727b1e3";

     

       7442
       7442
       +
             sha256 = "1r9z936myiasyvx8v838kfjgk1ymwdznsm7w629wchjm2zlxy4by";

     

       7431
       7443
        
           };

     

       7432
       7444
        
           meta.homepage = "https://github.com/tpope/vim-fugitive/";

     

       7433
       7445
        
         };

     
···

       7578
       7590
        
       

     

       7579
       7591
        
         vim-graphql = buildVimPluginFrom2Nix {

     

       7580
       7592
        
           pname = "vim-graphql";

     

       7581
       7581
       -
           version = "2021-03-19";

     

       7593
       7593
       +
           version = "2021-09-18";

     

       7582
       7594
        
           src = fetchFromGitHub {

     

       7583
       7595
        
             owner = "jparise";

     

       7584
       7596
        
             repo = "vim-graphql";

     

       7585
       7585
       -
             rev = "de5753e3fbd89f2939a43cfc2c6a2313ff129a21";

     

       7586
       7586
       -
             sha256 = "15qy6adhgfwjh6jrw9902hl67qzhdi72kqgzdk5shgfyndzar25g";

     

       7597
       7597
       +
             rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5";

     

       7598
       7598
       +
             sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq";

     

       7587
       7599
        
           };

     

       7588
       7600
        
           meta.homepage = "https://github.com/jparise/vim-graphql/";

     

       7589
       7601
        
         };

     
···

       9501
       9513
        
       

     

       9502
       9514
        
         vim-snippets = buildVimPluginFrom2Nix {

     

       9503
       9515
        
           pname = "vim-snippets";

     

       9504
       9504
       -
           version = "2021-09-11";

     

       9516
       9516
       +
           version = "2021-09-17";

     

       9505
       9517
        
           src = fetchFromGitHub {

     

       9506
       9518
        
             owner = "honza";

     

       9507
       9519
        
             repo = "vim-snippets";

     

       9508
       9508
       -
             rev = "89ff074400256ce7a58bb88ff0c5cc27e6fbe222";

     

       9509
       9509
       -
             sha256 = "0gzxvlq3mbzx4iiiikibzxpfllzkkzlx0p2fgj7j244z2mjv7h8y";

     

       9520
       9520
       +
             rev = "1648b3acf193682668f1ee8e566b03cfed2ac797";

     

       9521
       9521
       +
             sha256 = "17db1v36mbhys1zhq9rv7g3gi3gdrl2b9x0gx4g5ffqh7nssw6wf";

     

       9510
       9522
        
           };

     

       9511
       9523
        
           meta.homepage = "https://github.com/honza/vim-snippets/";

     

       9512
       9524
        
         };

     
···

       9742
       9754
        
       

     

       9743
       9755
        
         vim-test = buildVimPluginFrom2Nix {

     

       9744
       9756
        
           pname = "vim-test";

     

       9745
       9745
       -
           version = "2021-08-13";

     

       9757
       9757
       +
           version = "2021-09-15";

     

       9746
       9758
        
           src = fetchFromGitHub {

     

       9747
       9759
        
             owner = "vim-test";

     

       9748
       9760
        
             repo = "vim-test";

     

       9749
       9749
       -
             rev = "b980e646e5f91d6e65659737b584e484ef918984";

     

       9750
       9750
       -
             sha256 = "073lpxmrs41zm0mqxf6pmf88xvkq1fngryl8rp1lcgkrwbl7isg4";

     

       9761
       9761
       +
             rev = "bf200532aa8e2097af0f26e73b4f00c0cadb3118";

     

       9762
       9762
       +
             sha256 = "1s6qqpj1iyrm2cxig3vhxmpb4mcg0d82j1ai7iz4r2rq008m2aqv";

     

       9751
       9763
        
           };

     

       9752
       9764
        
           meta.homepage = "https://github.com/vim-test/vim-test/";

     

       9753
       9765
        
         };

     
···

       9958
       9970
        
       

     

       9959
       9971
        
         vim-twiggy = buildVimPluginFrom2Nix {

     

       9960
       9972
        
           pname = "vim-twiggy";

     

       9961
       9961
       -
           version = "2021-08-25";

     

       9973
       9973
       +
           version = "2021-09-16";

     

       9962
       9974
        
           src = fetchFromGitHub {

     

       9963
       9975
        
             owner = "sodapopcan";

     

       9964
       9976
        
             repo = "vim-twiggy";

     

       9965
       9965
       -
             rev = "3561237047481c212b55942d9507c937841d3bc8";

     

       9966
       9966
       -
             sha256 = "1099bnpagw6sv5j2rigsp2b9qc58dcyi4520hb0xz48zdvynkaac";

     

       9977
       9977
       +
             rev = "16287d2261be67872870899744fd04a6802a9b87";

     

       9978
       9978
       +
             sha256 = "0cfqvq2was7jdhcixnlrzh9qdm2n2sv17l7a2sys8slzl04v2c61";

     

       9967
       9979
        
           };

     

       9968
       9980
        
           meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";

     

       9969
       9981
        
         };

     
···

       9994
       10006
        
       

     

       9995
       10007
        
         vim-unimpaired = buildVimPluginFrom2Nix {

     

       9996
       10008
        
           pname = "vim-unimpaired";

     

       9997
       9997
       -
           version = "2021-09-11";

     

       10009
       10009
       +
           version = "2021-09-17";

     

       9998
       10010
        
           src = fetchFromGitHub {

     

       9999
       10011
        
             owner = "tpope";

     

       10000
       10012
        
             repo = "vim-unimpaired";

     

       10001
       10001
       -
             rev = "58e4434f5ecadd4f28a521bcabc690e39186a98f";

     

       10002
       10002
       -
             sha256 = "10ylvziwr61djc2jp20a8k2pl8qqn9rff5n4ncc8jcib58lq9r62";

     

       10013
       10013
       +
             rev = "c51ed445182334aabd392f295708ebe8677bd8e8";

     

       10014
       10014
       +
             sha256 = "0j5q11czlkhm4x78z6idbj6am29nfcg3yzli2l5607s60lvxnc0j";

     

       10003
       10015
        
           };

     

       10004
       10016
        
           meta.homepage = "https://github.com/tpope/vim-unimpaired/";

     

       10005
       10017
        
         };

     
···

       10066
       10078
        
       

     

       10067
       10079
        
         vim-vsnip = buildVimPluginFrom2Nix {

     

       10068
       10080
        
           pname = "vim-vsnip";

     

       10069
       10069
       -
           version = "2021-08-14";

     

       10081
       10081
       +
           version = "2021-09-14";

     

       10070
       10082
        
           src = fetchFromGitHub {

     

       10071
       10083
        
             owner = "hrsh7th";

     

       10072
       10084
        
             repo = "vim-vsnip";

     

       10073
       10073
       -
             rev = "87d144b7451deb3ab55f1a3e3c5124cfab2b02fa";

     

       10074
       10074
       -
             sha256 = "17gw992xvxsa6wyirah17xbsdi2gl4lif8ibvbs7dwagnkv01vyb";

     

       10085
       10085
       +
             rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6";

     

       10086
       10086
       +
             sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff";

     

       10075
       10087
        
           };

     

       10076
       10088
        
           meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

     

       10077
       10089
        
         };

     

       10078
       10090
        
       

     

       10079
       10091
        
         vim-vsnip-integ = buildVimPluginFrom2Nix {

     

       10080
       10092
        
           pname = "vim-vsnip-integ";

     

       10081
       10081
       -
           version = "2021-09-09";

     

       10093
       10093
       +
           version = "2021-09-13";

     

       10082
       10094
        
           src = fetchFromGitHub {

     

       10083
       10095
        
             owner = "hrsh7th";

     

       10084
       10096
        
             repo = "vim-vsnip-integ";

     

       10085
       10085
       -
             rev = "1b7259510486e825e61c461362578aa15afe3507";

     

       10086
       10086
       -
             sha256 = "0ig1dgyyqdzcrrgsbjaa4308ar04xlcgpygc0fbg27xj7ppiy2f5";

     

       10097
       10097
       +
             rev = "a570685fc5f691e2323cb2e3c267355b8f72527f";

     

       10098
       10098
       +
             sha256 = "0ib7zmvwp46lacay0xq30sxx8jf2d5afzsrsyjkrzkzlvx8c40qh";

     

       10087
       10099
        
           };

     

       10088
       10100
        
           meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";

     

       10089
       10101
        
         };

     
···

       10390
       10402
        
       

     

       10391
       10403
        
         vimspector = buildVimPluginFrom2Nix {

     

       10392
       10404
        
           pname = "vimspector";

     

       10393
       10393
       -
           version = "2021-09-09";

     

       10405
       10405
       +
           version = "2021-09-18";

     

       10394
       10406
        
           src = fetchFromGitHub {

     

       10395
       10407
        
             owner = "puremourning";

     

       10396
       10408
        
             repo = "vimspector";

     

       10397
       10397
       -
             rev = "2bb8561eb622b6316d2fc7f3fa56d8199da6cc3f";

     

       10398
       10398
       -
             sha256 = "0a1prybnmfr5iqmdbhrvlcw66fvl426mgv5in3wf4kfxqy2pg9dr";

     

       10409
       10409
       +
             rev = "66c5a3d08ca5f481851d360d4b39860b00fc8e00";

     

       10410
       10410
       +
             sha256 = "1lrvzsy3grv2klm47diklhdx2i94h8hdxhzpcxr2ymnjl91c9isq";

     

       10399
       10411
        
             fetchSubmodules = true;

     

       10400
       10412
        
           };

     

       10401
       10413
        
           meta.homepage = "https://github.com/puremourning/vimspector/";

     
···

       10403
       10415
        
       

     

       10404
       10416
        
         vimtex = buildVimPluginFrom2Nix {

     

       10405
       10417
        
           pname = "vimtex";

     

       10406
       10406
       -
           version = "2021-09-12";

     

       10418
       10418
       +
           version = "2021-09-16";

     

       10407
       10419
        
           src = fetchFromGitHub {

     

       10408
       10420
        
             owner = "lervag";

     

       10409
       10421
        
             repo = "vimtex";

     

       10410
       10410
       -
             rev = "4989653b88dd94cf23395894123f3d37138f9f52";

     

       10411
       10411
       -
             sha256 = "0abgkw1sgbnm12hlsg23i01laza3yamxgssxm5sb22gn1pmq0l51";

     

       10422
       10422
       +
             rev = "43ba45fe94e6b162c36f06ee80ecd8b225d7c703";

     

       10423
       10423
       +
             sha256 = "12c1drvpiwg1jffgar057p9vk7jkcn8ijfxl5hhl9gp2jsy29xzv";

     

       10412
       10424
        
           };

     

       10413
       10425
        
           meta.homepage = "https://github.com/lervag/vimtex/";

     

       10414
       10426
        
         };

     
···

       10535
       10547
        
       

     

       10536
       10548
        
         wilder-nvim = buildVimPluginFrom2Nix {

     

       10537
       10549
        
           pname = "wilder.nvim";

     

       10538
       10538
       -
           version = "2021-09-11";

     

       10550
       10550
       +
           version = "2021-09-14";

     

       10539
       10551
        
           src = fetchFromGitHub {

     

       10540
       10552
        
             owner = "gelguy";

     

       10541
       10553
        
             repo = "wilder.nvim";

     

       10542
       10542
       -
             rev = "558bf9380df27d4be2e690f5da1958d02052987a";

     

       10543
       10543
       -
             sha256 = "1cy30b56rjbhvmk44y10zgg8x1f9ghiz3jxm7cmwjisv3bv8n73j";

     

       10554
       10554
       +
             rev = "15ff3a0e6fa1882fb4a2391d880c6465652718f5";

     

       10555
       10555
       +
             sha256 = "15rb1g0hyp942s9hgpfzf27yz7w5aaym2phrvr51aybnjz6lm9ff";

     

       10544
       10556
        
           };

     

       10545
       10557
        
           meta.homepage = "https://github.com/gelguy/wilder.nvim/";

     

       10546
       10558
        
         };

     
···

       10656
       10668
        
       

     

       10657
       10669
        
         YouCompleteMe = buildVimPluginFrom2Nix {

     

       10658
       10670
        
           pname = "YouCompleteMe";

     

       10659
       10659
       -
           version = "2021-08-05";

     

       10671
       10671
       +
           version = "2021-09-13";

     

       10660
       10672
        
           src = fetchFromGitHub {

     

       10661
       10673
        
             owner = "ycm-core";

     

       10662
       10674
        
             repo = "YouCompleteMe";

     

       10663
       10663
       -
             rev = "518275b599ab6dd7844c24022f6aec505fb4b07c";

     

       10664
       10664
       -
             sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w";

     

       10675
       10675
       +
             rev = "bb9ebb5b25be3534e33a585c77a14c77f15e8bc8";

     

       10676
       10676
       +
             sha256 = "1pqa4j7i0qv5k5mxwdwmqrxb2jhqllv1s9rdyvji4qqpdfs6q343";

     

       10665
       10677
        
             fetchSubmodules = true;

     

       10666
       10678
        
           };

     

       10667
       10679
        
           meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

     
···

       10693
       10705
        
       

     

       10694
       10706
        
         zenburn = buildVimPluginFrom2Nix {

     

       10695
       10707
        
           pname = "zenburn";

     

       10696
       10696
       -
           version = "2020-09-08";

     

       10708
       10708
       +
           version = "2021-09-15";

     

       10697
       10709
        
           src = fetchFromGitHub {

     

       10698
       10710
        
             owner = "jnurmine";

     

       10699
       10711
        
             repo = "zenburn";

     

       10700
       10700
       -
             rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8";

     

       10701
       10701
       -
             sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8";

     

       10712
       10712
       +
             rev = "de2fa06a93fe1494638ec7b2fdd565898be25de6";

     

       10713
       10713
       +
             sha256 = "0pmmc16gkypb3y87d5wg5g8c3cxhj01ah9khl82hfw564yw4ipqs";

     

       10702
       10714
        
           };

     

       10703
       10715
        
           meta.homepage = "https://github.com/jnurmine/zenburn/";

     

       10704
       10716
        
         };

+1 -1

pkgs/misc/vim-plugins/overrides.nix

···

       686
       686
        
                   libiconv

     

       687
       687
        
                 ];

     

       688
       688
        
       

     

       689
       689
       -
                 cargoSha256 = "1hmbgqd22fy68n05vdb93wsdvws91m4i6nm1kq6bwwbhzhkvd7js";

     

       689
       689
       +
                 cargoSha256 = "083v2bnnjyf9j923p6bidgbvmwnh8sfv5ai70qfffzrysi5gvzdf";

     

       690
       690
        
               };

     

       691
       691
        
             in

     

       692
       692
        
             ''

+1

pkgs/misc/vim-plugins/vim-plugin-names

···

       40
       40
        
       bakpakin/fennel.vim

     

       41
       41
        
       bazelbuild/vim-bazel

     

       42
       42
        
       bbchung/clighter8

     

       43
       43
       +
       BeneCollyridam/futhark-vim

     

       43
       44
        
       benizi/vim-automkdir

     

       44
       45
        
       bhurlow/vim-parinfer

     

       45
       46
        
       bitc/vim-hdevtools

+2 -2

pkgs/misc/vim-plugins/vim-utils.nix

···

       198
       198
        
           '';

     

       199
       199
        
       

     

       200
       200
        
           linkVimlPlugin = plugin: packageName: dir: ''

     

       201
       201
       -
             mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}

     

       202
       202
       -
             ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${plugin.pname}

     

       201
       201
       +
             mkdir -p $out/pack/${packageName}/${dir}/${lib.getName plugin}

     

       202
       202
       +
             ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${lib.getName plugin}

     

       203
       203
        
           '';

     

       204
       204
        
       

     

       205
       205
        
           link = pluginPath: if hasLuaModule pluginPath

+4 -4

pkgs/misc/vscode-extensions/default.nix

···

       823
       823
        
               mktplcRef = {

     

       824
       824
        
                 name = "haskell";

     

       825
       825
        
                 publisher = "haskell";

     

       826
       826
       -
                 version = "1.1.0";

     

       827
       827
       -
                 sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb";

     

       826
       826
       +
                 version = "1.6.1";

     

       827
       827
       +
                 sha256 = "1l6nrbqkq1p62dkmzs4sy0rxbid3qa1104s3fd9fzkmc1sldzgsn";

     

       828
       828
        
               };

     

       829
       829
        
               meta = with lib; {

     

       830
       830
        
                 license = licenses.mit;

     
···

       972
       972
        
               mktplcRef = {

     

       973
       973
        
                 name = "language-haskell";

     

       974
       974
        
                 publisher = "justusadam";

     

       975
       975
       -
                 version = "3.2.1";

     

       976
       976
       -
                 sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6";

     

       975
       975
       +
                 version = "3.4.0";

     

       976
       976
       +
                 sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y";

     

       977
       977
        
               };

     

       978
       978
        
               meta = {

     

       979
       979
        
                 license = lib.licenses.bsd3;

+7 -1

pkgs/os-specific/linux/bcc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch

     

       2
       2
        
       , makeWrapper, cmake, llvmPackages, kernel

     

       3
       3
        
       , flex, bison, elfutils, python, luajit, netperf, iperf, libelf

     

       4
       4
        
       , systemtap, bash, libbpf

     
···

       29
       29
        
           # This is needed until we fix

     

       30
       30
        
           # https://github.com/NixOS/nixpkgs/issues/40427

     

       31
       31
        
           ./fix-deadlock-detector-import.patch

     

       32
       32
       +
           # Add definition for BTF_KIND_FLOAT, added in Linux 5.14

     

       33
       33
       +
           # Can be removed once linuxHeaders (used here via glibc) are bumped to 5.14+.

     

       34
       34
       +
           (fetchpatch {

     

       35
       35
       +
             url = "https://salsa.debian.org/debian/bpfcc/-/raw/71136ef5b66a2ecefd635a7aca2e0e835ff09095/debian/patches/0004-compat-defs.patch";

     

       36
       36
       +
             sha256 = "05s1zxihwkvbl2r2mqc5dj7fpcipqyvwr11v8b9hqbwjkm3qpz40";

     

       37
       37
       +
           })

     

       32
       38
        
         ];

     

       33
       39
        
       

     

       34
       40
        
         propagatedBuildInputs = [ python.pkgs.netaddr ];

+3

pkgs/os-specific/linux/firejail/default.nix

···

       20
       20
        
           # By default fbuilder hardcodes the firejail binary to the install path.

     

       21
       21
        
           # On NixOS the firejail binary is a setuid wrapper available in $PATH.

     

       22
       22
        
           ./fbuilder-call-firejail-on-path.patch

     

       23
       23
       +
           # Disable symlink check on /etc/hosts, see

     

       24
       24
       +
           # https://github.com/netblue30/firejail/issues/2758#issuecomment-805174951

     

       25
       25
       +
           ./remove-link-check.patch

     

       23
       26
        
         ];

     

       24
       27
        
       

     

       25
       28
        
         prePatch = ''

+48

pkgs/os-specific/linux/firejail/remove-link-check.patch

···

       1
       1
       +
       From ccc726f8ec877d8cda720daa2498e43629b6dd48 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jonas Heinrich <onny@project-insanity.org>

     

       3
       3
       +
       Date: Sun, 19 Sep 2021 11:48:06 +0200

     

       4
       4
       +
       Subject: [PATCH 1/2] remove hosts file link check

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/firejail/fs_hostname.c | 4 ----

     

       8
       8
       +
        1 file changed, 4 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c

     

       11
       11
       +
       index 42255070c4..97ce70f9c1 100644

     

       12
       12
       +
       --- a/src/firejail/fs_hostname.c

     

       13
       13
       +
       +++ b/src/firejail/fs_hostname.c

     

       14
       14
       +
       @@ -132,10 +132,6 @@ char *fs_check_hosts_file(const char *fname) {

     

       15
       15
       +
        	invalid_filename(fname);

     

       16
       16
       +
        	char *rv = expand_home(fname, cfg.homedir);

     

       17
       17
       +
        

     

       18
       18
       +
       -	// no a link

     

       19
       19
       +
       -	if (is_link(rv))

     

       20
       20
       +
       -		goto errexit;

     

       21
       21
       +
       -

     

       22
       22
       +
        	// the user has read access to the file

     

       23
       23
       +
        	if (access(rv, R_OK))

     

       24
       24
       +
        		goto errexit;

     

       25
       25
       +
       

     

       26
       26
       +
       From c2c51e7ca56075e7388b4f50922b148615d1b125 Mon Sep 17 00:00:00 2001

     

       27
       27
       +
       From: Jonas Heinrich <onny@project-insanity.org>

     

       28
       28
       +
       Date: Sun, 19 Sep 2021 11:49:08 +0200

     

       29
       29
       +
       Subject: [PATCH 2/2] remove hosts file link check

     

       30
       30
       +
       

     

       31
       31
       +
       ---

     

       32
       32
       +
        src/firejail/fs_hostname.c | 3 ---

     

       33
       33
       +
        1 file changed, 3 deletions(-)

     

       34
       34
       +
       

     

       35
       35
       +
       diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c

     

       36
       36
       +
       index 97ce70f9c1..b228707131 100644

     

       37
       37
       +
       --- a/src/firejail/fs_hostname.c

     

       38
       38
       +
       +++ b/src/firejail/fs_hostname.c

     

       39
       39
       +
       @@ -154,9 +154,6 @@ void fs_mount_hosts_file(void) {

     

       40
       40
       +
        	struct stat s;

     

       41
       41
       +
        	if (stat("/etc/hosts", &s) == -1)

     

       42
       42
       +
        		goto errexit;

     

       43
       43
       +
       -	// not a link

     

       44
       44
       +
       -	if (is_link("/etc/hosts"))

     

       45
       45
       +
       -		goto errexit;

     

       46
       46
       +
        	// owned by root

     

       47
       47
       +
        	if (s.st_uid != 0)

     

       48
       48
       +
        		goto errexit;

+2 -2

pkgs/os-specific/linux/procdump/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "procdump";

     

       5
       5
       -
         version = "1.1.1";

     

       5
       5
       +
         version = "1.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Microsoft";

     

       9
       9
        
           repo = "ProcDump-for-Linux";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0h5fhk39d10kjbinzw1yp6nr8w8l300mn9qxrkpivdkyfn6bpq2f";

     

       11
       11
       +
           sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ zlib ];

+5 -1

pkgs/os-specific/linux/zfs/default.nix

···

       196
       196
        
               license = licenses.cddl;

     

       197
       197
        
               platforms = platforms.linux;

     

       198
       198
        
               maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];

     

       199
       199
       +
               mainProgram = "zfs";

     

       199
       200
        
               # If your Linux kernel version is not yet supported by zfs, try zfsUnstable.

     

       200
       201
        
               # On NixOS set the option boot.zfs.enableUnstable.

     

       201
       202
        
               broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;

     
···

       222
       223
        
           latestCompatibleLinuxPackages = linuxPackages_5_14;

     

       223
       224
        
       

     

       224
       225
        
           # this package should point to a version / git revision compatible with the latest kernel release

     

       226
       226
       +
           # IMPORTANT: Always use a tagged release candidate or commits from the

     

       227
       227
       +
           # zfs-<version>-staging branch, because this is tested by the OpenZFS

     

       228
       228
       +
           # maintainers.

     

       225
       229
        
           version = "2.1.1";

     

       226
       230
        
           # rev = "0000000000000000000000000000000000000000";

     

       227
       231
        
       

     

       228
       228
       -
           sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg=";

     

       232
       232
       +
           sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";

     

       229
       233
        
       

     

       230
       234
        
           isUnstable = true;

     

       231
       235
        
         };

+19

pkgs/servers/adguardhome/bins.nix

···

       1
       1
       +
       { fetchurl, fetchzip }:

     

       2
       2
       +
       {

     

       3
       3
       +
       "x86_64-darwin" = fetchzip {

     

       4
       4
       +
         sha256 = "sha256-ec1l4KxKJH4Iwg9hW+xlxLADGLN1vParYaWIw7nCfKA=";

     

       5
       5
       +
         url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_darwin_amd64.zip";

     

       6
       6
       +
       };

     

       7
       7
       +
       "i686-linux" = fetchurl {

     

       8
       8
       +
         sha256 = "sha256-9aGyC76WyzwHlAkR72kuNcd/68XdWWC3gfT92IuW2LY=";

     

       9
       9
       +
         url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_386.tar.gz";

     

       10
       10
       +
       };

     

       11
       11
       +
       "x86_64-linux" = fetchurl {

     

       12
       12
       +
         sha256 = "sha256-qJMymTxmoPlIhuJD6zFBWWwzz+CFx+9+MOrRiFtA4IY=";

     

       13
       13
       +
         url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_amd64.tar.gz";

     

       14
       14
       +
       };

     

       15
       15
       +
       "aarch64-linux" = fetchurl {

     

       16
       16
       +
         sha256 = "sha256-Z5hekNxeemqWsMu7n3UTmYCzdKp5Xsp9ku0G2LOqC80=";

     

       17
       17
       +
         url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_arm64.tar.gz";

     

       18
       18
       +
       };

     

       19
       19
       +
       }

+9 -8

pkgs/servers/adguardhome/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "adguardhome";

     

       5
       5
        
         version = "0.106.3";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz";

     

       9
       9
       -
           sha256 = "11p081dqilga61zfziw5w37k6v2r84qynhz2hr4gk8367jck54x8";

     

       10
       10
       -
         };

     

       7
       7
       +
         src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system};

     

       11
       8
        
       

     

       12
       9
        
         installPhase = ''

     

       13
       10
        
           install -m755 -D ./AdGuardHome $out/bin/adguardhome

     

       14
       11
        
         '';

     

       15
       12
        
       

     

       13
       13
       +
         passthru = {

     

       14
       14
       +
           updateScript = ./update.sh;

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       16
       17
        
         meta = with lib; {

     

       17
       18
        
           homepage = "https://github.com/AdguardTeam/AdGuardHome";

     

       18
       19
        
           description = "Network-wide ads & trackers blocking DNS server";

     

       19
       19
       -
           platforms = platforms.linux;

     

       20
       20
       -
           maintainers = with maintainers; [ numkem ];

     

       21
       21
       -
           license = licenses.gpl3;

     

       20
       20
       +
           platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ];

     

       21
       21
       +
           maintainers = with maintainers; [ numkem iagoq ];

     

       22
       22
       +
           license = licenses.gpl3Only;

     

       22
       23
        
         };

     

       23
       24
        
       }

+38

pkgs/servers/adguardhome/update.sh

···

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash -p curl gnugrep nix-prefetch jq

     

       3
       3
       +
       

     

       4
       4
       +
       # This file is based on /pkgs/servers/gotify/update.sh

     

       5
       5
       +
       

     

       6
       6
       +
       set -euo pipefail

     

       7
       7
       +
       

     

       8
       8
       +
       dirname="$(dirname "$0")"

     

       9
       9
       +
       bins="$dirname/bins.nix"

     

       10
       10
       +
       

     

       11
       11
       +
       latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest)

     

       12
       12
       +
       version=$(jq -r '.tag_name' <<<"$latest_release")

     

       13
       13
       +
       

     

       14
       14
       +
       echo "got version $version"

     

       15
       15
       +
       

     

       16
       16
       +
       declare -A systems

     

       17
       17
       +
       systems[linux_386]=i686-linux

     

       18
       18
       +
       systems[linux_amd64]=x86_64-linux

     

       19
       19
       +
       systems[linux_arm64]=aarch64-linux

     

       20
       20
       +
       systems[darwin_amd64]=x86_64-darwin

     

       21
       21
       +
       

     

       22
       22
       +
       echo '{ fetchurl, fetchzip }:' > "$bins"

     

       23
       23
       +
       echo '{'        >> "$bins"

     

       24
       24
       +
       

     

       25
       25
       +
       for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do

     

       26
       26
       +
           url="$(jq -r '.browser_download_url' <<< "$asset")"

     

       27
       27
       +
           adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)"

     

       28
       28
       +
           if [ -n "$adg_system" ]; then

     

       29
       29
       +
               fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"

     

       30
       30
       +
               nix_system=${systems[$adg_system]}

     

       31
       31
       +
               nix_src="$(nix-prefetch -s --output nix $fetch --url $url)"

     

       32
       32
       +
               echo "\"$nix_system\" = $fetch $nix_src;" >> $bins

     

       33
       33
       +
           fi

     

       34
       34
       +
       done

     

       35
       35
       +
       

     

       36
       36
       +
       echo '}' >> "$bins"

     

       37
       37
       +
       

     

       38
       38
       +
       sed -i -r -e "s/version\s*?=\s*?.*?;/version = \"${version#v}\";/" "$dirname/default.nix"

+1 -1

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2021.9.6";

     

       5
       5
       +
         version = "2021.9.7";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [ abodepy ];

     

       8
       8
        
           "accuweather" = ps: with ps; [ accuweather ];

+4 -3

pkgs/servers/home-assistant/default.nix

···

       145
       145
        
         extraBuildInputs = extraPackages py.pkgs;

     

       146
       146
        
       

     

       147
       147
        
         # Don't forget to run parse-requirements.py after updating

     

       148
       148
       -
         hassVersion = "2021.9.6";

     

       148
       148
       +
         hassVersion = "2021.9.7";

     

       149
       149
        
       

     

       150
       150
        
       in with py.pkgs; buildPythonApplication rec {

     

       151
       151
        
         pname = "homeassistant";

     
···

       162
       162
        
           owner = "home-assistant";

     

       163
       163
        
           repo = "core";

     

       164
       164
        
           rev = version;

     

       165
       165
       -
           sha256 = "1ac56gdnhzkf19h29g0f54camw6v1cg5wx0crhm23r45qlfsjacs";

     

       165
       165
       +
           sha256 = "1vcdnxh671iqhlbf6811j537by2i03fhryp9r9x77477y2y0xd6k";

     

       166
       166
        
         };

     

       167
       167
        
       

     

       168
       168
        
         # leave this in, so users don't have to constantly update their downstream patch handling

     
···

       175
       175
        
             --replace "awesomeversion==21.4.0" "awesomeversion" \

     

       176
       176
        
             --replace "bcrypt==3.1.7" "bcrypt" \

     

       177
       177
        
             --replace "cryptography==3.3.2" "cryptography" \

     

       178
       178
       -
             --replace "httpx==0.18.2" "httpx>=0.18.2" \

     

       179
       178
        
             --replace "pip>=8.0.3,<20.3" "pip" \

     

       180
       179
        
             --replace "requests==2.25.1" "requests>=2.25.1" \

     

       181
       180
        
             --replace "ruamel.yaml==0.15.100" "ruamel.yaml"

     
···

       790
       789
        
           # wemo/test_sensor.py: KeyError for various power attributes

     

       791
       790
        
           "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable"

     

       792
       791
        
           "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"

     

       792
       792
       +
           # tado/test_climate.py: Tries to connect to my.tado.com

     

       793
       793
       +
           "--deselect tests/components/tado/test_climate.py::test_air_con["

     

       793
       794
        
           # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'

     

       794
       795
        
           "--deselect tests/helpers/test_system_info.py::test_container_installationtype"

     

       795
       796
        
           # tests are located in tests/

+2 -2

pkgs/servers/maddy/default.nix

···

       31
       31
        
       

     

       32
       32
        
         meta = with lib; {

     

       33
       33
        
           description = "Composable all-in-one mail server";

     

       34
       34
       -
           homepage = "https://foxcpp.dev/maddy";

     

       34
       34
       +
           homepage = "https://maddy.email";

     

       35
       35
        
           license = licenses.gpl3Plus;

     

       36
       36
       -
           maintainers = with maintainers; [ lxea ];

     

       36
       36
       +
           maintainers = with maintainers; [];

     

       37
       37
        
         };

     

       38
       38
        
       }

+2 -2

pkgs/servers/nosql/apache-jena/binary.nix

···

       3
       3
        
         s = # Generated upstream information

     

       4
       4
        
         rec {

     

       5
       5
        
           baseName="apache-jena";

     

       6
       6
       -
           version = "3.7.0";

     

       6
       6
       +
           version = "4.2.0";

     

       7
       7
        
           name="${baseName}-${version}";

     

       8
       8
        
           url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq";

     

       9
       9
       +
           sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq";

     

       10
       10
        
         };

     

       11
       11
        
         buildInputs = [

     

       12
       12
        
           makeWrapper

+4 -3

pkgs/servers/nosql/apache-jena/fuseki-binary.nix

···

       3
       3
        
         s = # Generated upstream information

     

       4
       4
        
         rec {

     

       5
       5
        
           baseName="apache-jena-fuseki";

     

       6
       6
       -
           version = "3.13.1";

     

       6
       6
       +
           version = "4.2.0";

     

       7
       7
        
           name="${baseName}-${version}";

     

       8
       8
        
           url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y";

     

       9
       9
       +
           sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h";

     

       10
       10
        
         };

     

       11
       11
        
         buildInputs = [

     

       12
       12
        
           makeWrapper

     
···

       20
       20
        
         };

     

       21
       21
        
         installPhase = ''

     

       22
       22
        
           cp -r . "$out"

     

       23
       23
       -
           ln -s "$out"/{fuseki-server,fuseki} "$out/bin"

     

       23
       23
       +
           chmod +x $out/fuseki

     

       24
       24
       +
           ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin"

     

       24
       25
        
           for i in "$out"/bin/*; do

     

       25
       26
        
             wrapProgram "$i" \

     

       26
       27
        
               --prefix "PATH" : "${java}/bin/" \

+7 -4

pkgs/servers/sql/materialize/default.nix

···

       40
       40
        
       in

     

       41
       41
        
       rustPlatform.buildRustPackage rec {

     

       42
       42
        
         pname = "materialize";

     

       43
       43
       -
         version = "0.8.3";

     

       44
       44
       -
         rev = "3e47d280945f0ddbdc263fc643f067649f66eda1";

     

       43
       43
       +
         version = "0.9.4";

     

       44
       44
       +
         rev = "29d003cae5e9d46f8b11b2102ff0b9abf6608c2f";

     

       45
       45
        
       

     

       46
       46
        
         src = fetchFromGitHub {

     

       47
       47
        
           owner = "MaterializeInc";

     

       48
       48
        
           repo = pname;

     

       49
       49
        
           rev = "v${version}";

     

       50
       50
       -
           sha256 = "15635hcw04nms133k9l5582xbk7frc86nka91yaafl63q6pwbdvg";

     

       50
       50
       +
           sha256 = "021n05csyvza9ifq09qaxypgmlbp3a7xn6r1m4jn8d4rnz38wag6";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
       -
         cargoSha256 = "1fxqjhjs4bqq6nzax7xrhwjpv57dk90iw9fl8ilp41wzg7yvyhcm";

     

       53
       53
       +
         cargoSha256 = "12fysxzmqnx7y7yg6fjcv1952s77d46pwi32vnsv62icgqfpw0j4";

     

       54
       54
        
       

     

       55
       55
        
         nativeBuildInputs = [ cmake perl pkg-config ]

     

       56
       56
        
           # Provides the mig command used by the krb5-src build script

     

       57
       57
        
           ++ lib.optional stdenv.isDarwin bootstrap_cmds;

     

       58
       58
       +
       

     

       59
       59
       +
         # Needed to get openssl-sys to use pkg-config.

     

       60
       60
       +
         OPENSSL_NO_VENDOR = 1;

     

       58
       61
        
       

     

       59
       62
        
         buildInputs = [ openssl ]

     

       60
       63
        
           ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ];

+2 -2

pkgs/servers/tailscale/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tailscale";

     

       5
       5
       -
         version = "1.14.0";

     

       5
       5
       +
         version = "1.14.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tailscale";

     

       9
       9
        
           repo = "tailscale";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-FlPb7PtX/q34I7DZBLB9RIlg9tjKqktwn7N8Pv02hYc=";

     

       11
       11
       +
           sha256 = "sha256-IXnkKKyjnktGjz3Osi2qYnrcDHC3Xfcr1oku/P0s0xk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+6 -5

pkgs/tools/admin/awscli2/default.nix

···

       11
       11
        
               };

     

       12
       12
        
             });

     

       13
       13
        
             botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {

     

       14
       14
       -
               version = "2.0.0dev138";

     

       14
       14
       +
               version = "2.0.0dev147";

     

       15
       15
        
               src = fetchFromGitHub {

     

       16
       16
        
                 owner = "boto";

     

       17
       17
        
                 repo = "botocore";

     

       18
       18
       -
                 rev = "5f1971d2d9d2cf7090a8b71650ab40712319bca3";

     

       19
       19
       -
                 sha256 = "sha256-onptN++MDJrit3sIEXCX9oRJ0qQ5xzmI6J2iABiK7RA";

     

       18
       18
       +
                 rev = "afa015418df6b3aeef0f5645e8704de64adea3d7";

     

       19
       19
       +
                 sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg=";

     

       20
       20
        
               };

     

       21
       21
        
               propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt];

     

       22
       22
        
             });

     
···

       33
       33
        
       in

     

       34
       34
        
       with py.pkgs; buildPythonApplication rec {

     

       35
       35
        
         pname = "awscli2";

     

       36
       36
       -
         version = "2.2.30"; # N.B: if you change this, change botocore to a matching version too

     

       36
       36
       +
         version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too

     

       37
       37
        
       

     

       38
       38
        
         src = fetchFromGitHub {

     

       39
       39
        
           owner = "aws";

     

       40
       40
        
           repo = "aws-cli";

     

       41
       41
        
           rev = version;

     

       42
       42
       -
           sha256 = "sha256-OPxo5RjdDCTPntiJInUtgcU43Nn5JEUbwRJXeBl/yYQ";

     

       42
       42
       +
           sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU=";

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
        
         patches = [

     
···

       55
       55
        
             --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \

     

       56
       56
        
             --replace "docutils>=0.10,<0.16" "docutils" \

     

       57
       57
        
             --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \

     

       58
       58
       +
             --replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \

     

       58
       59
        
             --replace "wcwidth<0.2.0" "wcwidth" \

     

       59
       60
        
             --replace "distro>=1.5.0,<1.6.0" "distro"

     

       60
       61
        
         '';

+2 -2

pkgs/tools/audio/tts/default.nix

···

       16
       16
        
       

     

       17
       17
        
       python3.pkgs.buildPythonApplication rec {

     

       18
       18
        
         pname = "tts";

     

       19
       19
       -
         version = "0.3.0";

     

       19
       19
       +
         version = "0.3.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "coqui-ai";

     

       23
       23
        
           repo = "TTS";

     

       24
       24
        
           rev = "v${version}";

     

       25
       25
       -
           sha256 = "sha256-LiH056h7eIaikBr6sm5A4T/lF7nVroxaZSYzrES7+zk=";

     

       25
       25
       +
           sha256 = "sha256-/CeetLm3jgS5Q69zTVkLm+Wh4nD7D4c6j9MTujMc3fU=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

+1 -1

pkgs/tools/inputmethods/touchegg/default.nix

···

       62
       62
        
           description = "Linux multi-touch gesture recognizer";

     

       63
       63
        
           license = licenses.gpl3Plus;

     

       64
       64
        
           platforms = platforms.linux;

     

       65
       65
       -
           maintainers = pantheon.maintainers;

     

       65
       65
       +
           maintainers = teams.pantheon.members;

     

       66
       66
        
         };

     

       67
       67
        
       }

+3 -3

pkgs/tools/misc/cicero-tui/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "cicero-tui";

     

       13
       13
       -
         version = "0.2.2";

     

       13
       13
       +
         version = "0.3.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "eyeplum";

     

       17
       17
        
           repo = "cicero-tui";

     

       18
       18
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8=";

     

       19
       19
       +
           sha256 = "sha256-5/yH5ZK/JgMsRUcJ0qQEShEqxrtKJa+P6pcHAn5Jx0c=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     
···

       29
       29
        
           freetype

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       -
         cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc=";

     

       32
       32
       +
         cargoSha256 = "sha256-AraisWGTPEj+tHcLonEwfevBu+mMTPkq3O9zNYgI9X8=";

     

       33
       33
        
       

     

       34
       34
        
         meta = with lib; {

     

       35
       35
        
           description = "Unicode tool with a terminal user interface";

+3 -3

pkgs/tools/misc/dua/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "dua";

     

       5
       5
       -
         version = "2.14.6";

     

       5
       5
       +
         version = "2.14.7";

     

       6
       6
        
       

     

       7
       7
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

     

       8
       8
        
       

     
···

       10
       10
        
           owner = "Byron";

     

       11
       11
        
           repo = "dua-cli";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "sha256-8hEJJl1FkRU+2lbzNQWep2NavRTFtYT1Qpe0FI6p13A=";

     

       13
       13
       +
           sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0=";

     

       14
       14
        
           # Remove unicode file names which leads to different checksums on HFS+

     

       15
       15
        
           # vs. other filesystems because of unicode normalisation.

     

       16
       16
        
           extraPostFetch = ''

     
···

       18
       18
        
           '';

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoSha256 = "sha256-dkr5yJLi0rPclfz8NuR2ewDkqhrthZ+yu09aA61ND/E=";

     

       21
       21
       +
         cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ=";

     

       22
       22
        
       

     

       23
       23
        
         doCheck = false;

     

       24
       24

+1 -1

pkgs/tools/misc/hashit/default.nix

···

       43
       43
        
           description = "A simple app for checking usual checksums - Designed for elementary OS";

     

       44
       44
        
           homepage = "https://github.com/artemanufrij/hashit";

     

       45
       45
        
           license = licenses.gpl2Plus;

     

       46
       46
       -
           maintainers = pantheon.maintainers;

     

       46
       46
       +
           maintainers = teams.pantheon.members;

     

       47
       47
        
           platforms = platforms.linux;

     

       48
       48
        
         };

     

       49
       49
        
       }

+3 -3

pkgs/tools/misc/mmv-go/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mmv-go";

     

       5
       5
       -
         version = "0.1.3";

     

       5
       5
       +
         version = "0.1.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "itchyny";

     

       9
       9
        
           repo = "mmv";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s";

     

       11
       11
       +
           sha256 = "sha256-n7yW+0cabJGDgppt6Qcj7ID3sD85094NDOPk2o9xDwY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68";

     

       14
       14
       +
         vendorSha256 = "sha256-3Xk8S2Em28r5R7894Ubo2OOlGhrKplV/gY4ftCjPvMo=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ];

     

       17
       17

+4

pkgs/tools/misc/phoronix-test-suite/default.nix

···

       13
       13
        
         nativeBuildInputs = [ which gnused makeWrapper ];

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

     

       16
       16
       +
           runHook preInstall

     

       17
       17
       +
       

     

       16
       18
        
           ./install-sh $out

     

       17
       19
        
           wrapProgram $out/bin/phoronix-test-suite \

     

       18
       20
        
           --set PHP_BIN ${php}/bin/php \

     

       19
       21
        
           --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]}

     

       22
       22
       +
       

     

       23
       23
       +
           runHook postInstall

     

       20
       24
        
         '';

     

       21
       25
        
       

     

       22
       26
        
         passthru.tests = {

+3 -1

pkgs/tools/misc/vector/default.nix

···

       55
       55
        
         doCheck = !stdenv.isDarwin;

     

       56
       56
        
         # healthcheck_grafana_cloud is trying to make a network access

     

       57
       57
        
         # test_stream_errors is flaky on linux-aarch64

     

       58
       58
       +
         # tcp_with_tls_intermediate_ca is flaky on linux-x86_64

     

       58
       59
        
         checkPhase = ''

     

       59
       60
        
           TZDIR=${tzdata}/share/zoneinfo cargo test \

     

       60
       61
        
             --no-default-features \

     

       61
       62
        
             --features ${lib.concatStringsSep "," features} \

     

       62
       63
        
             -- --test-threads 1 \

     

       63
       64
        
             --skip=sinks::loki::tests::healthcheck_grafana_cloud \

     

       64
       64
       -
             --skip=kubernetes::api_watcher::tests::test_stream_errors

     

       65
       65
       +
             --skip=kubernetes::api_watcher::tests::test_stream_errors \

     

       66
       66
       +
             --skip=sources::socket::test::tcp_with_tls_intermediate_ca

     

       65
       67
        
         '';

     

       66
       68
        
       

     

       67
       69
        
         # recent overhauls of DNS support in 0.9 mean that we try to resolve

+10 -4

pkgs/tools/networking/atftp/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "atftp";

     

       5
       5
       -
         version = "0.7.4";

     

       5
       5
       +
         version = "0.7.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo=";

     

       9
       9
       +
           sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         # fix test script

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           patchShebangs .

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       12
       17
        
         nativeBuildInputs = [ makeWrapper ];

     

       13
       18
        
         buildInputs = [ readline tcp_wrappers pcre gcc ];

     

       14
       19
        
       

     

       15
       20
        
         # Expects pre-GCC5 inline semantics

     

       16
       21
        
         NIX_CFLAGS_COMPILE = "-std=gnu89";

     

       17
       22
        
       

     

       18
       18
       -
         doCheck = false; # fails

     

       23
       23
       +
         doCheck = true;

     

       24
       24
       +
         checkInputs = [ ps ];

     

       19
       25
        
       

     

       20
       26
        
         meta = {

     

       21
       27
        
           description = "Advanced tftp tools";

+3 -3

pkgs/tools/networking/innernet/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "innernet";

     

       5
       5
       -
         version = "1.4.1";

     

       5
       5
       +
         version = "1.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tonarino";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-ss3BtwRnRAUPfM6yjl14rQrYZ7PHAT3s/MEHnbV7IEU=";

     

       11
       11
       +
           sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4=";

     

       12
       12
        
         };

     

       13
       13
       -
         cargoSha256 = "sha256-hhsRLm8wsmvnu3wRK9s4Fjdy0bKLboAKw6qS2XQ1nsI=";

     

       13
       13
       +
         cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE=";

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = with llvmPackages; [

     

       16
       16
        
           llvm

+1

pkgs/tools/networking/openssh/common.nix

···

       123
       123
        
           license = licenses.bsd2;

     

       124
       124
        
           platforms = platforms.unix ++ platforms.windows;

     

       125
       125
        
           maintainers = with maintainers; [ eelco aneeshusa ];

     

       126
       126
       +
           mainProgram = "ssh";

     

       126
       127
        
         } // extraMeta;

     

       127
       128
        
       }

+2 -2

pkgs/tools/networking/wget/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "wget";

     

       9
       9
       -
         version = "1.21.1";

     

       9
       9
       +
         version = "1.21.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://gnu/wget/${pname}-${version}.tar.lz";

     

       13
       13
       -
           sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0=";

     

       13
       13
       +
           sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         patches = [

+2 -2

pkgs/tools/package-management/libdnf/default.nix

···

       1
       1
       -
       { gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check

     

       2
       2
        
       , json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }:

     

       3
       3
        
       

     

       4
       4
       -
       gcc9Stdenv.mkDerivation rec {

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "libdnf";

     

       6
       6
        
         version = "0.63.1";

     

       7
       7

+3 -3

pkgs/tools/security/kubesec/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "kubesec";

     

       8
       8
       -
         version = "2.11.2";

     

       8
       8
       +
         version = "2.11.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "controlplaneio";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4=";

     

       14
       14
       +
           sha256 = "sha256-ntDkkw1mOb3oAs/UX9uazKv1+smVy2qtg6ZqCLEbRNQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc=";

     

       17
       17
       +
         vendorSha256 = "sha256-1qDi8Ij+uweZggE9fbi50uCqlPzdGOwiO3WPuAxnils=";

     

       18
       18
        
       

     

       19
       19
        
         # Tests wants to download the kubernetes schema for use with kubeval

     

       20
       20
        
         doCheck = false;

+3 -3

pkgs/tools/security/prs/default.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage rec {

     

       16
       16
        
         pname = "prs";

     

       17
       17
       -
         version = "0.2.13";

     

       17
       17
       +
         version = "0.3.2";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitLab {

     

       20
       20
        
           owner = "timvisee";

     

       21
       21
        
           repo = "prs";

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           sha256 = "sha256-UZm147oNBbgagGKgJcaT5354Tl+MXkK+/bB+tuncH5o=";

     

       23
       23
       +
           sha256 = "sha256-90Ed/mafACSJvH+DjCbdXs3eeyT+pGflRzDD9l3b0/s=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         cargoSha256 = "sha256-u31xzgZVlXbraq2lTRJCKZVoHqRg8iH2kE3tkq5NwLk=";

     

       26
       26
       +
         cargoSha256 = "sha256-5teiF8s11Ml8UtbVn6fXur2OQzE52JZnsgyDihbEFTQ=";

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

     

       29
       29
        
           # The GPGME backend is recommended

+1

pkgs/tools/text/gnugrep/default.nix

···

       60
       60
        
       

     

       61
       61
        
           maintainers = [ maintainers.eelco ];

     

       62
       62
        
           platforms = platforms.all;

     

       63
       63
       +
           mainProgram = "grep";

     

       63
       64
        
         };

     

       64
       65
        
       

     

       65
       66
        
         passthru = {inherit pcre;};

+4 -4

pkgs/tools/text/ocrmypdf/default.nix

···

       30
       30
        
       in

     

       31
       31
        
       buildPythonApplication rec {

     

       32
       32
        
         pname = "ocrmypdf";

     

       33
       33
       -
         version = "12.3.0";

     

       33
       33
       +
         version = "12.5.0";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchFromGitHub {

     

       36
       36
        
           owner = "jbarlow83";

     

       37
       37
        
           repo = "OCRmyPDF";

     

       38
       38
        
           rev = "v${version}";

     

       39
       39
       -
           sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2";

     

       39
       39
       +
           sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         nativeBuildInputs = with python3Packages; [

     
···

       47
       47
        
       

     

       48
       48
        
         propagatedBuildInputs = with python3Packages; [

     

       49
       49
        
           cffi

     

       50
       50
       -
           chardet

     

       51
       50
        
           coloredlogs

     

       52
       51
        
           img2pdf

     

       52
       52
       +
           importlib-resources

     

       53
       53
        
           pdfminer

     

       54
       54
        
           pluggy

     

       55
       55
        
           pikepdf

     
···

       84
       84
        
           license = with licenses; [ mpl20 mit ];

     

       85
       85
        
           platforms = platforms.linux;

     

       86
       86
        
           maintainers = [ maintainers.kiwi ];

     

       87
       87
       -
           changelog  = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst";

     

       87
       87
       +
           changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst";

     

       88
       88
        
         };

     

       89
       89
        
       }

+1 -3

pkgs/tools/text/snippetpixie/default.nix

···

       86
       86
        
           '';

     

       87
       87
        
           homepage = "https://www.snippetpixie.com";

     

       88
       88
        
           license = licenses.gpl2Plus;

     

       89
       89
       -
           maintainers = with maintainers; [

     

       90
       90
       -
             ianmjones

     

       91
       91
       -
           ] ++ pantheon.maintainers;

     

       89
       89
       +
           maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members;

     

       92
       90
        
           platforms = platforms.linux;

     

       93
       91
        
         };

     

       94
       92
        
       }

+9 -4

pkgs/top-level/all-packages.nix

···

       2993
       2993
        
       

     

       2994
       2994
        
         inklecate = callPackage ../development/compilers/inklecate {};

     

       2995
       2995
        
       

     

       2996
       2996
       +
         intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;

     

       2997
       2997
       +
       

     

       2996
       2998
        
         interactsh = callPackage ../tools/misc/interactsh { };

     

       2997
       2999
        
       

     

       2998
       3000
        
         interlock = callPackage ../servers/interlock {};

     
···

       8022
       8024
        
         pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { };

     

       8023
       8025
        
       

     

       8024
       8026
        
         pamtester = callPackage ../tools/security/pamtester { };

     

       8027
       8027
       +
       

     

       8028
       8028
       +
         pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { };

     

       8025
       8029
        
       

     

       8026
       8030
        
         paperless-ng = callPackage ../applications/office/paperless-ng { };

     

       8027
       8031
        
       

     
···

       12426
       12430
        
         };

     

       12427
       12431
        
         cargo-readme = callPackage ../development/tools/rust/cargo-readme {};

     

       12428
       12432
        
         cargo-sort = callPackage ../development/tools/rust/cargo-sort { };

     

       12433
       12433
       +
         cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { };

     

       12429
       12434
        
         cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };

     

       12430
       12435
        
         cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {};

     

       12431
       12436
        
         cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {

     
···

       13063
       13068
        
         pipewire = callPackage ../development/libraries/pipewire {};

     

       13064
       13069
        
         pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {};

     

       13065
       13070
        
       

     

       13066
       13066
       -
         pyradio = callPackage ../applications/radio/pyradio {};

     

       13071
       13071
       +
         pyradio = callPackage ../applications/audio/pyradio {};

     

       13067
       13072
        
       

     

       13068
       13073
        
         pyrex = pyrex095;

     

       13069
       13074
        
       

     
···

       19894
       19899
        
         cassandra = cassandra_3_11;

     

       19895
       19900
        
       

     

       19896
       19901
        
         apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {

     

       19897
       19897
       -
           java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

     

       19902
       19902
       +
           java = jre;

     

       19898
       19903
        
         };

     

       19899
       19904
        
       

     

       19900
       19905
        
         apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {

     

       19901
       19901
       -
           java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

     

       19906
       19906
       +
           java = jre;

     

       19902
       19907
        
         };

     

       19903
       19908
        
       

     

       19904
       19909
        
         apcupsd = callPackage ../servers/apcupsd { };

     
···

       24584
       24589
        
         gitolite = callPackage ../applications/version-management/gitolite { };

     

       24585
       24590
        
       

     

       24586
       24591
        
         gitoxide = callPackage ../applications/version-management/gitoxide {

     

       24587
       24587
       -
           inherit (darwin.apple_sdk.frameworks) Security;

     

       24592
       24592
       +
           inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;

     

       24588
       24593
        
         };

     

       24589
       24594
        
       

     

       24590
       24595
        
         inherit (gnome) gitg;

+4

pkgs/top-level/python-packages.nix

···

       3648
       3648
        
       

     

       3649
       3649
        
         intelhex = callPackage ../development/python-modules/intelhex { };

     

       3650
       3650
        
       

     

       3651
       3651
       +
         intensity-normalization = callPackage ../development/python-modules/intensity-normalization { };

     

       3652
       3652
       +
       

     

       3651
       3653
        
         internetarchive = callPackage ../development/python-modules/internetarchive { };

     

       3652
       3654
        
       

     

       3653
       3655
        
         interruptingcow = callPackage ../development/python-modules/interruptingcow { };

     
···

       5161
       5163
        
         ordered-set = callPackage ../development/python-modules/ordered-set { };

     

       5162
       5164
        
       

     

       5163
       5165
        
         orderedset = callPackage ../development/python-modules/orderedset { };

     

       5166
       5166
       +
       

     

       5167
       5167
       +
         orjson = callPackage ../development/python-modules/orjson { };

     

       5164
       5168
        
       

     

       5165
       5169
        
         orm = callPackage ../development/python-modules/orm { };

     

       5166
       5170