commit 64baf2593dedfef31548b6279c8923e77782652b · pyrox.dev/nixpkgs

+5 -2

nixos/doc/manual/development/writing-nixos-tests.section.md

···

       162
       162
        
           If the command detaches, it must close stdout, as `execute` will wait

     

       163
       163
        
           for this to consume all output reliably. This can be achieved by

     

       164
       164
        
           redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or

     

       165
       165
       -
           a file.

     

       165
       165
       +
           a file. Examples of detaching commands are `sleep 365d &`, where the

     

       166
       166
       +
           shell forks a new process that can write to stdout and `xclip -i`, where

     

       167
       167
       +
           the `xclip` command itself forks without closing stdout.

     

       166
       168
        
           Takes an optional parameter `check_return` that defaults to `True`.

     

       167
       169
        
           Setting this parameter to `False` will not check for the return code

     

       168
       170
        
           and return -1 instead. This can be used for commands that shut down

     
···

       183
       185
        
       

     

       184
       186
        
           -   Dereferencing unset variables fail the command.

     

       185
       187
        
       

     

       186
       186
       -
           -   It will wait for stdout to be closed. See `execute`.

     

       188
       188
       +
           -   It will wait for stdout to be closed. See `execute` for the

     

       189
       189
       +
               implications.

     

       187
       190
        
       

     

       188
       191
        
       `fail`

     

       189
       192

+8 -3

nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml

···

       271
       271
        
                 for this to consume all output reliably. This can be achieved

     

       272
       272
        
                 by redirecting stdout to stderr <literal>&gt;&amp;2</literal>,

     

       273
       273
        
                 to <literal>/dev/console</literal>,

     

       274
       274
       -
                 <literal>/dev/null</literal> or a file. Takes an optional

     

       275
       275
       -
                 parameter <literal>check_return</literal> that defaults to

     

       274
       274
       +
                 <literal>/dev/null</literal> or a file. Examples of detaching

     

       275
       275
       +
                 commands are <literal>sleep 365d &amp;</literal>, where the

     

       276
       276
       +
                 shell forks a new process that can write to stdout and

     

       277
       277
       +
                 <literal>xclip -i</literal>, where the

     

       278
       278
       +
                 <literal>xclip</literal> command itself forks without closing

     

       279
       279
       +
                 stdout. Takes an optional parameter

     

       280
       280
       +
                 <literal>check_return</literal> that defaults to

     

       276
       281
        
                 <literal>True</literal>. Setting this parameter to

     

       277
       282
        
                 <literal>False</literal> will not check for the return code

     

       278
       283
        
                 and return -1 instead. This can be used for commands that shut

     
···

       314
       319
        
                 <listitem>

     

       315
       320
        
                   <para>

     

       316
       321
        
                     It will wait for stdout to be closed. See

     

       317
       317
       -
                     <literal>execute</literal>.

     

       322
       322
       +
                     <literal>execute</literal> for the implications.

     

       318
       323
        
                   </para>

     

       319
       324
        
                 </listitem>

     

       320
       325
        
               </itemizedlist>

+12 -3

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

···

       450
       450
        
               <para>

     

       451
       451
        
                 The NixOS VM test framework,

     

       452
       452
        
                 <literal>pkgs.nixosTest</literal>/<literal>make-test-python.nix</literal>,

     

       453
       453
       -
                 now requires non-terminating commands such as

     

       454
       454
       -
                 <literal>succeed(&quot;foo &amp;&quot;)</literal> to close

     

       455
       455
       -
                 stdout. This can be done with a redirect such as

     

       453
       453
       +
                 now requires detaching commands such as

     

       454
       454
       +
                 <literal>succeed(&quot;foo &amp;&quot;)</literal> and

     

       455
       455
       +
                 <literal>succeed(&quot;foo | xclip -i&quot;)</literal> to

     

       456
       456
       +
                 close stdout. This can be done with a redirect such as

     

       456
       457
        
                 <literal>succeed(&quot;foo &gt;&amp;2 &amp;&quot;)</literal>.

     

       457
       458
        
                 This breaking change was necessitated by a race condition

     

       458
       459
        
                 causing tests to fail or hang. It applies to all methods that

     
···

       1857
       1858
        
                   </para>

     

       1858
       1859
        
                 </listitem>

     

       1859
       1860
        
               </itemizedlist>

     

       1861
       1861
       +
             </listitem>

     

       1862
       1862
       +
             <listitem>

     

       1863
       1863
       +
               <para>

     

       1864
       1864
       +
                 <literal>security.pam.services.&lt;name&gt;.makeHomeDir</literal>

     

       1865
       1865
       +
                 now uses <literal>umask=0077</literal> instead of

     

       1866
       1866
       +
                 <literal>umask=0022</literal> when creating the home

     

       1867
       1867
       +
                 directory.

     

       1868
       1868
       +
               </para>

     

       1860
       1869
        
             </listitem>

     

       1861
       1870
        
           </itemizedlist>

     

       1862
       1871
        
         </section>

+3 -1

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

···

       133
       133
        
       

     

       134
       134
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       135
       135
        
       

     

       136
       136
       -
       - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires non-terminating commands such as `succeed("foo &")` to close stdout.

     

       136
       136
       +
       - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.

     

       137
       137
        
         This can be done with a redirect such as `succeed("foo >&2 &")`. This breaking change was necessitated by a race condition causing tests to fail or hang.

     

       138
       138
        
         It applies to all methods that invoke commands on the nodes, including `execute`, `succeed`, `fail`, `wait_until_succeeds`, `wait_until_fails`.

     

       139
       139
        
       

     
···

       516
       516
        
         - The `services.unifi.dataDir` option is removed and the data is now always located under `/var/lib/unifi/data`. This is done to make better use of systemd state direcotiry and thus making the service restart more reliable.

     

       517
       517
        
         - The unifi logs can now be found under: `/var/log/unifi` instead of `/var/lib/unifi/logs`.

     

       518
       518
        
         - The unifi run directory can now be found under: `/run/unifi` instead of `/var/lib/unifi/run`.

     

       519
       519
       +
       

     

       520
       520
       +
       - `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.

+1 -1

nixos/modules/security/pam.nix

···

       529
       529
        
                       ${optionalString (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"}

     

       530
       530
        
                     "}

     

       531
       531
        
                 ${optionalString cfg.makeHomeDir

     

       532
       532
       -
                     "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0022"}

     

       532
       532
       +
                     "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077"}

     

       533
       533
        
                 ${optionalString cfg.updateWtmp

     

       534
       534
        
                     "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}

     

       535
       535
        
                 ${optionalString config.security.pam.enableEcryptfs

+22 -10

nixos/modules/services/networking/ddclient.nix

···

       28
       28
        
         '';

     

       29
       29
        
         configFile = if (cfg.configFile != null) then cfg.configFile else configFile';

     

       30
       30
        
       

     

       31
       31
       +
         preStart = ''

     

       32
       32
       +
           install ${configFile} /run/${RuntimeDirectory}/ddclient.conf

     

       33
       33
       +
           ${lib.optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then ''

     

       34
       34
       +
             password=$(head -n 1 ${cfg.passwordFile})

     

       35
       35
       +
             sed -i "s/^password=$/password=$password/" /run/${RuntimeDirectory}/ddclient.conf

     

       36
       36
       +
           '' else ''

     

       37
       37
       +
             sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf

     

       38
       38
       +
           '')}

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       31
       41
        
       in

     

       32
       42
        
       

     

       33
       43
        
       with lib;

     
···

       54
       64
        
               type = bool;

     

       55
       65
        
               description = ''

     

       56
       66
        
                 Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org).

     

       67
       67
       +
               '';

     

       68
       68
       +
             };

     

       69
       69
       +
       

     

       70
       70
       +
             package = mkOption {

     

       71
       71
       +
               type = package;

     

       72
       72
       +
               default = pkgs.ddclient;

     

       73
       73
       +
               defaultText = "pkgs.ddclient";

     

       74
       74
       +
               description = ''

     

       75
       75
       +
                 The ddclient executable package run by the service.

     

       57
       76
        
               '';

     

       58
       77
        
             };

     

       59
       78
        
       

     
···

       195
       214
        
       

     

       196
       215
        
             serviceConfig = {

     

       197
       216
        
               DynamicUser = true;

     

       217
       217
       +
               RuntimeDirectoryMode = "0700";

     

       198
       218
        
               inherit RuntimeDirectory;

     

       199
       219
        
               inherit StateDirectory;

     

       200
       220
        
               Type = "oneshot";

     

       201
       201
       -
               ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";

     

       221
       221
       +
               ExecStartPre = "!${pkgs.writeShellScript "ddclient-prestart" preStart}";

     

       222
       222
       +
               ExecStart = "${lib.getBin cfg.package}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";

     

       202
       223
        
             };

     

       203
       203
       -
             preStart = ''

     

       204
       204
       -
               install -m 600 ${configFile} /run/${RuntimeDirectory}/ddclient.conf

     

       205
       205
       -
               ${optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then ''

     

       206
       206
       -
                 password=$(head -n 1 ${cfg.passwordFile})

     

       207
       207
       -
                 sed -i "s/^password=$/password=$password/" /run/${RuntimeDirectory}/ddclient.conf

     

       208
       208
       -
               '' else ''

     

       209
       209
       -
                 sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf

     

       210
       210
       -
               '')}

     

       211
       211
       -
             '';

     

       212
       224
        
           };

     

       213
       225
        
       

     

       214
       226
        
           systemd.timers.ddclient = {

+10 -6

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

···

       38
       38
        
         // (if cfg.smtp.authenticate then { SMTP_LOGIN  = cfg.smtp.user; } else {})

     

       39
       39
        
         // cfg.extraConfig;

     

       40
       40
        
       

     

       41
       41
       -
         systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@setuid" "@swap" ];

     

       41
       41
       +
         systemCallsList = [ "@cpu-emulation" "@debug" "@keyring" "@ipc" "@mount" "@obsolete" "@privileged" "@setuid" ];

     

       42
       42
        
       

     

       43
       43
        
         cfgService = {

     

       44
       44
        
           # User and group

     
···

       50
       50
        
           # Logs directory and mode

     

       51
       51
        
           LogsDirectory = "mastodon";

     

       52
       52
        
           LogsDirectoryMode = "0750";

     

       53
       53
       +
           # Proc filesystem

     

       54
       54
       +
           ProcSubset = "pid";

     

       55
       55
       +
           ProtectProc = "invisible";

     

       53
       56
        
           # Access write directories

     

       54
       57
        
           UMask = "0027";

     

       55
       58
        
           # Capabilities

     
···

       74
       77
        
           MemoryDenyWriteExecute = false;

     

       75
       78
        
           RestrictRealtime = true;

     

       76
       79
        
           RestrictSUIDSGID = true;

     

       80
       80
       +
           RemoveIPC = true;

     

       77
       81
        
           PrivateMounts = true;

     

       78
       82
        
           # System Call Filtering

     

       79
       83
        
           SystemCallArchitectures = "native";

     
···

       464
       468
        
               Type = "oneshot";

     

       465
       469
        
               WorkingDirectory = cfg.package;

     

       466
       470
        
               # System Call Filtering

     

       467
       467
       -
               SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);

     

       471
       471
       +
               SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];

     

       468
       472
        
             } // cfgService;

     

       469
       473
        
       

     

       470
       474
        
             after = [ "network.target" ];

     
···

       491
       495
        
               EnvironmentFile = "/var/lib/mastodon/.secrets_env";

     

       492
       496
        
               WorkingDirectory = cfg.package;

     

       493
       497
        
               # System Call Filtering

     

       494
       494
       -
               SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);

     

       498
       498
       +
               SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];

     

       495
       499
        
             } // cfgService;

     

       496
       500
        
             after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []);

     

       497
       501
        
             wantedBy = [ "multi-user.target" ];

     
···

       517
       521
        
               RuntimeDirectory = "mastodon-streaming";

     

       518
       522
        
               RuntimeDirectoryMode = "0750";

     

       519
       523
        
               # System Call Filtering

     

       520
       520
       -
               SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" "@resources" ]);

     

       524
       524
       +
               SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@memlock" "@resources" ])) "pipe" "pipe2" ];

     

       521
       525
        
             } // cfgService;

     

       522
       526
        
           };

     

       523
       527
        
       

     
···

       541
       545
        
               RuntimeDirectory = "mastodon-web";

     

       542
       546
        
               RuntimeDirectoryMode = "0750";

     

       543
       547
        
               # System Call Filtering

     

       544
       544
       -
               SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]);

     

       548
       548
       +
               SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];

     

       545
       549
        
             } // cfgService;

     

       546
       550
        
             path = with pkgs; [ file imagemagick ffmpeg ];

     

       547
       551
        
           };

     
···

       563
       567
        
               EnvironmentFile = "/var/lib/mastodon/.secrets_env";

     

       564
       568
        
               WorkingDirectory = cfg.package;

     

       565
       569
        
               # System Call Filtering

     

       566
       566
       -
               SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList;

     

       570
       570
       +
               SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ];

     

       567
       571
        
             } // cfgService;

     

       568
       572
        
             path = with pkgs; [ file imagemagick ffmpeg ];

     

       569
       573
        
           };

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

···

       189
       189
        
             ];

     

       190
       190
        
       

     

       191
       191
        
             services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ];

     

       192
       192
       +
             # Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has

     

       193
       193
       +
             # many tiny bugs.

     

       194
       194
       +
             # See: https://github.com/NixOS/nixpkgs/issues/143272

     

       195
       195
       +
             services.xserver.displayManager.defaultSession = mkDefault "plasma";

     

       192
       196
        
       

     

       193
       197
        
             security.wrappers = {

     

       194
       198
        
               kcheckpass = {

+1 -1

nixos/modules/services/x11/display-managers/default.nix

···

       280
       280
        
                   null;

     

       281
       281
        
               example = "gnome";

     

       282
       282
        
               description = ''

     

       283
       283
       -
                 Graphical session to pre-select in the session chooser (only effective for GDM and LightDM).

     

       283
       283
       +
                 Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM).

     

       284
       284
        
       

     

       285
       285
        
                 On GDM, LightDM and SDDM, it will also be used as a session for auto-login.

     

       286
       286
        
               '';

nixos/modules/services/x11/display-managers/sddm.nix

···

       30
       30
        
             HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff";

     

       31
       31
        
             RebootCommand = "/run/current-system/systemd/bin/systemctl reboot";

     

       32
       32
        
             Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none

     

       33
       33
       +
       

     

       34
       34
       +
             # Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch

     

       35
       35
       +
             DefaultSession = optionalString (dmcfg.defaultSession != null) "${dmcfg.defaultSession}.desktop";

     

       33
       36
        
           };

     

       34
       37
        
       

     

       35
       38
        
           Theme = {

+1 -1

nixos/tests/chromium.nix

···

       215
       215
        
       

     

       216
       216
        
               clipboard = machine.succeed(

     

       217
       217
        
                   ru(

     

       218
       218
       -
                       "echo void | ${pkgs.xclip}/bin/xclip -i"

     

       218
       218
       +
                       "echo void | ${pkgs.xclip}/bin/xclip -i >&2"

     

       219
       219
        
                   )

     

       220
       220
        
               )

     

       221
       221
        
               machine.succeed(

+1 -1

nixos/tests/seafile.nix

···

       6
       6
        
           };

     

       7
       7
        
         in {

     

       8
       8
        
           name = "seafile";

     

       9
       9
       -
           meta = with pkgs.stdenv.lib.maintainers; {

     

       9
       9
       +
           meta = with pkgs.lib.maintainers; {

     

       10
       10
        
             maintainers = [ kampfschlaefer schmittlauch ];

     

       11
       11
        
           };

     

       12
       12

+1 -1

nixos/tests/systemd-boot.nix

···

       42
       42
        
         # Check that specialisations create corresponding boot entries.

     

       43
       43
        
         specialisation = makeTest {

     

       44
       44
        
           name = "systemd-boot-specialisation";

     

       45
       45
       -
           meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lukegb ];

     

       45
       45
       +
           meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];

     

       46
       46
        
       

     

       47
       47
        
           machine = { pkgs, lib, ... }: {

     

       48
       48
        
             imports = [ common ];

pkgs/applications/display-managers/sddm/default.nix

···

       19
       19
        
       

     

       20
       20
        
         patches = [

     

       21
       21
        
           ./sddm-ignore-config-mtime.patch

     

       22
       22
       +
           ./sddm-default-session.patch

     

       22
       23
        
           # Load `/etc/profile` for `environment.variables` with zsh default shell.

     

       23
       24
        
           # See: https://github.com/sddm/sddm/pull/1382

     

       24
       25
        
           (fetchpatch {

+71

pkgs/applications/display-managers/sddm/sddm-default-session.patch

···

       1
       1
       +
       diff --git a/src/common/Configuration.h b/src/common/Configuration.h

     

       2
       2
       +
       index cf44a62..7bb9c03 100644

     

       3
       3
       +
       --- a/src/common/Configuration.h

     

       4
       4
       +
       +++ b/src/common/Configuration.h

     

       5
       5
       +
       @@ -44,6 +44,7 @@ namespace SDDM {

     

       6
       6
       +
                                                                                                           "NOTE: Currently ignored if autologin is enabled."));

     

       7
       7
       +
                Entry(InputMethod,         QString,     QStringLiteral("qtvirtualkeyboard"),                   _S("Input method module"));

     

       8
       8
       +
                Entry(Namespaces,          QStringList, QStringList(),                                  _S("Comma-separated list of Linux namespaces for user session to enter"));

     

       9
       9
       +
       +        Entry(DefaultSession,      QString,     QString(),                                      _S("System-wide default session"));

     

       10
       10
       +
                //  Name   Entries (but it's a regular class again)

     

       11
       11
       +
                Section(Theme,

     

       12
       12
       +
                    Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));

     

       13
       13
       +
       diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp

     

       14
       14
       +
       index 1953c76..54fe2f2 100644

     

       15
       15
       +
       --- a/src/greeter/SessionModel.cpp

     

       16
       16
       +
       +++ b/src/greeter/SessionModel.cpp

     

       17
       17
       +
       @@ -43,6 +43,7 @@ namespace SDDM {

     

       18
       18
       +
                beginResetModel();

     

       19
       19
       +
                populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       20
       20
       +
                populate(Session::X11Session, mainConfig.X11.SessionDir.get());

     

       21
       21
       +
       +        selectDefaultSession();

     

       22
       22
       +
                endResetModel();

     

       23
       23
       +
        

     

       24
       24
       +
                // refresh everytime a file is changed, added or removed

     

       25
       25
       +
       @@ -52,6 +53,7 @@ namespace SDDM {

     

       26
       26
       +
                    d->sessions.clear();

     

       27
       27
       +
                    populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       28
       28
       +
                    populate(Session::X11Session, mainConfig.X11.SessionDir.get());

     

       29
       29
       +
       +            selectDefaultSession();

     

       30
       30
       +
                    endResetModel();

     

       31
       31
       +
                });

     

       32
       32
       +
                watcher->addPath(mainConfig.Wayland.SessionDir.get());

     

       33
       33
       +
       @@ -149,11 +151,25 @@ namespace SDDM {

     

       34
       34
       +
                    else

     

       35
       35
       +
                        delete si;

     

       36
       36
       +
                }

     

       37
       37
       +
       +    }

     

       38
       38
       +
       +

     

       39
       39
       +
       +    void SessionModel::selectDefaultSession() {

     

       40
       40
       +
       +        d->lastIndex = 0;

     

       41
       41
       +
       +

     

       42
       42
       +
                // find out index of the last session

     

       43
       43
       +
                for (int i = 0; i < d->sessions.size(); ++i) {

     

       44
       44
       +
                    if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) {

     

       45
       45
       +
                        d->lastIndex = i;

     

       46
       46
       +
       -                break;

     

       47
       47
       +
       +                return;

     

       48
       48
       +
       +            }

     

       49
       49
       +
       +        }

     

       50
       50
       +
       +

     

       51
       51
       +
       +        // Otherwise, fallback to system-wide default session.

     

       52
       52
       +
       +        auto defaultSession = mainConfig.DefaultSession.get();

     

       53
       53
       +
       +        for (int i = 0; i < d->sessions.size(); ++i) {

     

       54
       54
       +
       +            if (QFileInfo(d->sessions.at(i)->fileName()).fileName() == defaultSession) {

     

       55
       55
       +
       +                d->lastIndex = i;

     

       56
       56
       +
       +                return;

     

       57
       57
       +
                    }

     

       58
       58
       +
                }

     

       59
       59
       +
            }

     

       60
       60
       +
       diff --git a/src/greeter/SessionModel.h b/src/greeter/SessionModel.h

     

       61
       61
       +
       index 2e2efa9..a93315c 100644

     

       62
       62
       +
       --- a/src/greeter/SessionModel.h

     

       63
       63
       +
       +++ b/src/greeter/SessionModel.h

     

       64
       64
       +
       @@ -58,6 +58,7 @@ namespace SDDM {

     

       65
       65
       +
                SessionModelPrivate *d { nullptr };

     

       66
       66
       +
        

     

       67
       67
       +
                void populate(Session::Type type, const QString &path);

     

       68
       68
       +
       +        void selectDefaultSession();

     

       69
       69
       +
            };

     

       70
       70
       +
        }

     

       71
       71
       +

+2 -2

pkgs/applications/misc/koreader/default.nix

···

       13
       13
        
       let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };

     

       14
       14
        
       in stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "koreader";

     

       16
       16
       -
         version = "2021.09";

     

       16
       16
       +
         version = "2021.10.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url =

     

       20
       20
        
             "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";

     

       21
       21
       -
           sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84";

     

       21
       21
       +
           sha256 = "sha256-UpDwexBfjlne/uNMTtNjIyZb3TDMYFeDvtwtTFARovw=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         sourceRoot = ".";

+3 -3

pkgs/applications/misc/pipr/default.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "pipr";

     

       10
       10
       -
         version = "0.0.15";

     

       10
       10
       +
         version = "0.0.16";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "ElKowar";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w";

     

       16
       16
       +
           sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoSha256 = "05ryaxi479fxzdcl51r1xlqbiasfzxcxgvl4wnxync8qi8q2yqk0";

     

       19
       19
       +
         cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
        
         postFixup = ''

+9 -9

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       18
       18
        
           }

     

       19
       19
        
         },

     

       20
       20
        
         "beta": {

     

       21
       21
       -
           "version": "96.0.4664.27",

     

       22
       22
       -
           "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6",

     

       23
       23
       -
           "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7",

     

       21
       21
       +
           "version": "96.0.4664.35",

     

       22
       22
       +
           "sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m",

     

       23
       23
       +
           "sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl",

     

       24
       24
        
           "deps": {

     

       25
       25
        
             "gn": {

     

       26
       26
        
               "version": "2021-09-24",

     
···

       31
       31
        
           }

     

       32
       32
        
         },

     

       33
       33
        
         "dev": {

     

       34
       34
       -
           "version": "97.0.4682.3",

     

       35
       35
       -
           "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4",

     

       36
       36
       -
           "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a",

     

       34
       34
       +
           "version": "97.0.4688.2",

     

       35
       35
       +
           "sha256": "0a5i64gxb24z5mfvmf50g4fafvqqbj7k5077arnhwzp3xiznld88",

     

       36
       36
       +
           "sha256bin64": "0l70qlna8x05rrlcfgv2xyl8g5nlmd42i8n0yc9dw3mwq8m4c4db",

     

       37
       37
        
           "deps": {

     

       38
       38
        
             "gn": {

     

       39
       39
       -
               "version": "2021-10-08",

     

       39
       39
       +
               "version": "2021-10-30",

     

       40
       40
        
               "url": "https://gn.googlesource.com/gn",

     

       41
       41
       -
               "rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148",

     

       42
       42
       -
               "sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff"

     

       41
       41
       +
               "rev": "8926696a4186279489cc2b8d768533e61bba73d7",

     

       42
       42
       +
               "sha256": "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk"

     

       43
       43
        
             }

     

       44
       44
        
           }

     

       45
       45
        
         },

+2 -2

pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix

···

       15
       15
        
           _: {

     

       16
       16
        
             src = pkgs.fetchgit {

     

       17
       17
        
               url = "https://github.com/NixOS/nixops-aws.git";

     

       18
       18
       -
               rev = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48";

     

       19
       19
       -
               sha256 = "15jz9x3ra3hsh6xj4cbri1fvvjk2rplnnhnccz7qc6f176b5r01j";

     

       18
       18
       +
               rev = "44f774272bd522cc7e87074c056f2225f771ded0";

     

       19
       19
       +
               sha256 = "0x9pv186nkcfisr1c1nxw8gpazkrg546dfl95140rif0xzw3pizx";

     

       20
       20
        
             };

     

       21
       21
        
           }

     

       22
       22
        
         );

+51 -14

pkgs/applications/networking/cluster/nixops/poetry.lock

···

       38
       38
        
       

     

       39
       39
        
       [[package]]

     

       40
       40
        
       name = "boto3"

     

       41
       41
       -
       version = "1.18.64"

     

       41
       41
       +
       version = "1.19.9"

     

       42
       42
        
       description = "The AWS SDK for Python"

     

       43
       43
        
       category = "main"

     

       44
       44
        
       optional = false

     

       45
       45
        
       python-versions = ">= 3.6"

     

       46
       46
        
       

     

       47
       47
        
       [package.dependencies]

     

       48
       48
       -
       botocore = ">=1.21.64,<1.22.0"

     

       48
       48
       +
       botocore = ">=1.22.9,<1.23.0"

     

       49
       49
        
       jmespath = ">=0.7.1,<1.0.0"

     

       50
       50
        
       s3transfer = ">=0.5.0,<0.6.0"

     

       51
       51
        
       

     
···

       54
       54
        
       

     

       55
       55
        
       [[package]]

     

       56
       56
        
       name = "botocore"

     

       57
       57
       -
       version = "1.21.64"

     

       57
       57
       +
       version = "1.22.9"

     

       58
       58
        
       description = "Low-level, data-driven core of boto 3."

     

       59
       59
        
       category = "main"

     

       60
       60
        
       optional = false

     
···

       173
       173
        
       

     

       174
       174
        
       [[package]]

     

       175
       175
        
       name = "libvirt-python"

     

       176
       176
       -
       version = "7.8.0"

     

       176
       176
       +
       version = "7.9.0"

     

       177
       177
        
       description = "The libvirt virtualization API python binding"

     

       178
       178
        
       category = "main"

     

       179
       179
        
       optional = false

     
···

       228
       228
        
       type = "git"

     

       229
       229
        
       url = "https://github.com/NixOS/nixops-aws.git"

     

       230
       230
        
       reference = "master"

     

       231
       231
       -
       resolved_reference = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48"

     

       231
       231
       +
       resolved_reference = "44f774272bd522cc7e87074c056f2225f771ded0"

     

       232
       232
        
       

     

       233
       233
        
       [[package]]

     

       234
       234
        
       name = "nixops-encrypted-links"

     
···

       344
       344
        
       

     

       345
       345
        
       [[package]]

     

       346
       346
        
       name = "packaging"

     

       347
       347
       -
       version = "21.0"

     

       347
       347
       +
       version = "21.2"

     

       348
       348
        
       description = "Core utilities for Python packages"

     

       349
       349
        
       category = "dev"

     

       350
       350
        
       optional = false

     

       351
       351
        
       python-versions = ">=3.6"

     

       352
       352
        
       

     

       353
       353
        
       [package.dependencies]

     

       354
       354
       -
       pyparsing = ">=2.0.2"

     

       354
       354
       +
       pyparsing = ">=2.0.2,<3"

     

       355
       355
        
       

     

       356
       356
        
       [[package]]

     

       357
       357
        
       name = "pluggy"

     
···

       621
       621
        
           {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},

     

       622
       622
        
       ]

     

       623
       623
        
       boto3 = [

     

       624
       624
       -
           {file = "boto3-1.18.64-py3-none-any.whl", hash = "sha256:b4d6299dd16a3042b7750cde00fe38d57fd59d3ce242308ba8488618ca931694"},

     

       625
       625
       -
           {file = "boto3-1.18.64.tar.gz", hash = "sha256:9223b433b0d3b74f2b9574fb3c384048998343ccd6b608044318a7f9b904f661"},

     

       624
       624
       +
           {file = "boto3-1.19.9-py3-none-any.whl", hash = "sha256:efa4aea4d30e93f8913a5731ab4de7b6d2020ee77cdde7e61bfae56670da1a14"},

     

       625
       625
       +
           {file = "boto3-1.19.9.tar.gz", hash = "sha256:2fe4edec0e02705059e6baac52e29f97fae6086bf8b817e6ca0e49b48c0fbbf2"},

     

       626
       626
        
       ]

     

       627
       627
        
       botocore = [

     

       628
       628
       -
           {file = "botocore-1.21.64-py3-none-any.whl", hash = "sha256:d57287377e4c7c7d7bf6c5fa39e02994de1d99fced9492a58a00e5a54bae1cca"},

     

       629
       629
       -
           {file = "botocore-1.21.64.tar.gz", hash = "sha256:0a30dca4dad7d43fd856e671ace95f9afc4726caa1e22f0ae11b654fc76e0c7d"},

     

       628
       628
       +
           {file = "botocore-1.22.9-py3-none-any.whl", hash = "sha256:612d26b58f790d267cc7714e82262104b681db799655b6dd6b64fcd9caf08bef"},

     

       629
       629
       +
           {file = "botocore-1.22.9.tar.gz", hash = "sha256:7b59367bace96595e9feeed9765c7178278c55531b2b9e07b7618911e9f0a00b"},

     

       630
       630
        
       ]

     

       631
       631
        
       certifi = [

     

       632
       632
        
           {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},

     
···

       699
       699
        
           {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},

     

       700
       700
        
           {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},

     

       701
       701
        
           {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},

     

       702
       702
       +
           {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},

     

       703
       703
       +
           {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},

     

       702
       704
        
           {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},

     

       703
       705
        
           {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},

     

       704
       706
        
           {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},

     
···

       732
       734
        
           {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"},

     

       733
       735
        
       ]

     

       734
       736
        
       libvirt-python = [

     

       735
       735
       -
           {file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"},

     

       737
       737
       +
           {file = "libvirt-python-7.9.0.tar.gz", hash = "sha256:8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359"},

     

       736
       738
        
       ]

     

       737
       739
        
       markupsafe = [

     

       740
       740
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},

     

       741
       741
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},

     

       742
       742
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},

     

       743
       743
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},

     

       744
       744
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},

     

       745
       745
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},

     

       746
       746
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},

     

       747
       747
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},

     

       748
       748
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},

     

       749
       749
       +
           {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},

     

       738
       750
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},

     

       739
       751
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},

     

       740
       752
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},

     

       741
       753
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},

     

       742
       754
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},

     

       743
       755
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},

     

       756
       756
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},

     

       757
       757
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},

     

       758
       758
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},

     

       759
       759
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},

     

       760
       760
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},

     

       761
       761
       +
           {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},

     

       744
       762
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},

     

       745
       763
        
           {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},

     

       746
       764
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},

     
···

       749
       767
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},

     

       750
       768
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},

     

       751
       769
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},

     

       770
       770
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},

     

       771
       771
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},

     

       772
       772
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},

     

       773
       773
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},

     

       774
       774
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},

     

       775
       775
       +
           {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},

     

       752
       776
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},

     

       753
       777
        
           {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},

     

       778
       778
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},

     

       754
       779
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},

     

       755
       780
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},

     

       756
       781
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},

     

       757
       782
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},

     

       758
       783
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},

     

       759
       784
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},

     

       785
       785
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},

     

       786
       786
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},

     

       787
       787
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},

     

       788
       788
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},

     

       789
       789
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},

     

       790
       790
       +
           {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},

     

       760
       791
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},

     

       761
       792
        
           {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},

     

       762
       793
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},

     
···

       766
       797
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},

     

       767
       798
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},

     

       768
       799
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},

     

       800
       800
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},

     

       801
       801
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},

     

       802
       802
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},

     

       803
       803
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},

     

       804
       804
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},

     

       805
       805
       +
           {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},

     

       769
       806
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},

     

       770
       807
        
           {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},

     

       771
       808
        
           {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},

     
···

       779
       816
        
       nixopsvbox = []

     

       780
       817
        
       nixos-modules-contrib = []

     

       781
       818
        
       packaging = [

     

       782
       782
       -
           {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},

     

       783
       783
       -
           {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},

     

       819
       819
       +
           {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},

     

       820
       820
       +
           {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},

     

       784
       821
        
       ]

     

       785
       822
        
       pluggy = [

     

       786
       823
        
           {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},

+2 -2

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "purple-lurch";

     

       5
       5
       -
         version = "0.6.7";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gkdr";

     

       9
       9
        
           repo = "lurch";

     

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

     

       11
       11
       -
           sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz";

     

       11
       11
       +
           sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14

+1 -1

pkgs/applications/networking/mullvad-vpn/default.nix

···

       72
       72
        
           mv usr/bin/* $out/bin

     

       73
       73
        
           mv opt/Mullvad\ VPN/* $out/share/mullvad

     

       74
       74
        
       

     

       75
       75
       -
           sed -i 's|\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 '$out'/bin|g' $out/share/applications/mullvad-vpn.desktop

     

       75
       75
       +
           sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop

     

       76
       76
        
       

     

       77
       77
        
           ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/

     

       78
       78
        
           ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon

+2 -2

pkgs/applications/networking/nextdns/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "nextdns";

     

       5
       5
       -
         version = "1.37.2";

     

       5
       5
       +
         version = "1.37.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nextdns";

     

       9
       9
        
           repo = "nextdns";

     

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

     

       11
       11
       -
           sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc=";

     

       11
       11
       +
           sha256 = "sha256-BCDVn4JaRYIexI7NrRDchUl9u4AEJa+An9ItYYJDs3A=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48=";

+31 -7

pkgs/applications/video/openshot-qt/default.nix

···

       1
       1
       -
       { lib, stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch

     

       2
       2
       -
       , doxygen, python3Packages, libopenshot

     

       3
       3
       -
       , wrapGAppsHook, gtk3

     

       4
       4
       -
       , qtsvg }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , mkDerivationWith

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , doxygen

     

       6
       6
       +
       , gtk3

     

       7
       7
       +
       , libopenshot

     

       8
       8
       +
       , python3Packages

     

       9
       9
       +
       , qtsvg

     

       10
       10
       +
       , wrapGAppsHook

     

       11
       11
       +
       }:

     

       5
       12
        
       

     

       6
       13
        
       mkDerivationWith python3Packages.buildPythonApplication rec {

     

       7
       14
        
         pname = "openshot-qt";

     
···

       14
       21
        
           sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv";

     

       15
       22
        
         };

     

       16
       23
        
       

     

       17
       17
       -
         nativeBuildInputs = [ doxygen wrapGAppsHook ];

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           doxygen

     

       26
       26
       +
           wrapGAppsHook

     

       27
       27
       +
         ];

     

       18
       28
        
       

     

       19
       19
       -
         buildInputs = [ gtk3 ];

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           gtk3

     

       31
       31
       +
         ];

     

       20
       32
        
       

     

       21
       21
       -
         propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ];

     

       33
       33
       +
         propagatedBuildInputs = with python3Packages; [

     

       34
       34
       +
           httplib2

     

       35
       35
       +
           libopenshot

     

       36
       36
       +
           pyqt5_with_qtwebkit

     

       37
       37
       +
           pyzmq

     

       38
       38
       +
           requests

     

       39
       39
       +
           sip_4

     

       40
       40
       +
         ];

     

       22
       41
        
       

     

       23
       42
        
         dontWrapGApps = true;

     

       24
       43
        
         dontWrapQtApps = true;

     
···

       55
       74
        
           license = with licenses; gpl3Plus;

     

       56
       75
        
           maintainers = with maintainers; [ AndersonTorres ];

     

       57
       76
        
           platforms = with platforms; unix;

     

       77
       77
       +
         };

     

       78
       78
       +
       

     

       79
       79
       +
         passthru = {

     

       80
       80
       +
           inherit libopenshot;

     

       81
       81
       +
           inherit (libopenshot) libopenshot-audio;

     

       58
       82
        
         };

     

       59
       83
        
       }

+40 -16

pkgs/applications/video/openshot-qt/libopenshot-audio.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen

     

       2
       2
       -
       , alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor

     

       3
       3
       -
       , zlib, AGL, Cocoa, Foundation

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , alsa-lib

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , doxygen

     

       7
       7
       +
       , libX11

     

       8
       8
       +
       , libXcursor

     

       9
       9
       +
       , libXext

     

       10
       10
       +
       , libXft

     

       11
       11
       +
       , libXinerama

     

       12
       12
       +
       , libXrandr

     

       13
       13
       +
       , pkg-config

     

       14
       14
       +
       , zlib

     

       15
       15
       +
       , AGL

     

       16
       16
       +
       , Cocoa

     

       17
       17
       +
       , Foundation

     

       4
       18
        
       }:

     

       5
       19
        
       

     

       6
       6
       -
       with lib;

     

       7
       20
        
       stdenv.mkDerivation rec {

     

       8
       21
        
         pname = "libopenshot-audio";

     

       9
       9
       -
         version = "0.2.0";

     

       22
       22
       +
         version = "0.2.2";

     

       10
       23
        
       

     

       11
       24
        
         src = fetchFromGitHub {

     

       12
       25
        
           owner = "OpenShot";

     

       13
       26
        
           repo = "libopenshot-audio";

     

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

     

       15
       15
       -
           sha256 = "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf";

     

       28
       28
       +
           sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0=";

     

       16
       29
        
         };

     

       17
       30
        
       

     

       18
       18
       -
         nativeBuildInputs =

     

       19
       19
       -
         [ pkg-config cmake doxygen ];

     

       31
       31
       +
         nativeBuildInputs = [

     

       32
       32
       +
           cmake

     

       33
       33
       +
           doxygen

     

       34
       34
       +
           pkg-config

     

       35
       35
       +
         ];

     

       20
       36
        
       

     

       21
       21
       -
         buildInputs =

     

       22
       22
       -
           optionals stdenv.isLinux [ alsa-lib ]

     

       23
       23
       -
           ++ (if stdenv.isDarwin then

     

       24
       24
       -
                 [ zlib AGL Cocoa Foundation ]

     

       25
       25
       -
               else

     

       26
       26
       -
                 [ libX11 libXft libXrandr libXinerama libXext libXcursor ])

     

       27
       27
       -
         ;

     

       37
       37
       +
         buildInputs = lib.optionals stdenv.isLinux [

     

       38
       38
       +
           alsa-lib

     

       39
       39
       +
         ] ++ (if stdenv.isDarwin then [

     

       40
       40
       +
             AGL

     

       41
       41
       +
             Cocoa

     

       42
       42
       +
             Foundation

     

       43
       43
       +
             zlib

     

       44
       44
       +
           ] else [

     

       45
       45
       +
             libX11

     

       46
       46
       +
             libXcursor

     

       47
       47
       +
             libXext

     

       48
       48
       +
             libXft

     

       49
       49
       +
             libXinerama

     

       50
       50
       +
             libXrandr

     

       51
       51
       +
           ]);

     

       28
       52
        
       

     

       29
       53
        
         doCheck = false;

     

       30
       54
        
       

     

       31
       31
       -
         meta = {

     

       55
       55
       +
         meta = with lib; {

     

       32
       56
        
           homepage = "http://openshot.org/";

     

       33
       57
        
           description = "High-quality sound editing library";

     

       34
       58
        
           longDescription = ''

+47 -30

pkgs/applications/video/openshot-qt/libopenshot.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch

     

       2
       2
       -
       , pkg-config, cmake, doxygen

     

       3
       3
       -
       , libopenshot-audio, imagemagick, ffmpeg

     

       4
       4
       -
       , swig, python3, jsoncpp

     

       5
       5
       -
       , cppzmq, zeromq

     

       6
       6
       -
       , qtbase, qtmultimedia

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , alsa-lib

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , cppzmq

     

       7
       7
       +
       , doxygen

     

       8
       8
       +
       , ffmpeg

     

       9
       9
       +
       , imagemagick

     

       10
       10
       +
       , jsoncpp

     

       11
       11
       +
       , libopenshot-audio

     

       7
       12
        
       , llvmPackages

     

       13
       13
       +
       , pkg-config

     

       14
       14
       +
       , python3

     

       15
       15
       +
       , qtbase

     

       16
       16
       +
       , qtmultimedia

     

       17
       17
       +
       , swig

     

       18
       18
       +
       , zeromq

     

       8
       19
        
       }:

     

       9
       20
        
       

     

       10
       10
       -
       with lib;

     

       11
       21
        
       stdenv.mkDerivation rec {

     

       12
       22
        
         pname = "libopenshot";

     

       13
       13
       -
         version = "0.2.5";

     

       23
       23
       +
         version = "0.2.7";

     

       14
       24
        
       

     

       15
       25
        
         src = fetchFromGitHub {

     

       16
       26
        
           owner = "OpenShot";

     

       17
       27
        
           repo = "libopenshot";

     

       18
       28
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp";

     

       29
       29
       +
           sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U=";

     

       20
       30
        
         };

     

       21
       31
        
       

     

       22
       22
       -
         patches = [

     

       23
       23
       -
           # Fix build with GCC 10.

     

       24
       24
       -
           (fetchpatch {

     

       25
       25
       -
             name = "fix-build-with-gcc-10.patch";

     

       26
       26
       -
             url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff";

     

       27
       27
       -
             sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz";

     

       28
       28
       -
           })

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       32
        
         postPatch = ''

     

       32
       33
        
           sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt

     

       33
       33
       -
           sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt

     

       34
       34
       +
           sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt

     

       34
       35
        
           export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)

     

       35
       36
        
         '';

     

       36
       37
        
       

     

       37
       37
       -
         nativeBuildInputs = [ pkg-config cmake doxygen swig ];

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           alsa-lib

     

       40
       40
       +
           cmake

     

       41
       41
       +
           doxygen

     

       42
       42
       +
           pkg-config

     

       43
       43
       +
           swig

     

       44
       44
       +
         ];

     

       38
       45
        
       

     

       39
       39
       -
         buildInputs =

     

       40
       40
       -
         [ imagemagick ffmpeg python3 jsoncpp

     

       41
       41
       -
           cppzmq zeromq qtbase qtmultimedia ]

     

       42
       42
       -
           ++ optional stdenv.isDarwin llvmPackages.openmp

     

       43
       43
       -
         ;

     

       46
       46
       +
         buildInputs = [

     

       47
       47
       +
           cppzmq

     

       48
       48
       +
           ffmpeg

     

       49
       49
       +
           imagemagick

     

       50
       50
       +
           jsoncpp

     

       51
       51
       +
           libopenshot-audio

     

       52
       52
       +
           python3

     

       53
       53
       +
           qtbase

     

       54
       54
       +
           qtmultimedia

     

       55
       55
       +
           zeromq

     

       56
       56
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       57
       57
       +
           llvmPackages.openmp

     

       58
       58
       +
         ];

     

       44
       59
        
       

     

       45
       60
        
         dontWrapQtApps = true;

     

       46
       46
       -
       

     

       47
       47
       -
         LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;

     

       48
       61
        
       

     

       49
       62
        
         doCheck = false;

     

       50
       63
        
       

     

       51
       64
        
         cmakeFlags = [ "-DENABLE_RUBY=OFF" ];

     

       52
       65
        
       

     

       53
       53
       -
         meta = {

     

       66
       66
       +
         meta = with lib; {

     

       54
       67
        
           homepage = "http://openshot.org/";

     

       55
       68
        
           description = "Free, open-source video editor library";

     

       56
       69
        
           longDescription = ''

     
···

       58
       71
        
             delivering high quality video editing, animation, and playback solutions

     

       59
       72
        
             to the world. API currently supports C++, Python, and Ruby.

     

       60
       73
        
           '';

     

       61
       61
       -
           license = with licenses; gpl3Plus;

     

       74
       74
       +
           license = licenses.gpl3Plus;

     

       62
       75
        
           maintainers = with maintainers; [ AndersonTorres ];

     

       63
       63
       -
           platforms = with platforms; unix;

     

       76
       76
       +
           platforms = platforms.unix;

     

       77
       77
       +
         };

     

       78
       78
       +
       

     

       79
       79
       +
         passthru = {

     

       80
       80
       +
           inherit libopenshot-audio;

     

       64
       81
        
         };

     

       65
       82
        
       }

+1 -1

pkgs/build-support/libredirect/default.nix

···

       38
       38
        
       

     

       39
       39
        
           install -vD "$libName" "$out/lib/$libName"

     

       40
       40
        
       

     

       41
       41
       +
           # Provide a setup hook that injects our library into every process.

     

       41
       42
        
           mkdir -p "$hook/nix-support"

     

       42
       43
        
           cat <<SETUP_HOOK > "$hook/nix-support/setup-hook"

     

       43
       44
        
           ${if stdenv.isDarwin then ''

     

       44
       45
        
           export DYLD_INSERT_LIBRARIES="$out/lib/$libName"

     

       45
       45
       -
           export DYLD_FORCE_FLAT_NAMESPACE=1

     

       46
       46
        
           '' else ''

     

       47
       47
        
           export LD_PRELOAD="$out/lib/$libName"

     

       48
       48
        
           ''}

+101 -42

pkgs/build-support/libredirect/libredirect.c

···

       2
       2
        
       #include <stdio.h>

     

       3
       3
        
       #include <stdarg.h>

     

       4
       4
        
       #include <stdlib.h>

     

       5
       5
       +
       #include <unistd.h>

     

       5
       6
        
       #include <dlfcn.h>

     

       6
       7
        
       #include <sys/types.h>

     

       7
       8
        
       #include <sys/stat.h>

     
···

       12
       13
        
       #include <dirent.h>

     

       13
       14
        
       

     

       14
       15
        
       #define MAX_REDIRECTS 128

     

       16
       16
       +
       

     

       17
       17
       +
       #ifdef __APPLE__

     

       18
       18
       +
         struct dyld_interpose {

     

       19
       19
       +
           const void * replacement;

     

       20
       20
       +
           const void * replacee;

     

       21
       21
       +
         };

     

       22
       22
       +
         #define WRAPPER(ret, name) static ret _libredirect_wrapper_##name

     

       23
       23
       +
         #define LOOKUP_REAL(name) &name

     

       24
       24
       +
         #define WRAPPER_DEF(name) \

     

       25
       25
       +
           __attribute__((used)) static struct dyld_interpose _libredirect_interpose_##name \

     

       26
       26
       +
             __attribute__((section("__DATA,__interpose"))) = { &_libredirect_wrapper_##name, &name };

     

       27
       27
       +
       #else

     

       28
       28
       +
         #define WRAPPER(ret, name) ret name

     

       29
       29
       +
         #define LOOKUP_REAL(name) dlsym(RTLD_NEXT, #name)

     

       30
       30
       +
         #define WRAPPER_DEF(name)

     

       31
       31
       +
       #endif

     

       15
       32
        
       

     

       16
       33
        
       static int nrRedirects = 0;

     

       17
       34
        
       static char * from[MAX_REDIRECTS];

     
···

       80
       97
        
          it contains only what we needed for programs in Nixpkgs. Just add

     

       81
       98
        
          more functions as needed. */

     

       82
       99
        
       

     

       83
       83
       -
       int open(const char * path, int flags, ...)

     

       100
       100
       +
       WRAPPER(int, open)(const char * path, int flags, ...)

     

       84
       101
        
       {

     

       85
       85
       -
           int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");

     

       102
       102
       +
           int (*open_real) (const char *, int, mode_t) = LOOKUP_REAL(open);

     

       86
       103
        
           mode_t mode = 0;

     

       87
       104
        
           if (open_needs_mode(flags)) {

     

       88
       105
        
               va_list ap;

     
···

       93
       110
        
           char buf[PATH_MAX];

     

       94
       111
        
           return open_real(rewrite(path, buf), flags, mode);

     

       95
       112
        
       }

     

       113
       113
       +
       WRAPPER_DEF(open)

     

       96
       114
        
       

     

       97
       97
       -
       int open64(const char * path, int flags, ...)

     

       115
       115
       +
       #ifndef __APPLE__

     

       116
       116
       +
       WRAPPER(int, open64)(const char * path, int flags, ...)

     

       98
       117
        
       {

     

       99
       99
       -
           int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");

     

       118
       118
       +
           int (*open64_real) (const char *, int, mode_t) = LOOKUP_REAL(open64);

     

       100
       119
        
           mode_t mode = 0;

     

       101
       120
        
           if (open_needs_mode(flags)) {

     

       102
       121
        
               va_list ap;

     
···

       107
       126
        
           char buf[PATH_MAX];

     

       108
       127
        
           return open64_real(rewrite(path, buf), flags, mode);

     

       109
       128
        
       }

     

       129
       129
       +
       WRAPPER_DEF(open64)

     

       130
       130
       +
       #endif

     

       110
       131
        
       

     

       111
       111
       -
       int openat(int dirfd, const char * path, int flags, ...)

     

       132
       132
       +
       WRAPPER(int, openat)(int dirfd, const char * path, int flags, ...)

     

       112
       133
        
       {

     

       113
       113
       -
           int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");

     

       134
       134
       +
           int (*openat_real) (int, const char *, int, mode_t) = LOOKUP_REAL(openat);

     

       114
       135
        
           mode_t mode = 0;

     

       115
       136
        
           if (open_needs_mode(flags)) {

     

       116
       137
        
               va_list ap;

     
···

       121
       142
        
           char buf[PATH_MAX];

     

       122
       143
        
           return openat_real(dirfd, rewrite(path, buf), flags, mode);

     

       123
       144
        
       }

     

       145
       145
       +
       WRAPPER_DEF(openat)

     

       124
       146
        
       

     

       125
       125
       -
       FILE * fopen(const char * path, const char * mode)

     

       147
       147
       +
       WRAPPER(FILE *, fopen)(const char * path, const char * mode)

     

       126
       148
        
       {

     

       127
       127
       -
           FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");

     

       149
       149
       +
           FILE * (*fopen_real) (const char *, const char *) = LOOKUP_REAL(fopen);

     

       128
       150
        
           char buf[PATH_MAX];

     

       129
       151
        
           return fopen_real(rewrite(path, buf), mode);

     

       130
       152
        
       }

     

       153
       153
       +
       WRAPPER_DEF(fopen)

     

       131
       154
        
       

     

       132
       132
       -
       FILE * __nss_files_fopen(const char * path)

     

       155
       155
       +
       #ifndef __APPLE__

     

       156
       156
       +
       WRAPPER(FILE *, __nss_files_fopen)(const char * path)

     

       133
       157
        
       {

     

       134
       134
       -
           FILE * (*__nss_files_fopen_real) (const char *) = dlsym(RTLD_NEXT, "__nss_files_fopen");

     

       158
       158
       +
           FILE * (*__nss_files_fopen_real) (const char *) = LOOKUP_REAL(__nss_files_fopen);

     

       135
       159
        
           char buf[PATH_MAX];

     

       136
       160
        
           return __nss_files_fopen_real(rewrite(path, buf));

     

       137
       161
        
       }

     

       162
       162
       +
       WRAPPER_DEF(__nss_files_fopen)

     

       163
       163
       +
       #endif

     

       138
       164
        
       

     

       139
       139
       -
       FILE * fopen64(const char * path, const char * mode)

     

       165
       165
       +
       #ifndef __APPLE__

     

       166
       166
       +
       WRAPPER(FILE *, fopen64)(const char * path, const char * mode)

     

       140
       167
        
       {

     

       141
       141
       -
           FILE * (*fopen64_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen64");

     

       168
       168
       +
           FILE * (*fopen64_real) (const char *, const char *) = LOOKUP_REAL(fopen64);

     

       142
       169
        
           char buf[PATH_MAX];

     

       143
       170
        
           return fopen64_real(rewrite(path, buf), mode);

     

       144
       171
        
       }

     

       172
       172
       +
       WRAPPER_DEF(fopen64)

     

       173
       173
       +
       #endif

     

       145
       174
        
       

     

       146
       146
       -
       int __xstat(int ver, const char * path, struct stat * st)

     

       175
       175
       +
       #ifndef __APPLE__

     

       176
       176
       +
       WRAPPER(int, __xstat)(int ver, const char * path, struct stat * st)

     

       147
       177
        
       {

     

       148
       148
       -
           int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat");

     

       178
       178
       +
           int (*__xstat_real) (int ver, const char *, struct stat *) = LOOKUP_REAL(__xstat);

     

       149
       179
        
           char buf[PATH_MAX];

     

       150
       180
        
           return __xstat_real(ver, rewrite(path, buf), st);

     

       151
       181
        
       }

     

       182
       182
       +
       WRAPPER_DEF(__xstat)

     

       183
       183
       +
       #endif

     

       152
       184
        
       

     

       153
       153
       -
       int __xstat64(int ver, const char * path, struct stat64 * st)

     

       185
       185
       +
       #ifndef __APPLE__

     

       186
       186
       +
       WRAPPER(int, __xstat64)(int ver, const char * path, struct stat64 * st)

     

       154
       187
        
       {

     

       155
       155
       -
           int (*__xstat64_real) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");

     

       188
       188
       +
           int (*__xstat64_real) (int ver, const char *, struct stat64 *) = LOOKUP_REAL(__xstat64);

     

       156
       189
        
           char buf[PATH_MAX];

     

       157
       190
        
           return __xstat64_real(ver, rewrite(path, buf), st);

     

       158
       191
        
       }

     

       192
       192
       +
       WRAPPER_DEF(__xstat64)

     

       193
       193
       +
       #endif

     

       159
       194
        
       

     

       160
       160
       -
       int stat(const char * path, struct stat * st)

     

       195
       195
       +
       WRAPPER(int, stat)(const char * path, struct stat * st)

     

       161
       196
        
       {

     

       162
       162
       -
           int (*__stat_real) (const char *, struct stat *) = dlsym(RTLD_NEXT, "stat");

     

       197
       197
       +
           int (*__stat_real) (const char *, struct stat *) = LOOKUP_REAL(stat);

     

       163
       198
        
           char buf[PATH_MAX];

     

       164
       199
        
           return __stat_real(rewrite(path, buf), st);

     

       165
       200
        
       }

     

       201
       201
       +
       WRAPPER_DEF(stat)

     

       166
       202
        
       

     

       167
       167
       -
       int access(const char * path, int mode)

     

       203
       203
       +
       WRAPPER(int, access)(const char * path, int mode)

     

       168
       204
        
       {

     

       169
       169
       -
           int (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");

     

       205
       205
       +
           int (*access_real) (const char *, int mode) = LOOKUP_REAL(access);

     

       170
       206
        
           char buf[PATH_MAX];

     

       171
       207
        
           return access_real(rewrite(path, buf), mode);

     

       172
       208
        
       }

     

       209
       209
       +
       WRAPPER_DEF(access)

     

       173
       210
        
       

     

       174
       174
       -
       int posix_spawn(pid_t * pid, const char * path,

     

       211
       211
       +
       WRAPPER(int, posix_spawn)(pid_t * pid, const char * path,

     

       175
       212
        
           const posix_spawn_file_actions_t * file_actions,

     

       176
       213
        
           const posix_spawnattr_t * attrp,

     

       177
       214
        
           char * const argv[], char * const envp[])

     
···

       179
       216
        
           int (*posix_spawn_real) (pid_t *, const char *,

     

       180
       217
        
               const posix_spawn_file_actions_t *,

     

       181
       218
        
               const posix_spawnattr_t *,

     

       182
       182
       -
               char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawn");

     

       219
       219
       +
               char * const argv[], char * const envp[]) = LOOKUP_REAL(posix_spawn);

     

       183
       220
        
           char buf[PATH_MAX];

     

       184
       221
        
           return posix_spawn_real(pid, rewrite(path, buf), file_actions, attrp, argv, envp);

     

       185
       222
        
       }

     

       223
       223
       +
       WRAPPER_DEF(posix_spawn)

     

       186
       224
        
       

     

       187
       187
       -
       int posix_spawnp(pid_t * pid, const char * file,

     

       225
       225
       +
       WRAPPER(int, posix_spawnp)(pid_t * pid, const char * file,

     

       188
       226
        
           const posix_spawn_file_actions_t * file_actions,

     

       189
       227
        
           const posix_spawnattr_t * attrp,

     

       190
       228
        
           char * const argv[], char * const envp[])

     
···

       192
       230
        
           int (*posix_spawnp_real) (pid_t *, const char *,

     

       193
       231
        
               const posix_spawn_file_actions_t *,

     

       194
       232
        
               const posix_spawnattr_t *,

     

       195
       195
       -
               char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "posix_spawnp");

     

       233
       233
       +
               char * const argv[], char * const envp[]) = LOOKUP_REAL(posix_spawnp);

     

       196
       234
        
           char buf[PATH_MAX];

     

       197
       235
        
           return posix_spawnp_real(pid, rewrite(file, buf), file_actions, attrp, argv, envp);

     

       198
       236
        
       }

     

       237
       237
       +
       WRAPPER_DEF(posix_spawnp)

     

       199
       238
        
       

     

       200
       200
       -
       int execv(const char * path, char * const argv[])

     

       239
       239
       +
       WRAPPER(int, execv)(const char * path, char * const argv[])

     

       201
       240
        
       {

     

       202
       202
       -
           int (*execv_real) (const char * path, char * const argv[]) = dlsym(RTLD_NEXT, "execv");

     

       241
       241
       +
           int (*execv_real) (const char * path, char * const argv[]) = LOOKUP_REAL(execv);

     

       203
       242
        
           char buf[PATH_MAX];

     

       204
       243
        
           return execv_real(rewrite(path, buf), argv);

     

       205
       244
        
       }

     

       245
       245
       +
       WRAPPER_DEF(execv)

     

       206
       246
        
       

     

       207
       207
       -
       int execvp(const char * path, char * const argv[])

     

       247
       247
       +
       WRAPPER(int, execvp)(const char * path, char * const argv[])

     

       208
       248
        
       {

     

       209
       209
       -
           int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");

     

       249
       249
       +
           int (*_execvp) (const char *, char * const argv[]) = LOOKUP_REAL(execvp);

     

       210
       250
        
           char buf[PATH_MAX];

     

       211
       251
        
           return _execvp(rewrite(path, buf), argv);

     

       212
       252
        
       }

     

       253
       253
       +
       WRAPPER_DEF(execvp)

     

       213
       254
        
       

     

       214
       214
       -
       int execve(const char * path, char * const argv[], char * const envp[])

     

       255
       255
       +
       WRAPPER(int, execve)(const char * path, char * const argv[], char * const envp[])

     

       215
       256
        
       {

     

       216
       216
       -
           int (*_execve) (const char *, char * const argv[], char * const envp[]) = dlsym(RTLD_NEXT, "execve");

     

       257
       257
       +
           int (*_execve) (const char *, char * const argv[], char * const envp[]) = LOOKUP_REAL(execve);

     

       217
       258
        
           char buf[PATH_MAX];

     

       218
       259
        
           return _execve(rewrite(path, buf), argv, envp);

     

       219
       260
        
       }

     

       261
       261
       +
       WRAPPER_DEF(execve)

     

       220
       262
        
       

     

       221
       221
       -
       DIR * opendir(const char * path)

     

       263
       263
       +
       WRAPPER(DIR *, opendir)(const char * path)

     

       222
       264
        
       {

     

       223
       265
        
           char buf[PATH_MAX];

     

       224
       224
       -
           DIR * (*_opendir) (const char*) = dlsym(RTLD_NEXT, "opendir");

     

       266
       266
       +
           DIR * (*_opendir) (const char*) = LOOKUP_REAL(opendir);

     

       225
       267
        
       

     

       226
       268
        
           return _opendir(rewrite(path, buf));

     

       227
       269
        
       }

     

       270
       270
       +
       WRAPPER_DEF(opendir)

     

       228
       271
        
       

     

       229
       272
        
       #define SYSTEM_CMD_MAX 512

     

       230
       273
        
       

     

       231
       231
       -
       char *replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) {

     

       274
       274
       +
       static char * replace_substring(char * source, char * buf, char * replace_string, char * start_ptr, char * suffix_ptr) {

     

       232
       275
        
           char head[SYSTEM_CMD_MAX] = {0};

     

       233
       276
        
           strncpy(head, source, start_ptr - source);

     

       234
       277
        
       

     
···

       241
       284
        
           return buf;

     

       242
       285
        
       }

     

       243
       286
        
       

     

       244
       244
       -
       char *replace_string(char * buf, char * from, char * to) {

     

       287
       287
       +
       static char * replace_string(char * buf, char * from, char * to) {

     

       245
       288
        
           int num_matches = 0;

     

       246
       289
        
           char * matches[SYSTEM_CMD_MAX];

     

       247
       290
        
           int from_len = strlen(from);

     
···

       264
       307
        
           return buf;

     

       265
       308
        
       }

     

       266
       309
        
       

     

       267
       267
       -
       void rewriteSystemCall(const char * command, char * buf) {

     

       268
       268
       -
           strcpy(buf, command);

     

       310
       310
       +
       static void rewriteSystemCall(const char * command, char * buf) {

     

       311
       311
       +
           char * p = buf;

     

       312
       312
       +
       

     

       313
       313
       +
           #ifdef __APPLE__

     

       314
       314
       +
           // The dyld environment variable is not inherited by the subprocess spawned

     

       315
       315
       +
           // by system(), so this hack redefines it.

     

       316
       316
       +
           Dl_info info;

     

       317
       317
       +
           dladdr(&rewriteSystemCall, &info);

     

       318
       318
       +
           p = stpcpy(p, "export DYLD_INSERT_LIBRARIES=");

     

       319
       319
       +
           p = stpcpy(p, info.dli_fname);

     

       320
       320
       +
           p = stpcpy(p, ";");

     

       321
       321
       +
           #endif

     

       322
       322
       +
       

     

       323
       323
       +
           stpcpy(p, command);

     

       324
       324
       +
       

     

       269
       325
        
           for (int n = 0; n < nrRedirects; ++n) {

     

       270
       326
        
              replace_string(buf, from[n], to[n]);

     

       271
       327
        
           }

     

       272
       328
        
       }

     

       273
       329
        
       

     

       274
       274
       -
       int system(const char *command)

     

       330
       330
       +
       WRAPPER(int, system)(const char *command)

     

       275
       331
        
       {

     

       276
       276
       -
           int (*_system) (const char*) = dlsym(RTLD_NEXT, "system");

     

       332
       332
       +
           int (*_system) (const char*) = LOOKUP_REAL(system);

     

       277
       333
        
       

     

       278
       334
        
           char newCommand[SYSTEM_CMD_MAX];

     

       279
       335
        
           rewriteSystemCall(command, newCommand);

     

       280
       336
        
           return _system(newCommand);

     

       281
       337
        
       }

     

       338
       338
       +
       WRAPPER_DEF(system)

     

       282
       339
        
       

     

       283
       283
       -
       int mkdir(const char *path, mode_t mode)

     

       340
       340
       +
       WRAPPER(int, mkdir)(const char *path, mode_t mode)

     

       284
       341
        
       {

     

       285
       285
       -
           int (*mkdir_real) (const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdir");

     

       342
       342
       +
           int (*mkdir_real) (const char *path, mode_t mode) = LOOKUP_REAL(mkdir);

     

       286
       343
        
           char buf[PATH_MAX];

     

       287
       344
        
           return mkdir_real(rewrite(path, buf), mode);

     

       288
       345
        
       }

     

       346
       346
       +
       WRAPPER_DEF(mkdir)

     

       289
       347
        
       

     

       290
       290
       -
       int mkdirat(int dirfd, const char *path, mode_t mode)

     

       348
       348
       +
       WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode)

     

       291
       349
        
       {

     

       292
       292
       -
           int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdirat");

     

       350
       350
       +
           int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = LOOKUP_REAL(mkdirat);

     

       293
       351
        
           char buf[PATH_MAX];

     

       294
       352
        
           return mkdirat_real(dirfd, rewrite(path, buf), mode);

     

       295
       353
        
       }

     

       354
       354
       +
       WRAPPER_DEF(mkdirat)

+2 -2

pkgs/data/icons/tela-icon-theme/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "tela-icon-theme";

     

       5
       5
       -
         version = "2021-10-08";

     

       5
       5
       +
         version = "2021-11-05";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vinceliuice";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-4h6c7asjUC7pqi4GkxCN13LOpVVbjBdvjUMN7sXAlNE=";

     

       11
       11
       +
           sha256 = "sha256-mvkgHBdZm6vF+/DS3CRLl1m14U0Lj4Xtz4J/vpJUTQM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 jdupes ];

+1 -1

pkgs/desktops/plasma-5/fetch.sh

···

       1
       1
       -
       WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.1/ -A '*.tar.xz' )

     

       1
       1
       +
       WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.2/ -A '*.tar.xz' )

+25

pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch

···

       1
       1
       +
       From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Thomas Tuegel <ttuegel@mailbox.org>

     

       3
       3
       +
       Date: Tue, 2 Nov 2021 05:59:34 -0500

     

       4
       4
       +
       Subject: [PATCH 2/3] cryfs path

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +-

     

       8
       8
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       11
       11
       +
       index 64138b6..1a9fde2 100644

     

       12
       12
       +
       --- a/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       13
       13
       +
       +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       14
       14
       +
       @@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const

     

       15
       15
       +
            auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);

     

       16
       16
       +
            KConfigGroup backendConfig(config, "CryfsBackend");

     

       17
       17
       +
        

     

       18
       18
       +
       -    return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});

     

       19
       19
       +
       +    return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}});

     

       20
       20
       +
        }

     

       21
       21
       +
        

     

       22
       22
       +
        } // namespace PlasmaVault

     

       23
       23
       +
       -- 

     

       24
       24
       +
       2.33.1

     

       25
       25
       +

+25

pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch

···

       1
       1
       +
       From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Thomas Tuegel <ttuegel@mailbox.org>

     

       3
       3
       +
       Date: Tue, 2 Nov 2021 06:00:32 -0500

     

       4
       4
       +
       Subject: [PATCH 3/3] fusermount path

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        kded/engine/fusebackend_p.cpp | 2 +-

     

       8
       8
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp

     

       11
       11
       +
       index 91f3523..1c19d88 100644

     

       12
       12
       +
       --- a/kded/engine/fusebackend_p.cpp

     

       13
       13
       +
       +++ b/kded/engine/fusebackend_p.cpp

     

       14
       14
       +
       @@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg

     

       15
       15
       +
        

     

       16
       16
       +
        QProcess *FuseBackend::fusermount(const QStringList &arguments) const

     

       17
       17
       +
        {

     

       18
       18
       +
       -    return process("fusermount", arguments, {});

     

       19
       19
       +
       +    return process(NIXPKGS_FUSERMOUNT, arguments, {});

     

       20
       20
       +
        }

     

       21
       21
       +
        

     

       22
       22
       +
        FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)

     

       23
       23
       +
       -- 

     

       24
       24
       +
       2.33.1

     

       25
       25
       +

-13

pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch

···

       1
       1
       -
       diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       2
       2
       -
       index 58a6929..7212980 100644

     

       3
       3
       -
       --- a/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       4
       4
       -
       +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp

     

       5
       5
       -
       @@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const

     

       6
       6
       -
            auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);

     

       7
       7
       -
            KConfigGroup backendConfig(config, "CryfsBackend");

     

       8
       8
       -
        

     

       9
       9
       -
       -    return process("cryfs",

     

       10
       10
       -
       +    return process(NIXPKGS_CRYFS,

     

       11
       11
       -
                           arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),

     

       12
       12
       -
                           { { "CRYFS_FRONTEND", "noninteractive" } });

     

       13
       13
       -
        }

+3 -3

pkgs/desktops/plasma-5/plasma-vault/default.nix

···

       18
       18
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       19
       19
        
       

     

       20
       20
        
         patches = [

     

       21
       21
       -
           ./encfs-path.patch

     

       22
       22
       -
           ./cryfs-path.patch

     

       23
       23
       -
           ./fusermount-path.patch

     

       21
       21
       +
           ./0001-encfs-path.patch

     

       22
       22
       +
           ./0002-cryfs-path.patch

     

       23
       23
       +
           ./0003-fusermount-path.patch

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [

+17 -5

pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch

···

       1
       1
       +
       From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Thomas Tuegel <ttuegel@mailbox.org>

     

       3
       3
       +
       Date: Tue, 2 Nov 2021 05:57:50 -0500

     

       4
       4
       +
       Subject: [PATCH 1/3] encfs path

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        kded/engine/backends/encfs/encfsbackend.cpp | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       1
       10
        
       diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp

     

       2
       2
       -
       index 628af7b..6edd38e 100644

     

       11
       11
       +
       index 2d15fa2..3f49867 100644

     

       3
       12
        
       --- a/kded/engine/backends/encfs/encfsbackend.cpp

     

       4
       13
        
       +++ b/kded/engine/backends/encfs/encfsbackend.cpp

     

       5
       5
       -
       @@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const

     

       14
       14
       +
       @@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const

     

       6
       15
        
            auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);

     

       7
       16
        
            KConfigGroup backendConfig(config, "EncfsBackend");

     

       8
       8
       -
       

     

       17
       17
       +
        

     

       9
       18
        
       -    return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});

     

       10
       19
        
       +    return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});

     

       11
       20
        
        }

     

       12
       12
       -
       

     

       21
       21
       +
        

     

       13
       22
        
        QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const

     

       14
       23
        
        {

     

       15
       24
        
       -    return process("encfsctl", arguments, {});

     

       16
       25
        
       +    return process(NIXPKGS_ENCFSCTL, arguments, {});

     

       17
       26
        
        }

     

       27
       27
       +
        

     

       28
       28
       +
        } // namespace PlasmaVault

     

       29
       29
       +
       -- 

     

       30
       30
       +
       2.33.1

     

       18
       31
        
       

     

       19
       19
       -
        } // namespace PlasmaVault

-18

pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch

···

       1
       1
       -
       diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp

     

       2
       2
       -
       index d07e313..ea7d81c 100644

     

       3
       3
       -
       --- a/kded/engine/fusebackend_p.cpp

     

       4
       4
       -
       +++ b/kded/engine/fusebackend_p.cpp

     

       5
       5
       -
       @@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,

     

       6
       6
       -
        

     

       7
       7
       -
        QProcess *FuseBackend::fusermount(const QStringList &arguments) const

     

       8
       8
       -
        {

     

       9
       9
       -
       -    return process("fusermount", arguments, {});

     

       10
       10
       -
       +    return process(NIXPKGS_FUSERMOUNT, arguments, {});

     

       11
       11
       -
        }

     

       12
       12
       -
        

     

       13
       13
       -
        

     

       14
       14
       -
       @@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const

     

       15
       15
       -
        }

     

       16
       16
       -
        

     

       17
       17
       -
        } // namespace PlasmaVault

     

       18
       18
       -
       -

+1 -7

pkgs/desktops/plasma-5/plasma-workspace/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib, fetchpatch,

     

       2
       2
       +
         mkDerivation, lib,

     

       3
       3
        
       

     

       4
       4
        
         extra-cmake-modules, kdoctools,

     

       5
       5
        
       

     
···

       53
       53
        
           ./0001-startkde.patch

     

       54
       54
        
           ./0002-absolute-wallpaper-install-dir.patch

     

       55
       55
        
           ./0003-startkde-unit-detection.patch

     

       56
       56
       -
           # Included in 5.23.2

     

       57
       57
       -
           (fetchpatch {

     

       58
       58
       -
             name = "ignore-placeholder-screens";

     

       59
       59
       -
             url = "https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1125.patch";

     

       60
       60
       -
             sha256 = "sha256-lvcAxb301lQbfEKPcxMlfap9g7TjHOk50ZYX91RC7gY=";

     

       61
       61
       -
           })

     

       62
       56
        
         ];

     

       63
       57
        
       

     

       64
       58
        
         # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools

+212 -212

pkgs/desktops/plasma-5/srcs.nix

···

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
         bluedevil = {

     

       7
       7
       -
           version = "5.23.1";

     

       7
       7
       +
           version = "5.23.2";

     

       8
       8
        
           src = fetchurl {

     

       9
       9
       -
             url = "${mirror}/stable/plasma/5.23.1/bluedevil-5.23.1.tar.xz";

     

       10
       10
       -
             sha256 = "1fxl1v27jk1hnxn7s9cqnw1h0pcghpyr2kxbqlx6fhnk0gp44gra";

     

       11
       11
       -
             name = "bluedevil-5.23.1.tar.xz";

     

       9
       9
       +
             url = "${mirror}/stable/plasma/5.23.2/bluedevil-5.23.2.tar.xz";

     

       10
       10
       +
             sha256 = "0whg8d95vm6zc4vzdlffyvm5kqhi5b501z3749zx743jx8r125nb";

     

       11
       11
       +
             name = "bluedevil-5.23.2.tar.xz";

     

       12
       12
        
           };

     

       13
       13
        
         };

     

       14
       14
        
         breeze = {

     

       15
       15
       -
           version = "5.23.1";

     

       15
       15
       +
           version = "5.23.2";

     

       16
       16
        
           src = fetchurl {

     

       17
       17
       -
             url = "${mirror}/stable/plasma/5.23.1/breeze-5.23.1.tar.xz";

     

       18
       18
       -
             sha256 = "108l31v692f0yp1chbgw7nfjxs9qqyxm491zwg5p1n27jdgxq4dc";

     

       19
       19
       -
             name = "breeze-5.23.1.tar.xz";

     

       17
       17
       +
             url = "${mirror}/stable/plasma/5.23.2/breeze-5.23.2.tar.xz";

     

       18
       18
       +
             sha256 = "1b2n0wcwfp96k76cmm8llr6cvdxvpb6h17r0r4rnl4ypg36i03sb";

     

       19
       19
       +
             name = "breeze-5.23.2.tar.xz";

     

       20
       20
        
           };

     

       21
       21
        
         };

     

       22
       22
        
         breeze-grub = {

     

       23
       23
       -
           version = "5.23.1";

     

       23
       23
       +
           version = "5.23.2";

     

       24
       24
        
           src = fetchurl {

     

       25
       25
       -
             url = "${mirror}/stable/plasma/5.23.1/breeze-grub-5.23.1.tar.xz";

     

       26
       26
       -
             sha256 = "1qmixw5q8i1inx65yn84sc44rbllffmjpzbbrxhjxazfa90kjh63";

     

       27
       27
       -
             name = "breeze-grub-5.23.1.tar.xz";

     

       25
       25
       +
             url = "${mirror}/stable/plasma/5.23.2/breeze-grub-5.23.2.tar.xz";

     

       26
       26
       +
             sha256 = "0zbych6hyfxjc4rl0m9nij6vgyg66s4b51vm5rjd9p0s6zhipzrl";

     

       27
       27
       +
             name = "breeze-grub-5.23.2.tar.xz";

     

       28
       28
        
           };

     

       29
       29
        
         };

     

       30
       30
        
         breeze-gtk = {

     

       31
       31
       -
           version = "5.23.1";

     

       31
       31
       +
           version = "5.23.2";

     

       32
       32
        
           src = fetchurl {

     

       33
       33
       -
             url = "${mirror}/stable/plasma/5.23.1/breeze-gtk-5.23.1.tar.xz";

     

       34
       34
       -
             sha256 = "11yjanh6m52sv717bma5m7is8mmz8raqf3i7xjgd9kiafdbp6rjh";

     

       35
       35
       -
             name = "breeze-gtk-5.23.1.tar.xz";

     

       33
       33
       +
             url = "${mirror}/stable/plasma/5.23.2/breeze-gtk-5.23.2.tar.xz";

     

       34
       34
       +
             sha256 = "1ays2z6gmy1yx4ka5fjcmymlvq67p2wjwijciw4ambx1bxz6s5ci";

     

       35
       35
       +
             name = "breeze-gtk-5.23.2.tar.xz";

     

       36
       36
        
           };

     

       37
       37
        
         };

     

       38
       38
        
         breeze-plymouth = {

     

       39
       39
       -
           version = "5.23.1";

     

       39
       39
       +
           version = "5.23.2";

     

       40
       40
        
           src = fetchurl {

     

       41
       41
       -
             url = "${mirror}/stable/plasma/5.23.1/breeze-plymouth-5.23.1.tar.xz";

     

       42
       42
       -
             sha256 = "0f4lxp4h2aji2gnrbplvs2xmwca0zcq3z1dm4fa31qy7ipr0b9qw";

     

       43
       43
       -
             name = "breeze-plymouth-5.23.1.tar.xz";

     

       41
       41
       +
             url = "${mirror}/stable/plasma/5.23.2/breeze-plymouth-5.23.2.tar.xz";

     

       42
       42
       +
             sha256 = "1lpri3rnfip9a24wrdm5b959l9lqkgk48l5ngisfly3619jz5aml";

     

       43
       43
       +
             name = "breeze-plymouth-5.23.2.tar.xz";

     

       44
       44
        
           };

     

       45
       45
        
         };

     

       46
       46
        
         discover = {

     

       47
       47
       -
           version = "5.23.1";

     

       47
       47
       +
           version = "5.23.2";

     

       48
       48
        
           src = fetchurl {

     

       49
       49
       -
             url = "${mirror}/stable/plasma/5.23.1/discover-5.23.1.tar.xz";

     

       50
       50
       -
             sha256 = "0wgfws2m5x2bgqcx8h50jhvgj98pmyywr5h3f560mxwd3admq9a4";

     

       51
       51
       -
             name = "discover-5.23.1.tar.xz";

     

       49
       49
       +
             url = "${mirror}/stable/plasma/5.23.2/discover-5.23.2.tar.xz";

     

       50
       50
       +
             sha256 = "0560qrq6c7hd29cjhxvl9qyn4a97vzp5hwgdlbzmrw6kcyjy83cy";

     

       51
       51
       +
             name = "discover-5.23.2.tar.xz";

     

       52
       52
        
           };

     

       53
       53
        
         };

     

       54
       54
        
         drkonqi = {

     

       55
       55
       -
           version = "5.23.1";

     

       55
       55
       +
           version = "5.23.2";

     

       56
       56
        
           src = fetchurl {

     

       57
       57
       -
             url = "${mirror}/stable/plasma/5.23.1/drkonqi-5.23.1.tar.xz";

     

       58
       58
       -
             sha256 = "19fksscf29lw4dvdf4s8z97q60yn77w35qmz298myw0n6cd9n1vk";

     

       59
       59
       -
             name = "drkonqi-5.23.1.tar.xz";

     

       57
       57
       +
             url = "${mirror}/stable/plasma/5.23.2/drkonqi-5.23.2.tar.xz";

     

       58
       58
       +
             sha256 = "0ilg9x2ipncsbjms2l97dd0vdnay4jpsrbvamvfavdffqvzibd9f";

     

       59
       59
       +
             name = "drkonqi-5.23.2.tar.xz";

     

       60
       60
        
           };

     

       61
       61
        
         };

     

       62
       62
        
         kactivitymanagerd = {

     

       63
       63
       -
           version = "5.23.1";

     

       63
       63
       +
           version = "5.23.2";

     

       64
       64
        
           src = fetchurl {

     

       65
       65
       -
             url = "${mirror}/stable/plasma/5.23.1/kactivitymanagerd-5.23.1.tar.xz";

     

       66
       66
       -
             sha256 = "02gaky1ibzfkv5gx6hpwksm06jb025k9hb7lqrbp5wbn2j5m3g7a";

     

       67
       67
       -
             name = "kactivitymanagerd-5.23.1.tar.xz";

     

       65
       65
       +
             url = "${mirror}/stable/plasma/5.23.2/kactivitymanagerd-5.23.2.tar.xz";

     

       66
       66
       +
             sha256 = "1y4bmwwakz9k9rkqslh1n9cnn4jvmrdc0hd760fqsf80z1v7k2dh";

     

       67
       67
       +
             name = "kactivitymanagerd-5.23.2.tar.xz";

     

       68
       68
        
           };

     

       69
       69
        
         };

     

       70
       70
        
         kde-cli-tools = {

     

       71
       71
       -
           version = "5.23.1";

     

       71
       71
       +
           version = "5.23.2";

     

       72
       72
        
           src = fetchurl {

     

       73
       73
       -
             url = "${mirror}/stable/plasma/5.23.1/kde-cli-tools-5.23.1.tar.xz";

     

       74
       74
       -
             sha256 = "1qm7s2zdvq4i8lry736npwfy95xkrhwi6zhmqlb5j21y9g2hh6ns";

     

       75
       75
       -
             name = "kde-cli-tools-5.23.1.tar.xz";

     

       73
       73
       +
             url = "${mirror}/stable/plasma/5.23.2/kde-cli-tools-5.23.2.tar.xz";

     

       74
       74
       +
             sha256 = "1zphp97g3mpz86h00d1blkj568dwfdgvl4jqx81v1s6p7dcr1wl7";

     

       75
       75
       +
             name = "kde-cli-tools-5.23.2.tar.xz";

     

       76
       76
        
           };

     

       77
       77
        
         };

     

       78
       78
        
         kdecoration = {

     

       79
       79
       -
           version = "5.23.1";

     

       79
       79
       +
           version = "5.23.2";

     

       80
       80
        
           src = fetchurl {

     

       81
       81
       -
             url = "${mirror}/stable/plasma/5.23.1/kdecoration-5.23.1.tar.xz";

     

       82
       82
       -
             sha256 = "09y3n2ifdkcpp21b15pw2k8jfqhwp19rwqyl31il5js36ymsx1qm";

     

       83
       83
       -
             name = "kdecoration-5.23.1.tar.xz";

     

       81
       81
       +
             url = "${mirror}/stable/plasma/5.23.2/kdecoration-5.23.2.tar.xz";

     

       82
       82
       +
             sha256 = "0p36grnjfnl71kqqrkvr18pr72mia81x8rnvnzb3r5abc5kbna6k";

     

       83
       83
       +
             name = "kdecoration-5.23.2.tar.xz";

     

       84
       84
        
           };

     

       85
       85
        
         };

     

       86
       86
        
         kde-gtk-config = {

     

       87
       87
       -
           version = "5.23.1";

     

       87
       87
       +
           version = "5.23.2";

     

       88
       88
        
           src = fetchurl {

     

       89
       89
       -
             url = "${mirror}/stable/plasma/5.23.1/kde-gtk-config-5.23.1.tar.xz";

     

       90
       90
       -
             sha256 = "0g2p6rnc6qij4mrbz955gpjsda6ck3g0y68rkkkm4849j72pinbx";

     

       91
       91
       -
             name = "kde-gtk-config-5.23.1.tar.xz";

     

       89
       89
       +
             url = "${mirror}/stable/plasma/5.23.2/kde-gtk-config-5.23.2.tar.xz";

     

       90
       90
       +
             sha256 = "0bwwlqnzdn2w9dsx64hlmy1rgc69549c89lqj0yj858prncb82d6";

     

       91
       91
       +
             name = "kde-gtk-config-5.23.2.tar.xz";

     

       92
       92
        
           };

     

       93
       93
        
         };

     

       94
       94
        
         kdeplasma-addons = {

     

       95
       95
       -
           version = "5.23.1";

     

       95
       95
       +
           version = "5.23.2";

     

       96
       96
        
           src = fetchurl {

     

       97
       97
       -
             url = "${mirror}/stable/plasma/5.23.1/kdeplasma-addons-5.23.1.tar.xz";

     

       98
       98
       -
             sha256 = "126rrj22431i1immbrvagndi36bfapxcyjrhy6q7qxlg8lwmmvl4";

     

       99
       99
       -
             name = "kdeplasma-addons-5.23.1.tar.xz";

     

       97
       97
       +
             url = "${mirror}/stable/plasma/5.23.2/kdeplasma-addons-5.23.2.tar.xz";

     

       98
       98
       +
             sha256 = "0jqbhkmq2w2q6my1vhw07j6lqxmcpb5cn5vaz7pl4ax8rqiy5i76";

     

       99
       99
       +
             name = "kdeplasma-addons-5.23.2.tar.xz";

     

       100
       100
        
           };

     

       101
       101
        
         };

     

       102
       102
        
         kgamma5 = {

     

       103
       103
       -
           version = "5.23.1";

     

       103
       103
       +
           version = "5.23.2";

     

       104
       104
        
           src = fetchurl {

     

       105
       105
       -
             url = "${mirror}/stable/plasma/5.23.1/kgamma5-5.23.1.tar.xz";

     

       106
       106
       -
             sha256 = "11d5qdhgxn51q7fs0jmaswxm68wygk7b38kj0f1h665fsc56sxfg";

     

       107
       107
       -
             name = "kgamma5-5.23.1.tar.xz";

     

       105
       105
       +
             url = "${mirror}/stable/plasma/5.23.2/kgamma5-5.23.2.tar.xz";

     

       106
       106
       +
             sha256 = "168pc6rnxbmwrkpsghfaqjvza0m3cnvzcvlr860lkp91vqqq32b6";

     

       107
       107
       +
             name = "kgamma5-5.23.2.tar.xz";

     

       108
       108
        
           };

     

       109
       109
        
         };

     

       110
       110
        
         khotkeys = {

     

       111
       111
       -
           version = "5.23.1";

     

       111
       111
       +
           version = "5.23.2";

     

       112
       112
        
           src = fetchurl {

     

       113
       113
       -
             url = "${mirror}/stable/plasma/5.23.1/khotkeys-5.23.1.tar.xz";

     

       114
       114
       -
             sha256 = "0kz8pgwrcrsqf6zsb3zyx7a4g43svdm7iq6jm9p0ncfjnrl0ks6s";

     

       115
       115
       -
             name = "khotkeys-5.23.1.tar.xz";

     

       113
       113
       +
             url = "${mirror}/stable/plasma/5.23.2/khotkeys-5.23.2.tar.xz";

     

       114
       114
       +
             sha256 = "1pd2p46cc955z1s34jccqw81ps07nl4q4s4qzra0i831j7xsa9ib";

     

       115
       115
       +
             name = "khotkeys-5.23.2.tar.xz";

     

       116
       116
        
           };

     

       117
       117
        
         };

     

       118
       118
        
         kinfocenter = {

     

       119
       119
       -
           version = "5.23.1";

     

       119
       119
       +
           version = "5.23.2";

     

       120
       120
        
           src = fetchurl {

     

       121
       121
       -
             url = "${mirror}/stable/plasma/5.23.1/kinfocenter-5.23.1.tar.xz";

     

       122
       122
       -
             sha256 = "01690mvak6i7c17ksfar8793c33y7x391pw5bfa0ggm428k8jbz1";

     

       123
       123
       -
             name = "kinfocenter-5.23.1.tar.xz";

     

       121
       121
       +
             url = "${mirror}/stable/plasma/5.23.2/kinfocenter-5.23.2.tar.xz";

     

       122
       122
       +
             sha256 = "0bgdgd0n68fb5kaqdqyng9fvf3mjparrnjdp246i68kkclci5nym";

     

       123
       123
       +
             name = "kinfocenter-5.23.2.tar.xz";

     

       124
       124
        
           };

     

       125
       125
        
         };

     

       126
       126
        
         kmenuedit = {

     

       127
       127
       -
           version = "5.23.1";

     

       127
       127
       +
           version = "5.23.2";

     

       128
       128
        
           src = fetchurl {

     

       129
       129
       -
             url = "${mirror}/stable/plasma/5.23.1/kmenuedit-5.23.1.tar.xz";

     

       130
       130
       -
             sha256 = "124imx7afbihdp3d10yap6ww9404b63va35h4hfsr5dglfmjfhpk";

     

       131
       131
       -
             name = "kmenuedit-5.23.1.tar.xz";

     

       129
       129
       +
             url = "${mirror}/stable/plasma/5.23.2/kmenuedit-5.23.2.tar.xz";

     

       130
       130
       +
             sha256 = "1jr25zdplndjhw8qb6c2xf255v73c85pcy7ps7x80g0y34pz2h1x";

     

       131
       131
       +
             name = "kmenuedit-5.23.2.tar.xz";

     

       132
       132
        
           };

     

       133
       133
        
         };

     

       134
       134
        
         kscreen = {

     

       135
       135
       -
           version = "5.23.1";

     

       135
       135
       +
           version = "5.23.2";

     

       136
       136
        
           src = fetchurl {

     

       137
       137
       -
             url = "${mirror}/stable/plasma/5.23.1/kscreen-5.23.1.tar.xz";

     

       138
       138
       -
             sha256 = "1j8z8dgp7l0iccyblnq5mf6xysaa17z0ljw9zwvq8ir57cnky55g";

     

       139
       139
       -
             name = "kscreen-5.23.1.tar.xz";

     

       137
       137
       +
             url = "${mirror}/stable/plasma/5.23.2/kscreen-5.23.2.tar.xz";

     

       138
       138
       +
             sha256 = "1wc0ydyi5vbm3mpjqrkcxjz22gsz2xzw3xw48161z9aikfhhn44v";

     

       139
       139
       +
             name = "kscreen-5.23.2.tar.xz";

     

       140
       140
        
           };

     

       141
       141
        
         };

     

       142
       142
        
         kscreenlocker = {

     

       143
       143
       -
           version = "5.23.1";

     

       143
       143
       +
           version = "5.23.2";

     

       144
       144
        
           src = fetchurl {

     

       145
       145
       -
             url = "${mirror}/stable/plasma/5.23.1/kscreenlocker-5.23.1.tar.xz";

     

       146
       146
       -
             sha256 = "0qxmmchl73s9ci0b8by5j6ik8aikwd1xcxyfxhp3fhav519i7i50";

     

       147
       147
       -
             name = "kscreenlocker-5.23.1.tar.xz";

     

       145
       145
       +
             url = "${mirror}/stable/plasma/5.23.2/kscreenlocker-5.23.2.tar.xz";

     

       146
       146
       +
             sha256 = "1yfqj5g7zvayah53pz0bgmmz8q8hd2rmk5ndzacfl7qrz3dxq2g6";

     

       147
       147
       +
             name = "kscreenlocker-5.23.2.tar.xz";

     

       148
       148
        
           };

     

       149
       149
        
         };

     

       150
       150
        
         ksshaskpass = {

     

       151
       151
       -
           version = "5.23.1";

     

       151
       151
       +
           version = "5.23.2";

     

       152
       152
        
           src = fetchurl {

     

       153
       153
       -
             url = "${mirror}/stable/plasma/5.23.1/ksshaskpass-5.23.1.tar.xz";

     

       154
       154
       -
             sha256 = "0azb195s2f068k2vj9piby36lh786gvkzvnnajzs74pmqpl8kay1";

     

       155
       155
       -
             name = "ksshaskpass-5.23.1.tar.xz";

     

       153
       153
       +
             url = "${mirror}/stable/plasma/5.23.2/ksshaskpass-5.23.2.tar.xz";

     

       154
       154
       +
             sha256 = "1icb5z7hnyrhh29krp5pgxm214w4lkq4k29laa8a1jryp3igqm1l";

     

       155
       155
       +
             name = "ksshaskpass-5.23.2.tar.xz";

     

       156
       156
        
           };

     

       157
       157
        
         };

     

       158
       158
        
         ksystemstats = {

     

       159
       159
       -
           version = "5.23.1";

     

       159
       159
       +
           version = "5.23.2";

     

       160
       160
        
           src = fetchurl {

     

       161
       161
       -
             url = "${mirror}/stable/plasma/5.23.1/ksystemstats-5.23.1.tar.xz";

     

       162
       162
       -
             sha256 = "0zkag07lhrz5d7bwhl4lyj2cxh0is9z8z9lavl1dmwfnjs86a0z6";

     

       163
       163
       -
             name = "ksystemstats-5.23.1.tar.xz";

     

       161
       161
       +
             url = "${mirror}/stable/plasma/5.23.2/ksystemstats-5.23.2.tar.xz";

     

       162
       162
       +
             sha256 = "0m1ijvqr5b09b4hmr81hi5wvf8d79vg36hkmq9r2digr76pf1ni4";

     

       163
       163
       +
             name = "ksystemstats-5.23.2.tar.xz";

     

       164
       164
        
           };

     

       165
       165
        
         };

     

       166
       166
        
         kwallet-pam = {

     

       167
       167
       -
           version = "5.23.1";

     

       167
       167
       +
           version = "5.23.2";

     

       168
       168
        
           src = fetchurl {

     

       169
       169
       -
             url = "${mirror}/stable/plasma/5.23.1/kwallet-pam-5.23.1.tar.xz";

     

       170
       170
       -
             sha256 = "02jycjh7l437f2r9a2861yd8j7ayy0f63qkda67703p4va412rk3";

     

       171
       171
       -
             name = "kwallet-pam-5.23.1.tar.xz";

     

       169
       169
       +
             url = "${mirror}/stable/plasma/5.23.2/kwallet-pam-5.23.2.tar.xz";

     

       170
       170
       +
             sha256 = "105dpcb6zskqkbnhd5sl4igb0r87dza383m0qqffqfriwvjf9v6z";

     

       171
       171
       +
             name = "kwallet-pam-5.23.2.tar.xz";

     

       172
       172
        
           };

     

       173
       173
        
         };

     

       174
       174
        
         kwayland-integration = {

     

       175
       175
       -
           version = "5.23.1";

     

       175
       175
       +
           version = "5.23.2";

     

       176
       176
        
           src = fetchurl {

     

       177
       177
       -
             url = "${mirror}/stable/plasma/5.23.1/kwayland-integration-5.23.1.tar.xz";

     

       178
       178
       -
             sha256 = "0shdq4wrb2p7agc1ds6vm49g75bsizsmlwdikq5sqpgzbgv10dgp";

     

       179
       179
       -
             name = "kwayland-integration-5.23.1.tar.xz";

     

       177
       177
       +
             url = "${mirror}/stable/plasma/5.23.2/kwayland-integration-5.23.2.tar.xz";

     

       178
       178
       +
             sha256 = "0fchl5bjyn9vkj2rzqhlg3jzi2gp993l3c6skviyfqkvp3fq91bl";

     

       179
       179
       +
             name = "kwayland-integration-5.23.2.tar.xz";

     

       180
       180
        
           };

     

       181
       181
        
         };

     

       182
       182
        
         kwayland-server = {

     

       183
       183
       -
           version = "5.23.1";

     

       183
       183
       +
           version = "5.23.2";

     

       184
       184
        
           src = fetchurl {

     

       185
       185
       -
             url = "${mirror}/stable/plasma/5.23.1/kwayland-server-5.23.1.tar.xz";

     

       186
       186
       -
             sha256 = "0mwxllkqgmvr7lq0kkikndn68y6mxl9hmfm8kjmnq95zq5nimbgb";

     

       187
       187
       -
             name = "kwayland-server-5.23.1.tar.xz";

     

       185
       185
       +
             url = "${mirror}/stable/plasma/5.23.2/kwayland-server-5.23.2.tar.xz";

     

       186
       186
       +
             sha256 = "03cc0hm99gyr07kbk6vkqxs3nngsnl51smbpwg5rb3lycij38f1j";

     

       187
       187
       +
             name = "kwayland-server-5.23.2.tar.xz";

     

       188
       188
        
           };

     

       189
       189
        
         };

     

       190
       190
        
         kwin = {

     

       191
       191
       -
           version = "5.23.1";

     

       191
       191
       +
           version = "5.23.2";

     

       192
       192
        
           src = fetchurl {

     

       193
       193
       -
             url = "${mirror}/stable/plasma/5.23.1/kwin-5.23.1.tar.xz";

     

       194
       194
       -
             sha256 = "0ccbb41xsa257vabd17m3fx9h760izizgy9xrg9mpg5shjmxff2q";

     

       195
       195
       -
             name = "kwin-5.23.1.tar.xz";

     

       193
       193
       +
             url = "${mirror}/stable/plasma/5.23.2/kwin-5.23.2.tar.xz";

     

       194
       194
       +
             sha256 = "1fpq3r93lk0wmzckd8jkw4fcdggl75mjyj59j9ivijnb8an7vfpz";

     

       195
       195
       +
             name = "kwin-5.23.2.tar.xz";

     

       196
       196
        
           };

     

       197
       197
        
         };

     

       198
       198
        
         kwrited = {

     

       199
       199
       -
           version = "5.23.1";

     

       199
       199
       +
           version = "5.23.2";

     

       200
       200
        
           src = fetchurl {

     

       201
       201
       -
             url = "${mirror}/stable/plasma/5.23.1/kwrited-5.23.1.tar.xz";

     

       202
       202
       -
             sha256 = "16sg4mffwhpx5c2dp6zki9128zjpkcyjlm8nd8jdkcdq5ww4f4pk";

     

       203
       203
       -
             name = "kwrited-5.23.1.tar.xz";

     

       201
       201
       +
             url = "${mirror}/stable/plasma/5.23.2/kwrited-5.23.2.tar.xz";

     

       202
       202
       +
             sha256 = "1czaq3gzyb5v153626rxb54512nkhlpsypf4aghdr9c32n12vgd4";

     

       203
       203
       +
             name = "kwrited-5.23.2.tar.xz";

     

       204
       204
        
           };

     

       205
       205
        
         };

     

       206
       206
        
         layer-shell-qt = {

     

       207
       207
       -
           version = "5.23.1";

     

       207
       207
       +
           version = "5.23.2";

     

       208
       208
        
           src = fetchurl {

     

       209
       209
       -
             url = "${mirror}/stable/plasma/5.23.1/layer-shell-qt-5.23.1.tar.xz";

     

       210
       210
       -
             sha256 = "02lyzc93ymz5jr05sy5pf1aqyx098q3jhzxk28k6fslzxq327767";

     

       211
       211
       -
             name = "layer-shell-qt-5.23.1.tar.xz";

     

       209
       209
       +
             url = "${mirror}/stable/plasma/5.23.2/layer-shell-qt-5.23.2.tar.xz";

     

       210
       210
       +
             sha256 = "0pw9k1g7g5fjq6hkmri546pph1rycyay97gvw8ngzx67v0n9phlg";

     

       211
       211
       +
             name = "layer-shell-qt-5.23.2.tar.xz";

     

       212
       212
        
           };

     

       213
       213
        
         };

     

       214
       214
        
         libkscreen = {

     

       215
       215
       -
           version = "5.23.1";

     

       215
       215
       +
           version = "5.23.2";

     

       216
       216
        
           src = fetchurl {

     

       217
       217
       -
             url = "${mirror}/stable/plasma/5.23.1/libkscreen-5.23.1.tar.xz";

     

       218
       218
       -
             sha256 = "0hyh0j95i0xrbh07770axby3lqhmiclzxwx1bplmnpayymwdac1r";

     

       219
       219
       -
             name = "libkscreen-5.23.1.tar.xz";

     

       217
       217
       +
             url = "${mirror}/stable/plasma/5.23.2/libkscreen-5.23.2.tar.xz";

     

       218
       218
       +
             sha256 = "1shlw9wa01ilfhh57i6752mm62qjhj0w0q5qz6kvga3gmzmwp6sf";

     

       219
       219
       +
             name = "libkscreen-5.23.2.tar.xz";

     

       220
       220
        
           };

     

       221
       221
        
         };

     

       222
       222
        
         libksysguard = {

     

       223
       223
       -
           version = "5.23.1";

     

       223
       223
       +
           version = "5.23.2";

     

       224
       224
        
           src = fetchurl {

     

       225
       225
       -
             url = "${mirror}/stable/plasma/5.23.1/libksysguard-5.23.1.tar.xz";

     

       226
       226
       -
             sha256 = "12c1qy736036rfvk42pnb0z32sjqfk4x4069v7iycy4nd91xyg88";

     

       227
       227
       -
             name = "libksysguard-5.23.1.tar.xz";

     

       225
       225
       +
             url = "${mirror}/stable/plasma/5.23.2/libksysguard-5.23.2.tar.xz";

     

       226
       226
       +
             sha256 = "1knbik3r2bv11vzc17k9971bgrd7dsk9d7j4s5323schymmbzypq";

     

       227
       227
       +
             name = "libksysguard-5.23.2.tar.xz";

     

       228
       228
        
           };

     

       229
       229
        
         };

     

       230
       230
        
         milou = {

     

       231
       231
       -
           version = "5.23.1";

     

       231
       231
       +
           version = "5.23.2";

     

       232
       232
        
           src = fetchurl {

     

       233
       233
       -
             url = "${mirror}/stable/plasma/5.23.1/milou-5.23.1.tar.xz";

     

       234
       234
       -
             sha256 = "047z4dklk7hixk6m0xw2y2mhrdzmczz1ikhzvxnxhgmghm3w14cg";

     

       235
       235
       -
             name = "milou-5.23.1.tar.xz";

     

       233
       233
       +
             url = "${mirror}/stable/plasma/5.23.2/milou-5.23.2.tar.xz";

     

       234
       234
       +
             sha256 = "0nshc6bbbjyrs2sah1q0y5msrdhhrzz24fbgqvh871csb9lh3idz";

     

       235
       235
       +
             name = "milou-5.23.2.tar.xz";

     

       236
       236
        
           };

     

       237
       237
        
         };

     

       238
       238
        
         oxygen = {

     

       239
       239
       -
           version = "5.23.1";

     

       239
       239
       +
           version = "5.23.2";

     

       240
       240
        
           src = fetchurl {

     

       241
       241
       -
             url = "${mirror}/stable/plasma/5.23.1/oxygen-5.23.1.tar.xz";

     

       242
       242
       -
             sha256 = "0dxj1fr8p6dnlqwr5bs3f8s1g12vndapc8b07h6hzhcwi26wm81f";

     

       243
       243
       -
             name = "oxygen-5.23.1.tar.xz";

     

       241
       241
       +
             url = "${mirror}/stable/plasma/5.23.2/oxygen-5.23.2.tar.xz";

     

       242
       242
       +
             sha256 = "1k2bibgwdzwad87xyr31231b5jfk2m2x348layz41f3zl33mj1cp";

     

       243
       243
       +
             name = "oxygen-5.23.2.tar.xz";

     

       244
       244
        
           };

     

       245
       245
        
         };

     

       246
       246
        
         plasma-browser-integration = {

     

       247
       247
       -
           version = "5.23.1";

     

       247
       247
       +
           version = "5.23.2";

     

       248
       248
        
           src = fetchurl {

     

       249
       249
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-browser-integration-5.23.1.tar.xz";

     

       250
       250
       -
             sha256 = "1yaayy60dgj652rjzhh659anspw4cf7rqgmzdw471nzds3zpfr6x";

     

       251
       251
       -
             name = "plasma-browser-integration-5.23.1.tar.xz";

     

       249
       249
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-browser-integration-5.23.2.tar.xz";

     

       250
       250
       +
             sha256 = "08zf8qjcq538fg7zpw73qdcvp4a88vxvvm297y7gch37h9nrbmgg";

     

       251
       251
       +
             name = "plasma-browser-integration-5.23.2.tar.xz";

     

       252
       252
        
           };

     

       253
       253
        
         };

     

       254
       254
        
         plasma-desktop = {

     

       255
       255
       -
           version = "5.23.1";

     

       255
       255
       +
           version = "5.23.2.1";

     

       256
       256
        
           src = fetchurl {

     

       257
       257
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-desktop-5.23.1.tar.xz";

     

       258
       258
       -
             sha256 = "102fkhmh33xw7w2sq20d5v4576apyqp9dwh8v3nwd8vfjbq6lv7f";

     

       259
       259
       -
             name = "plasma-desktop-5.23.1.tar.xz";

     

       257
       257
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-desktop-5.23.2.1.tar.xz";

     

       258
       258
       +
             sha256 = "0d2r6bxj04078acdlv6dzvy4jamcj1d49bafa4430hcqrxjy8scg";

     

       259
       259
       +
             name = "plasma-desktop-5.23.2.1.tar.xz";

     

       260
       260
        
           };

     

       261
       261
        
         };

     

       262
       262
        
         plasma-disks = {

     

       263
       263
       -
           version = "5.23.1";

     

       263
       263
       +
           version = "5.23.2";

     

       264
       264
        
           src = fetchurl {

     

       265
       265
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-disks-5.23.1.tar.xz";

     

       266
       266
       -
             sha256 = "11cssgdz4h9ln4738gphg544f9jmzmzax3chq1pp7dzk8cgh4fxq";

     

       267
       267
       -
             name = "plasma-disks-5.23.1.tar.xz";

     

       265
       265
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-disks-5.23.2.tar.xz";

     

       266
       266
       +
             sha256 = "0phv135v4jav17nb2f7cwvmcxk6sqr582jvw1y34vfphjgg8z3kw";

     

       267
       267
       +
             name = "plasma-disks-5.23.2.tar.xz";

     

       268
       268
        
           };

     

       269
       269
        
         };

     

       270
       270
        
         plasma-firewall = {

     

       271
       271
       -
           version = "5.23.1";

     

       271
       271
       +
           version = "5.23.2";

     

       272
       272
        
           src = fetchurl {

     

       273
       273
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-firewall-5.23.1.tar.xz";

     

       274
       274
       -
             sha256 = "066b36kxycffwmhgls51q8hpww06j2v2hcc9z4bzmix7jhpzkk0w";

     

       275
       275
       -
             name = "plasma-firewall-5.23.1.tar.xz";

     

       273
       273
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-firewall-5.23.2.tar.xz";

     

       274
       274
       +
             sha256 = "1h0zjzx7anhsbpx64q6pg3nh3w329nap3d1sqz5jg2iishql8jnz";

     

       275
       275
       +
             name = "plasma-firewall-5.23.2.tar.xz";

     

       276
       276
        
           };

     

       277
       277
        
         };

     

       278
       278
        
         plasma-integration = {

     

       279
       279
       -
           version = "5.23.1";

     

       279
       279
       +
           version = "5.23.2";

     

       280
       280
        
           src = fetchurl {

     

       281
       281
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-integration-5.23.1.tar.xz";

     

       282
       282
       -
             sha256 = "0wfbvp6r6nh7x8q4ddhf19bnkvlcspcxy2hjsb2nnr0nvs3k8aya";

     

       283
       283
       -
             name = "plasma-integration-5.23.1.tar.xz";

     

       281
       281
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-integration-5.23.2.tar.xz";

     

       282
       282
       +
             sha256 = "116hnkfwh4q1ssmayqjx1slam3fmhmdqwd89bc5rzhw0amf1vvy8";

     

       283
       283
       +
             name = "plasma-integration-5.23.2.tar.xz";

     

       284
       284
        
           };

     

       285
       285
        
         };

     

       286
       286
        
         plasma-nano = {

     

       287
       287
       -
           version = "5.23.1";

     

       287
       287
       +
           version = "5.23.2";

     

       288
       288
        
           src = fetchurl {

     

       289
       289
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-nano-5.23.1.tar.xz";

     

       290
       290
       -
             sha256 = "1ybd12jkw3sbcqzv8pqmkrvww1l73igb907zv457ha5rwy9hi60a";

     

       291
       291
       -
             name = "plasma-nano-5.23.1.tar.xz";

     

       289
       289
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-nano-5.23.2.tar.xz";

     

       290
       290
       +
             sha256 = "110d5qwlfg6jngxf19kqgzj0j8izqyqid0pvd10dwahp7sbsrq3q";

     

       291
       291
       +
             name = "plasma-nano-5.23.2.tar.xz";

     

       292
       292
        
           };

     

       293
       293
        
         };

     

       294
       294
        
         plasma-nm = {

     

       295
       295
       -
           version = "5.23.1";

     

       295
       295
       +
           version = "5.23.2";

     

       296
       296
        
           src = fetchurl {

     

       297
       297
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-nm-5.23.1.tar.xz";

     

       298
       298
       -
             sha256 = "0qsh5wrk97i9nxpp3la6fp6fvrk0f0gxh71nrzr0c9bc7307imfi";

     

       299
       299
       -
             name = "plasma-nm-5.23.1.tar.xz";

     

       297
       297
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-nm-5.23.2.tar.xz";

     

       298
       298
       +
             sha256 = "0pphzdm5ccl045jvzp83lrcscrhrng12a7sl3mjqa1ghzfbyg2x0";

     

       299
       299
       +
             name = "plasma-nm-5.23.2.tar.xz";

     

       300
       300
        
           };

     

       301
       301
        
         };

     

       302
       302
        
         plasma-pa = {

     

       303
       303
       -
           version = "5.23.1";

     

       303
       303
       +
           version = "5.23.2";

     

       304
       304
        
           src = fetchurl {

     

       305
       305
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-pa-5.23.1.tar.xz";

     

       306
       306
       -
             sha256 = "0zm5clsj9lfdv0v80g7bzb2cldcghaqn0d9nwywwrpmclmqik7x7";

     

       307
       307
       -
             name = "plasma-pa-5.23.1.tar.xz";

     

       305
       305
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-pa-5.23.2.tar.xz";

     

       306
       306
       +
             sha256 = "05f3hfvp387l968w1h8mwydzvm4kdvyyz1zvphpws8x2izwgjksn";

     

       307
       307
       +
             name = "plasma-pa-5.23.2.tar.xz";

     

       308
       308
        
           };

     

       309
       309
        
         };

     

       310
       310
        
         plasma-phone-components = {

     

       311
       311
       -
           version = "5.23.1";

     

       311
       311
       +
           version = "5.23.2";

     

       312
       312
        
           src = fetchurl {

     

       313
       313
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-phone-components-5.23.1.tar.xz";

     

       314
       314
       -
             sha256 = "174wvb5jrzsfmn09q4qspf3rdi5nr6faf2n1zc9p1dkwn67pkml2";

     

       315
       315
       -
             name = "plasma-phone-components-5.23.1.tar.xz";

     

       313
       313
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-phone-components-5.23.2.tar.xz";

     

       314
       314
       +
             sha256 = "1rfkxs3v37768fw51wm850smj75c3bcyl3xxl256kqm9rcb4n1gk";

     

       315
       315
       +
             name = "plasma-phone-components-5.23.2.tar.xz";

     

       316
       316
        
           };

     

       317
       317
        
         };

     

       318
       318
        
         plasma-sdk = {

     

       319
       319
       -
           version = "5.23.1";

     

       319
       319
       +
           version = "5.23.2";

     

       320
       320
        
           src = fetchurl {

     

       321
       321
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-sdk-5.23.1.tar.xz";

     

       322
       322
       -
             sha256 = "1sqywr9d6ghyyff713z1v45207ivddda5hxd7dzpxaf36nb3imq0";

     

       323
       323
       -
             name = "plasma-sdk-5.23.1.tar.xz";

     

       321
       321
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-sdk-5.23.2.tar.xz";

     

       322
       322
       +
             sha256 = "043qpvx6kwzpm80cqvr40y5dhw45ivb5qzc902jfc1288l3qgh1s";

     

       323
       323
       +
             name = "plasma-sdk-5.23.2.tar.xz";

     

       324
       324
        
           };

     

       325
       325
        
         };

     

       326
       326
        
         plasma-systemmonitor = {

     

       327
       327
       -
           version = "5.23.1";

     

       327
       327
       +
           version = "5.23.2";

     

       328
       328
        
           src = fetchurl {

     

       329
       329
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-systemmonitor-5.23.1.tar.xz";

     

       330
       330
       -
             sha256 = "1kqrkjz8iks5h737a6hpbb104gbaxangrwlzjfgi2h280j2288f8";

     

       331
       331
       -
             name = "plasma-systemmonitor-5.23.1.tar.xz";

     

       329
       329
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-systemmonitor-5.23.2.tar.xz";

     

       330
       330
       +
             sha256 = "0nsva84h46kx7hyv3qz2jmqgiw9mdglyxlhz3x1ywl0m4g91mgq7";

     

       331
       331
       +
             name = "plasma-systemmonitor-5.23.2.tar.xz";

     

       332
       332
        
           };

     

       333
       333
        
         };

     

       334
       334
        
         plasma-tests = {

     

       335
       335
       -
           version = "5.23.1";

     

       335
       335
       +
           version = "5.23.2";

     

       336
       336
        
           src = fetchurl {

     

       337
       337
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-tests-5.23.1.tar.xz";

     

       338
       338
       -
             sha256 = "1cnn9s9cw6p5aidbsj7ysarcp9jdlxpa54zm0gy9cxp5jbz4hypm";

     

       339
       339
       -
             name = "plasma-tests-5.23.1.tar.xz";

     

       337
       337
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-tests-5.23.2.tar.xz";

     

       338
       338
       +
             sha256 = "0b8mb39vgxlrrsllyq8x83ny4i302w0hs9dgbjg909fmwddlz3k3";

     

       339
       339
       +
             name = "plasma-tests-5.23.2.tar.xz";

     

       340
       340
        
           };

     

       341
       341
        
         };

     

       342
       342
        
         plasma-thunderbolt = {

     

       343
       343
       -
           version = "5.23.1";

     

       343
       343
       +
           version = "5.23.2";

     

       344
       344
        
           src = fetchurl {

     

       345
       345
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-thunderbolt-5.23.1.tar.xz";

     

       346
       346
       -
             sha256 = "138irsg1mqq31i9rn0ddrhbjym23c1r1w5y1mhrvaqwxqqd5yp0a";

     

       347
       347
       -
             name = "plasma-thunderbolt-5.23.1.tar.xz";

     

       345
       345
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-thunderbolt-5.23.2.tar.xz";

     

       346
       346
       +
             sha256 = "13h5ai0bq3nafsaa2bmgdsy10ychlqm8rnvfqypkx9y52jy9jcwc";

     

       347
       347
       +
             name = "plasma-thunderbolt-5.23.2.tar.xz";

     

       348
       348
        
           };

     

       349
       349
        
         };

     

       350
       350
        
         plasma-vault = {

     

       351
       351
       -
           version = "5.23.1";

     

       351
       351
       +
           version = "5.23.2";

     

       352
       352
        
           src = fetchurl {

     

       353
       353
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-vault-5.23.1.tar.xz";

     

       354
       354
       -
             sha256 = "0kwcbdm48pg907sah734xnknsa8azlpasxnj9xnagqi91kly5ay5";

     

       355
       355
       -
             name = "plasma-vault-5.23.1.tar.xz";

     

       353
       353
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-vault-5.23.2.tar.xz";

     

       354
       354
       +
             sha256 = "0d9iynky3fxsd6lr7db51aynjz7yz51n21brgwghld4dyfyh0hsf";

     

       355
       355
       +
             name = "plasma-vault-5.23.2.tar.xz";

     

       356
       356
        
           };

     

       357
       357
        
         };

     

       358
       358
        
         plasma-workspace = {

     

       359
       359
       -
           version = "5.23.1";

     

       359
       359
       +
           version = "5.23.2";

     

       360
       360
        
           src = fetchurl {

     

       361
       361
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz";

     

       362
       362
       -
             sha256 = "1bggh6xrlcxa5yh5398a2bhrgqnzv6hw6ifwws7wrkdkazw7kygv";

     

       363
       363
       -
             name = "plasma-workspace-5.23.1.tar.xz";

     

       361
       361
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-5.23.2.tar.xz";

     

       362
       362
       +
             sha256 = "0wivjcl5s6llsq8vhi2qiw6gj0a6vppaqvmd1qihpsxgrb763lnv";

     

       363
       363
       +
             name = "plasma-workspace-5.23.2.tar.xz";

     

       364
       364
        
           };

     

       365
       365
        
         };

     

       366
       366
        
         plasma-workspace-wallpapers = {

     

       367
       367
       -
           version = "5.23.1";

     

       367
       367
       +
           version = "5.23.2";

     

       368
       368
        
           src = fetchurl {

     

       369
       369
       -
             url = "${mirror}/stable/plasma/5.23.1/plasma-workspace-wallpapers-5.23.1.tar.xz";

     

       370
       370
       -
             sha256 = "1aplxn4kd48rc5p7x5218iscwlp2sr2sh5qyyl43z28fns0bh9pv";

     

       371
       371
       -
             name = "plasma-workspace-wallpapers-5.23.1.tar.xz";

     

       369
       369
       +
             url = "${mirror}/stable/plasma/5.23.2/plasma-workspace-wallpapers-5.23.2.tar.xz";

     

       370
       370
       +
             sha256 = "00aam10k8zmlzw0v9jv5k0gwcjizrvpcyd3nx8m3zyiv6b2jw1g9";

     

       371
       371
       +
             name = "plasma-workspace-wallpapers-5.23.2.tar.xz";

     

       372
       372
        
           };

     

       373
       373
        
         };

     

       374
       374
        
         plymouth-kcm = {

     

       375
       375
       -
           version = "5.23.1";

     

       375
       375
       +
           version = "5.23.2";

     

       376
       376
        
           src = fetchurl {

     

       377
       377
       -
             url = "${mirror}/stable/plasma/5.23.1/plymouth-kcm-5.23.1.tar.xz";

     

       378
       378
       -
             sha256 = "1fdsw7mfcfa90598981w2yb23nbwjqh9ncr8y0ab0l3i0qf8c727";

     

       379
       379
       -
             name = "plymouth-kcm-5.23.1.tar.xz";

     

       377
       377
       +
             url = "${mirror}/stable/plasma/5.23.2/plymouth-kcm-5.23.2.tar.xz";

     

       378
       378
       +
             sha256 = "1qgg2d5lrnv5g42ikjnyby3lkxm6iaa1kxw13sdzyv5s6234q7qp";

     

       379
       379
       +
             name = "plymouth-kcm-5.23.2.tar.xz";

     

       380
       380
        
           };

     

       381
       381
        
         };

     

       382
       382
        
         polkit-kde-agent = {

     

       383
       383
       -
           version = "1-5.23.1";

     

       383
       383
       +
           version = "1-5.23.2";

     

       384
       384
        
           src = fetchurl {

     

       385
       385
       -
             url = "${mirror}/stable/plasma/5.23.1/polkit-kde-agent-1-5.23.1.tar.xz";

     

       386
       386
       -
             sha256 = "0agmrd64jpvkiy4636hyi7cv9wrj7w6krqihz3d6fm84gqiifrj1";

     

       387
       387
       -
             name = "polkit-kde-agent-1-5.23.1.tar.xz";

     

       385
       385
       +
             url = "${mirror}/stable/plasma/5.23.2/polkit-kde-agent-1-5.23.2.tar.xz";

     

       386
       386
       +
             sha256 = "1fldyflcpwhjym9z3rsi90mfjan15w28gwd1s53kiy2fzvmvj0a0";

     

       387
       387
       +
             name = "polkit-kde-agent-1-5.23.2.tar.xz";

     

       388
       388
        
           };

     

       389
       389
        
         };

     

       390
       390
        
         powerdevil = {

     

       391
       391
       -
           version = "5.23.1";

     

       391
       391
       +
           version = "5.23.2";

     

       392
       392
        
           src = fetchurl {

     

       393
       393
       -
             url = "${mirror}/stable/plasma/5.23.1/powerdevil-5.23.1.tar.xz";

     

       394
       394
       -
             sha256 = "15n0xm2yzwinjs33iwgg3jln7ddrc3rvj4m97ya3j16bsqw5j6kj";

     

       395
       395
       -
             name = "powerdevil-5.23.1.tar.xz";

     

       393
       393
       +
             url = "${mirror}/stable/plasma/5.23.2/powerdevil-5.23.2.tar.xz";

     

       394
       394
       +
             sha256 = "0f6nhla8gsxil4i0f6np9vjs7f4hgikfw0m6zwp67qqlh9n83mxi";

     

       395
       395
       +
             name = "powerdevil-5.23.2.tar.xz";

     

       396
       396
        
           };

     

       397
       397
        
         };

     

       398
       398
        
         qqc2-breeze-style = {

     

       399
       399
       -
           version = "5.23.1";

     

       399
       399
       +
           version = "5.23.2";

     

       400
       400
        
           src = fetchurl {

     

       401
       401
       -
             url = "${mirror}/stable/plasma/5.23.1/qqc2-breeze-style-5.23.1.tar.xz";

     

       402
       402
       -
             sha256 = "087mqgs9gdrwykqncvm0vvwhrnl77qilp89gmcgkr44kdsnp5682";

     

       403
       403
       -
             name = "qqc2-breeze-style-5.23.1.tar.xz";

     

       401
       401
       +
             url = "${mirror}/stable/plasma/5.23.2/qqc2-breeze-style-5.23.2.tar.xz";

     

       402
       402
       +
             sha256 = "09bpvydpinqhc5vrx92fzw9ga6xynpvzxhwrq95dwdp3801kwkgy";

     

       403
       403
       +
             name = "qqc2-breeze-style-5.23.2.tar.xz";

     

       404
       404
        
           };

     

       405
       405
        
         };

     

       406
       406
        
         sddm-kcm = {

     

       407
       407
       -
           version = "5.23.1";

     

       407
       407
       +
           version = "5.23.2";

     

       408
       408
        
           src = fetchurl {

     

       409
       409
       -
             url = "${mirror}/stable/plasma/5.23.1/sddm-kcm-5.23.1.tar.xz";

     

       410
       410
       -
             sha256 = "0i40yj686dfrvkd78msczzh9ffslccnjgmwps29rz1fr8kvjj9mp";

     

       411
       411
       -
             name = "sddm-kcm-5.23.1.tar.xz";

     

       409
       409
       +
             url = "${mirror}/stable/plasma/5.23.2/sddm-kcm-5.23.2.tar.xz";

     

       410
       410
       +
             sha256 = "0xq9qyy56vhrwa0m4yvhp0all8m13jzhyhflc2y0d82cb4sn10yh";

     

       411
       411
       +
             name = "sddm-kcm-5.23.2.tar.xz";

     

       412
       412
        
           };

     

       413
       413
        
         };

     

       414
       414
        
         systemsettings = {

     

       415
       415
       -
           version = "5.23.1";

     

       415
       415
       +
           version = "5.23.2";

     

       416
       416
        
           src = fetchurl {

     

       417
       417
       -
             url = "${mirror}/stable/plasma/5.23.1/systemsettings-5.23.1.tar.xz";

     

       418
       418
       -
             sha256 = "0m3fvxr9l1whdgkd9i3wc2gw6yb12di59ihkdxnbbir5j4qm3m3w";

     

       419
       419
       -
             name = "systemsettings-5.23.1.tar.xz";

     

       417
       417
       +
             url = "${mirror}/stable/plasma/5.23.2/systemsettings-5.23.2.tar.xz";

     

       418
       418
       +
             sha256 = "0vr22bj0nwp55qximbdn47y4208nhybqiz8pc6fqr2hdg9582s8i";

     

       419
       419
       +
             name = "systemsettings-5.23.2.tar.xz";

     

       420
       420
        
           };

     

       421
       421
        
         };

     

       422
       422
        
         xdg-desktop-portal-kde = {

     

       423
       423
       -
           version = "5.23.1";

     

       423
       423
       +
           version = "5.23.2";

     

       424
       424
        
           src = fetchurl {

     

       425
       425
       -
             url = "${mirror}/stable/plasma/5.23.1/xdg-desktop-portal-kde-5.23.1.tar.xz";

     

       426
       426
       -
             sha256 = "1bpjq6nd7yc3az9zl13jq088jp2zbdgzqdaxl69wszzaq324qrpp";

     

       427
       427
       -
             name = "xdg-desktop-portal-kde-5.23.1.tar.xz";

     

       425
       425
       +
             url = "${mirror}/stable/plasma/5.23.2/xdg-desktop-portal-kde-5.23.2.tar.xz";

     

       426
       426
       +
             sha256 = "0ji02bscvdjcifibrjx5mk1ga91892hj3f6jcyiycd2xj4sqbcnf";

     

       427
       427
       +
             name = "xdg-desktop-portal-kde-5.23.2.tar.xz";

     

       428
       428
        
           };

     

       429
       429
        
         };

     

       430
       430
        
       }

+9 -2

pkgs/development/libraries/arrow-cpp/default.nix

···

       171
       171
        
               "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric"

     

       172
       172
        
               "TestCompareKernel.PrimitiveRandomTests"

     

       173
       173
        
             ] ++ lib.optionals enableS3 [

     

       174
       174
       +
               "S3OptionsTest.FromUri"

     

       175
       175
       +
               "S3RegionResolutionTest.NonExistentBucket"

     

       174
       176
        
               "S3RegionResolutionTest.PublicBucket"

     

       175
       177
        
               "S3RegionResolutionTest.RestrictedBucket"

     

       176
       176
       -
               "S3RegionResolutionTest.NonExistentBucket"

     

       177
       177
       -
               "S3OptionsTest.FromUri"

     

       178
       178
        
               "TestMinioServer.Connect"

     

       179
       179
       +
               "TestS3FS.OpenOutputStreamBackgroundWrites"

     

       180
       180
       +
               "TestS3FS.OpenOutputStreamDestructorBackgroundWrites"

     

       181
       181
       +
               "TestS3FS.OpenOutputStreamDestructorSyncWrite"

     

       182
       182
       +
               "TestS3FS.OpenOutputStreamDestructorSyncWrites"

     

       183
       183
       +
               "TestS3FS.OpenOutputStreamMetadata"

     

       184
       184
       +
               "TestS3FS.OpenOutputStreamSyncWrites"

     

       185
       185
       +
               "TestS3FSGeneric.*"

     

       179
       186
        
             ];

     

       180
       187
        
           in

     

       181
       188
        
           lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";

-5

pkgs/development/libraries/glibc/common.nix

···

       288
       288
        
       

     

       289
       289
        
       // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {

     

       290
       290
        
         preInstall = null; # clobber the native hook

     

       291
       291
       -
       

     

       292
       292
       -
         # To avoid a dependency on the build system 'bash'.

     

       293
       293
       -
         preFixup = ''

     

       294
       294
       -
           rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace}

     

       295
       295
       -
         '';

     

       296
       291
        
       })

+3 -3

pkgs/development/libraries/libvirt/default.nix

···

       70
       70
        
       in

     

       71
       71
        
       stdenv.mkDerivation rec {

     

       72
       72
        
         pname = "libvirt";

     

       73
       73
       -
         version = "7.8.0";

     

       73
       73
       +
         version = "7.9.0";

     

       74
       74
        
       

     

       75
       75
        
         src =

     

       76
       76
        
           if buildFromTarball then

     

       77
       77
        
             fetchurl

     

       78
       78
        
               {

     

       79
       79
        
                 url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";

     

       80
       80
       -
                 sha256 = "sha256-pyfNCke/ok+n3ih00j86n58Czra0m6FSiPbZoJixmSE=";

     

       80
       80
       +
                 sha256 = "sha256-gpzytfV0J5xA8ERuEWiBXT82uJcQVgJjyiznAlb3Low=";

     

       81
       81
        
               }

     

       82
       82
        
           else

     

       83
       83
        
             fetchFromGitLab

     
···

       85
       85
        
                 owner = pname;

     

       86
       86
        
                 repo = pname;

     

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

     

       88
       88
       -
                 sha256 = "sha256-/tSMJFgLPAiQXcZ2qZLM4XZqf96NtW3+zwKyrwGho2s=";

     

       88
       88
       +
                 sha256 = "sha256-Ua6+EKLES3385fqhH2+qwnwE+X/nmWqIBxCXXE3SVhs=";

     

       89
       89
        
                 fetchSubmodules = true;

     

       90
       90
        
               };

     

       91
       91

+1 -1

pkgs/development/libraries/simgear/default.nix

···

       23
       23
        
       

     

       24
       24
        
         meta = with lib; {

     

       25
       25
        
           description = "Simulation construction toolkit";

     

       26
       26
       -
           homepage = "https://gitorious.org/fg/simgear";

     

       26
       26
       +
           homepage = "https://wiki.flightgear.org/SimGear";

     

       27
       27
        
           maintainers = with maintainers; [ raskin ];

     

       28
       28
        
           platforms = platforms.linux;

     

       29
       29
        
           license = licenses.lgpl2;

+1 -1

pkgs/development/lua-modules/overrides.nix

···

       88
       88
        
           ];

     

       89
       89
        
         });

     

       90
       90
        
       

     

       91
       91
       -
         ljsyscall = prev.ljsyscall.overrideAttrs(oa: rec {

     

       91
       91
       +
         ljsyscall = prev.lib.overrideLuarocks prev.ljsyscall (drv: rec {

     

       92
       92
        
           version = "unstable-20180515";

     

       93
       93
        
           # package hasn't seen any release for a long time

     

       94
       94
        
           src = pkgs.fetchFromGitHub {

+40 -10

pkgs/development/python-modules/ansible-runner/default.nix

···

       8
       8
        
       , six

     

       9
       9
        
       , stdenv

     

       10
       10
        
       , ansible

     

       11
       11
       -
       , pytest

     

       12
       11
        
       , mock

     

       12
       12
       +
       , openssh

     

       13
       13
       +
       , pytest-mock

     

       14
       14
       +
       , pytest-timeout

     

       15
       15
       +
       , pytest-xdist

     

       16
       16
       +
       , pytestCheckHook

     

       13
       17
        
       }:

     

       14
       18
        
       

     

       15
       19
        
       buildPythonPackage rec {

     

       16
       20
        
         pname = "ansible-runner";

     

       17
       17
       -
         version = "2.0.2";

     

       21
       21
       +
         version = "2.0.3";

     

       18
       22
        
       

     

       19
       23
        
         src = fetchPypi {

     

       20
       24
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3";

     

       25
       25
       +
           sha256 = "15j0ljgw1rjxq4xiywxxxnxj4r6vwk8dwljkdsjmq3qmwgifcswg";

     

       22
       26
        
         };

     

       23
       27
        
       

     

       24
       24
       -
         checkInputs = [ pytest mock ];

     

       28
       28
       +
         checkInputs = [

     

       29
       29
       +
           ansible # required to place ansible CLI onto the PATH in tests

     

       30
       30
       +
           pytestCheckHook

     

       31
       31
       +
           pytest-mock

     

       32
       32
       +
           pytest-timeout

     

       33
       33
       +
           pytest-xdist

     

       34
       34
       +
           mock

     

       35
       35
       +
           openssh

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       25
       38
        
         propagatedBuildInputs = [

     

       26
       39
        
           ansible

     

       27
       40
        
           psutil

     
···

       31
       44
        
           six

     

       32
       45
        
         ];

     

       33
       46
        
       

     

       34
       34
       -
         # test_process_isolation_settings is currently broken on Darwin Catalina

     

       35
       35
       -
         # https://github.com/ansible/ansible-runner/issues/413

     

       36
       36
       -
         checkPhase = ''

     

       37
       37
       -
           HOME=$TMPDIR pytest \

     

       38
       38
       -
             --ignore test/unit/test_runner.py \

     

       39
       39
       -
             -k "not prepare ${lib.optionalString stdenv.isDarwin "and not process_isolation_settings"}"

     

       47
       47
       +
         preCheck = ''

     

       48
       48
       +
           export HOME=$(mktemp -d)

     

       40
       49
        
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         disabledTests = [

     

       52
       52
       +
           "test_callback_plugin_task_args_leak" # requires internet

     

       53
       53
       +
           "test_env_accuracy"

     

       54
       54
       +
           "test_large_stdout_blob" # times out on slower hardware

     

       55
       55
       +
         ]

     

       56
       56
       +
           # test_process_isolation_settings is currently broken on Darwin Catalina

     

       57
       57
       +
           # https://github.com/ansible/ansible-runner/issues/413

     

       58
       58
       +
         ++ lib.optional stdenv.isDarwin "process_isolation_settings";

     

       59
       59
       +
       

     

       60
       60
       +
         disabledTestPaths = [

     

       61
       61
       +
           # these tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918)

     

       62
       62
       +
           "test/integration/test_runner.py"

     

       63
       63
       +
           "test/unit/test_runner.py"

     

       64
       64
       +
         ]

     

       65
       65
       +
         ++ lib.optionals stdenv.isDarwin [

     

       66
       66
       +
           # integration tests on Darwin are not regularly passing in ansible-runner's own CI

     

       67
       67
       +
           "test/integration"

     

       68
       68
       +
           # these tests write to `/tmp` which is not writable on Darwin

     

       69
       69
       +
           "test/unit/config/test__base.py"

     

       70
       70
       +
         ];

     

       41
       71
        
       

     

       42
       72
        
         meta = with lib; {

     

       43
       73
        
           description = "Helps when interfacing with Ansible";

+2 -2

pkgs/development/python-modules/aws-sam-translator/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "aws-sam-translator";

     

       17
       17
       -
         version = "1.39.0";

     

       17
       17
       +
         version = "1.40.0";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "aws";

     

       21
       21
        
           repo = "serverless-application-model";

     

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

     

       23
       23
       -
           sha256 = "1a9m7zyqc414adw1i0sr2n9nlnmry0gi1ah1qna3yv9dx4ql9v9c";

     

       23
       23
       +
           sha256 = "sha256-jVJVoS7rc1RebBvihzmv6LvufMf/VvXOwj0TYkXBdmo=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+29 -5

pkgs/development/python-modules/devtools/default.nix

···

       1
       1
       -
       { buildPythonPackage, pythonOlder, fetchFromGitHub, lib, pygments

     

       2
       2
       -
       , pytestCheckHook, pytest-mock }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , asttokens

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , executing

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , pygments

     

       7
       7
       +
       , pytest-mock

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       }:

     

       3
       11
        
       

     

       4
       12
        
       buildPythonPackage rec {

     

       5
       13
        
         pname = "devtools";

     

       6
       14
        
         version = "0.8.0";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       7
       17
        
         disabled = pythonOlder "3.6";

     

       8
       18
        
       

     

       9
       19
        
         src = fetchFromGitHub {

     
···

       13
       23
        
           sha256 = "0yavcbxzxi1nfa1k326gsl03y8sadi5z5acamwd8b1bsiv15p757";

     

       14
       24
        
         };

     

       15
       25
        
       

     

       16
       16
       -
         propagatedBuildInputs = [ pygments ];

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           asttokens

     

       28
       28
       +
           executing

     

       29
       29
       +
           pygments

     

       30
       30
       +
         ];

     

       17
       31
        
       

     

       18
       18
       -
         checkInputs = [ pytestCheckHook pytest-mock ];

     

       32
       32
       +
         checkInputs = [

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
           pytest-mock

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         disabledTests = [

     

       38
       38
       +
           # Test for Windows32

     

       39
       39
       +
           "test_print_subprocess"

     

       40
       40
       +
         ];

     

       19
       41
        
       

     

       20
       20
       -
         pythonImportsCheck = [ "devtools" ];

     

       42
       42
       +
         pythonImportsCheck = [

     

       43
       43
       +
           "devtools"

     

       44
       44
       +
         ];

     

       21
       45
        
       

     

       22
       46
        
         meta = with lib; {

     

       23
       47
        
           description = "Python's missing debug print command and other development tools";

+11 -4

pkgs/development/python-modules/executing/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , asttokens

     

       2
       3
        
       , buildPythonPackage

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , setuptools-scm

     

       5
       5
       -
       , asttokens

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "executing";

     

       10
       10
       -
         version = "0.5.4";

     

       10
       10
       +
         version = "0.8.2";

     

       11
       11
       +
         format = "setuptools";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "alexmojaki";

     

       14
       15
        
           repo = pname;

     

       15
       16
        
           rev = "v${version}";

     

       16
       16
       -
           sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv";

     

       17
       17
       +
           sha256 = "sha256-CDZQ9DONn7M+2/GtmM2G6nQPpI9dOd0ca+2F1PGRwO4=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         nativeBuildInputs = [

     
···

       26
       27
        
       

     

       27
       28
        
         # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase

     

       28
       29
        
         # but crash with pytestCheckHook

     

       29
       29
       -
         checkInputs = [ asttokens ];

     

       30
       30
       +
         checkInputs = [

     

       31
       31
       +
           asttokens

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         pythonImportsCheck = [

     

       35
       35
       +
           "executing"

     

       36
       36
       +
         ];

     

       30
       37
        
       

     

       31
       38
        
         meta = with lib; {

     

       32
       39
        
           description = "Get information about what a frame is currently doing, particularly the AST node being executed";

+2 -2

pkgs/development/python-modules/libvirt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "libvirt";

     

       5
       5
       -
         version = "7.8.0";

     

       5
       5
       +
         version = "7.9.0";

     

       6
       6
        
       

     

       7
       7
        
         src = assert version == libvirt.version; fetchFromGitLab {

     

       8
       8
        
           owner = "libvirt";

     

       9
       9
        
           repo = "libvirt-python";

     

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

     

       11
       11
       -
           sha256 = "sha256-GuV++CFkywW0LGconyahfBGY+jjFA27Qu9JGIFt4bus=";

     

       11
       11
       +
           sha256 = "sha256-cfCyQ3KTv0lYTZMriUhm6psBAcJJIcmR/M9V/lrLmVE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkg-config ];

+10 -4

pkgs/development/tools/aws-sam-cli/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "aws-sam-cli";

     

       8
       8
       -
         version = "1.29.0";

     

       8
       8
       +
         version = "1.35.0";

     

       9
       9
        
       

     

       10
       10
        
         src = python3.pkgs.fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "sha256-JXphjERqY5Vj8j2F4Z7FrFJJEpBgK/5236pYfQRVdco=";

     

       12
       12
       +
           sha256 = "sha256-ojJoC8UuZDVm6CDmYbPoO0e+1QAYa0UcekYEd/MGFRM=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # Tests are not included in the PyPI package

     
···

       30
       30
        
           serverlessrepo

     

       31
       31
        
           tomlkit

     

       32
       32
        
           watchdog

     

       33
       33
       +
           typing-extensions

     

       34
       34
       +
           regex

     

       33
       35
        
         ];

     

       34
       36
        
       

     

       35
       37
        
         postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else ''

     
···

       42
       44
        
           substituteInPlace requirements/base.txt \

     

       43
       45
        
             --replace "click~=7.1" "click~=8.0" \

     

       44
       46
        
             --replace "Flask~=1.1.2" "Flask~=2.0" \

     

       45
       45
       -
             --replace "dateparser~=0.7" "dateparser>=0.7" \

     

       47
       47
       +
             --replace "dateparser~=1.0" "dateparser>=0.7" \

     

       46
       48
        
             --replace "docker~=4.2.0" "docker>=4.2.0" \

     

       47
       49
        
             --replace "requests==" "requests #" \

     

       48
       48
       -
             --replace "watchdog==" "watchdog #"

     

       50
       50
       +
             --replace "watchdog==" "watchdog #" \

     

       51
       51
       +
             --replace "aws_lambda_builders==" "aws-lambda-builders #" \

     

       52
       52
       +
             --replace "typing_extensions==" "typing-extensions #" \

     

       53
       53
       +
             --replace "regex==" "regex #" \

     

       54
       54
       +
             --replace "tzlocal==3.0" "tzlocal==2.*"

     

       49
       55
        
         '';

     

       50
       56
        
       

     

       51
       57
        
         meta = with lib; {

+2 -2

pkgs/development/tools/database/litestream/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "litestream";

     

       7
       7
       -
         version = "0.3.5";

     

       7
       7
       +
         version = "0.3.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "benbjohnson";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0=";

     

       13
       13
       +
           sha256 = "sha256-A1okmeX3njyRXFKcXJPSV7Hg8Q/P7WqpGz2HThDdUQo=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [

+8 -5

pkgs/development/tools/git-aggregator/default.nix

···

       1
       1
       -
       { git, lib, python3Packages }:

     

       1
       1
       +
       { lib, git, python3Packages }:

     

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "git-aggregator";

     

       5
       5
       -
         version = "1.8.1";

     

       5
       5
       +
         version = "2.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = python3Packages.fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           hash = "sha256-LLsyhyhPmOOvPzwEEJwkhrDfBMFueA7kuDlnrqwr08k=";

     

       9
       9
       +
           sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = with python3Packages; [

     

       13
       13
        
           setuptools-scm

     

       14
       14
        
         ];

     

       15
       15
       +
       

     

       15
       16
        
         propagatedBuildInputs = with python3Packages; [

     

       16
       17
        
           argcomplete

     

       17
       18
        
           colorama

     
···

       25
       26
        
         ];

     

       26
       27
        
       

     

       27
       28
        
         preCheck = ''

     

       28
       28
       -
           export HOME=`mktemp -d`

     

       29
       29
       +
           export HOME="$(mktemp -d)"

     

       29
       30
        
           git config --global user.name John

     

       30
       31
        
           git config --global user.email john@localhost

     

       32
       32
       +
           git config --global init.defaultBranch master

     

       33
       33
       +
           git config --global pull.rebase false

     

       31
       34
        
         '';

     

       32
       35
        
       

     

       33
       36
        
         meta = with lib; {

     

       34
       34
       -
           description = "Manage the aggregation of git branches from different remotes to build a consolidated one.";

     

       37
       37
       +
           description = "Manage the aggregation of git branches from different remotes to build a consolidated one";

     

       35
       38
        
           homepage = "https://github.com/acsone/git-aggregator";

     

       36
       39
        
           license = licenses.agpl3Plus;

     

       37
       40
        
           maintainers = with maintainers; [ lourkeur ];

+3 -3

pkgs/games/flightgear/default.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         version = "2020.3.8";

     

       9
       9
       +
         version = "2020.3.11";

     

       10
       10
        
         shortVersion = builtins.substring 0 6 version;

     

       11
       11
        
         data = stdenv.mkDerivation rec {

     

       12
       12
        
           pname = "flightgear-data";

     
···

       14
       14
        
       

     

       15
       15
        
           src = fetchurl {

     

       16
       16
        
             url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";

     

       17
       17
       -
             sha256 = "sha256-/KFumHRkmRvsU/L1i11jG/KbqobnOEP7l4lyPMKHycA=";

     

       17
       17
       +
             sha256 = "sha256-Ej8VGywPQiDw3VXodcpXpOw4qU9x+MBMWMrqwHfitVg=";

     

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
        
           dontUnpack = true;

     
···

       32
       32
        
       

     

       33
       33
        
         src = fetchurl {

     

       34
       34
        
           url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";

     

       35
       35
       -
           sha256 = "XXDqhZ9nR+FwQ3LauZe8iGxOjlyDXDrEtj61BQGVDYc=";

     

       35
       35
       +
           sha256 = "sha256-/icGx3B+pzq8URR3PeRfKYYasPj1NWVq8EKO0EnKSpc=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         # Of all the files in the source and data archives, there doesn't seem to be

+13 -7

pkgs/misc/wiki-tui/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchCrate, ncurses, openssl, pkg-config }:

     

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, nix-update-script, Security }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "wiki-tui";

     

       5
       5
       -
         version = "0.3.4";

     

       5
       5
       +
         version = "0.4.1";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchCrate {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-H+C1AbZ2zUhw6TNlSPaNaNuY5iNf39JW4q2g6uolevM=";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "Builditluc";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "sha256-aCfYb5UvlWbBvBlwNjVIbOJlEV2b3+FD0qKO+9h5Nos=";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       12
       -
         buildInputs = [ ncurses openssl ];

     

       14
       14
       +
         buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;

     

       13
       15
        
       

     

       14
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       15
       17
        
       

     

       16
       16
       -
         cargoSha256 = "sha256-PIt592nGtNEREQMukqRl/6KSJ/P32fWucHEMyOOc7BA=";

     

       18
       18
       +
         cargoSha256 = "sha256-dD8iC/b6KwElmq0RNdnHHC/jMWh7Q0/kMM+/zityHqQ=";

     

       19
       19
       +
       

     

       20
       20
       +
         passthru.updateScript = nix-update-script {

     

       21
       21
       +
           attrPath = pname;

     

       22
       22
       +
         };

     

       17
       23
        
       

     

       18
       24
        
         meta = with lib; {

     

       19
       25
        
           description = "A simple and easy to use Wikipedia Text User Interface";

+2 -2

pkgs/servers/owncast/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "owncast";

     

       5
       5
       -
         version = "0.0.9";

     

       5
       5
       +
         version = "0.0.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "owncast";

     

       9
       9
        
           repo = "owncast";

     

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

     

       11
       11
       -
           sha256 = "sha256-pJb11ifaiamp7P7d/xCwDKfOFufLmDDroUJPnWlTOkI=";

     

       11
       11
       +
           sha256 = "sha256-OcolQ4KnZbSgS1dpphbCML40jlheKAxbac7rjRul6Oc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-NARHYeOVT7sxfL1BdJc/CPCgHNZzjWE7kACJvrEC71Y=";

+2 -2

pkgs/tools/backup/partclone/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "partclone";

     

       7
       7
       -
         version = "0.3.17";

     

       7
       7
       +
         version = "0.3.18";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "Thomas-Tsai";

     

       11
       11
        
           repo = "partclone";

     

       12
       12
        
           rev = version;

     

       13
       13
       -
           sha256 = "sha256-tMdBo26JvHxbVI/Y2KDMejH+YT4IVx2H/y36u9ss0C8=";

     

       13
       13
       +
           sha256 = "sha256-cSxQJmuKm54AzIQbsEZhv/I8hfpaGroszdWqbRb3Ht4=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/tools/compression/crabz/default.nix

···

       29
       29
        
           Security

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       +
         # link System as a dylib instead of a framework on macos

     

       33
       33
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       34
       34
       +
           core_affinity=../$(stripHash $cargoDeps)/core_affinity

     

       35
       35
       +
           oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1)

     

       36
       36
       +
           substituteInPlace $core_affinity/src/lib.rs --replace framework dylib

     

       37
       37
       +
           substituteInPlace $core_affinity/.cargo-checksum.json \

     

       38
       38
       +
             --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1)

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       32
       41
        
         meta = with lib; {

     

       33
       42
        
           description = "A cross platform, fast, compression and decompression tool";

     

       34
       43
        
           homepage = "https://github.com/sstadick/crabz";

+2 -2

pkgs/tools/misc/fzf/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fzf";

     

       5
       5
       -
         version = "0.27.3";

     

       5
       5
       +
         version = "0.28.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "junegunn";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-uVGU8tOHHJYBoWTwx9ilnOKo49R0QHdCABKfGoL7Dkk=";

     

       11
       11
       +
           sha256 = "sha256-28Lu/WYIJWdLmSKX6C3w6F5NXXynPVwmmdH8PcDwC+Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0=";

-3

pkgs/tools/networking/vpnc/default.nix

···

       33
       33
        
       

     

       34
       34
        
           substituteInPlace "config.c" \

     

       35
       35
        
             --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script"

     

       36
       36
       -
       

     

       37
       37
       -
           substituteInPlace "pcf2vpnc" \

     

       38
       38
       -
             --replace "/usr/bin/perl" "${perl}/bin/perl"

     

       39
       36
        
         '';

     

       40
       37
        
       

     

       41
       38
        
         postInstall = ''

+3 -3

pkgs/tools/nix/statix/default.nix

···

       4
       4
        
         pname = "statix";

     

       5
       5
        
         # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix

     

       6
       6
        
         # the version can be found in flake.nix of the source code

     

       7
       7
       -
         version = "0.3.6";

     

       7
       7
       +
         version = "0.4.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "nerdypepper";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "sha256-fsEqPr+qtLNmTtxUxjcVDPoG7fjqFImnVHwscy2IBkE=";

     

       13
       13
       +
           sha256 = "sha256-wqkhtAOO6pKLjUUnDbVFwzm6mbXhP/4iJU7ZKtDKrE8=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         cargoSha256 = "sha256-7fSJhRqZh7lUIe8vVzIVx+1phd+Am+GNzKN62NSuOYs=";

     

       16
       16
       +
         cargoSha256 = "sha256-e20POz9ZvuT0S+YG+9x7hcudhXQpOR4rVSFJbz76OI0=";

     

       17
       17
        
       

     

       18
       18
        
         cargoBuildFlags = lib.optionals withJson [ "--features" "json" ];

     

       19
       19

+5 -3

pkgs/tools/package-management/nvd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "nvd";

     

       5
       5
       -
         version = "0.1.1";

     

       5
       5
       +
         version = "0.1.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "khumba";

     

       9
       9
        
           repo = pname;

     

       10
       10
       -
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "0accq0cw6qsxin1fb2bp2ijgjf9akb9qlivkykpfsgnk5qjafv2n";

     

       10
       10
       +
           # There is a 0.1.2 release but no tag yet

     

       11
       11
       +
           # https://gitlab.com/khumba/nvd/-/issues/7

     

       12
       12
       +
           rev = "13d3ab1255e0de03693cecb7da9764c9afd5d472";

     

       13
       13
       +
           sha256 = "1537s7j0m0hkahf0s1ai7bm94xj9fz6b9x78py0dn3cgnl9bfzla";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       16
        
         buildInputs = [ python3 ];

+2 -2

pkgs/tools/security/passff-host/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "passff-host";

     

       5
       5
       -
         version = "1.2.1";

     

       5
       5
       +
         version = "1.2.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "passff";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0ydfwvhgnw5c3ydx2gn5d7ys9g7cxlck57vfddpv6ix890v21451";

     

       11
       11
       +
           sha256 = "sha256-9q4onU/e/pzLp5lGQjf/ScOOCVMiMQRaLGEm8K8flX4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ python3 ];

pkgs/tools/wayland/wlogout/default.nix

···

       9
       9
        
       , libxkbcommon

     

       10
       10
        
       , wayland

     

       11
       11
        
       , wayland-protocols

     

       12
       12
       +
       , gtk-layer-shell

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       stdenv.mkDerivation rec {

     
···

       28
       29
        
           libxkbcommon

     

       29
       30
        
           wayland

     

       30
       31
        
           wayland-protocols

     

       32
       32
       +
           gtk-layer-shell

     

       31
       33
        
         ];

     

       32
       34
        
       

     

       33
       35
        
         postPatch = ''

+3 -1

pkgs/top-level/all-packages.nix

···

       33022
       33022
        
       

     

       33023
       33023
        
         wiki-js = callPackage ../servers/web-apps/wiki-js { };

     

       33024
       33024
        
       

     

       33025
       33025
       -
         wiki-tui = callPackage ../misc/wiki-tui { };

     

       33025
       33025
       +
         wiki-tui = callPackage ../misc/wiki-tui {

     

       33026
       33026
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       33027
       33027
       +
         };

     

       33026
       33028
        
       

     

       33027
       33029
        
         winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {

     

       33028
       33030
        
           callPackage = newScope self;

+3 -3

pkgs/top-level/perl-packages.nix

···

       20636
       20636
        
       

     

       20637
       20637
        
         SysVirt = buildPerlModule rec {

     

       20638
       20638
        
           pname = "Sys-Virt";

     

       20639
       20639
       -
           version = "7.8.0";

     

       20639
       20639
       +
           version = "7.9.0";

     

       20640
       20640
        
           src = fetchFromGitLab {

     

       20641
       20641
        
             owner = "libvirt";

     

       20642
       20642
        
             repo = "libvirt-perl";

     

       20643
       20643
       -
             rev = "v7.8.0";

     

       20644
       20644
       -
             sha256 = "sha256-D/sVIKMWy3WnDM97+ofG3ClgGhJJuK2a6NJLC03S4LI=";

     

       20643
       20643
       +
             rev = "v7.9.0";

     

       20644
       20644
       +
             sha256 = "sha256-QxY6TRVQWrN689CD76CQZeyXsDVWxk24N1v67DCvmDo=";

     

       20645
       20645
        
           };

     

       20646
       20646
        
           nativeBuildInputs = [ pkgs.pkg-config ];

     

       20647
       20647
        
           buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];