commit 529326e67909ea2b2dcc1661a37f08f702472c4a · pyrox.dev/nixpkgs

+4 -1

ci/OWNERS

···

       149
       149
        
       /nixos/modules/services/monitoring/amazon-cloudwatch-agent.nix @philipmw

     

       150
       150
        
       /nixos/tests/amazon-cloudwatch-agent.nix                       @philipmw

     

       151
       151
        
       

     

       152
       152
       +
       # Monitoring

     

       153
       153
       +
       /nixos/modules/services/monitoring/fluent-bit.nix @arianvp

     

       154
       154
       +
       /nixos/tests/fluent-bit.nix                       @arianvp

     

       155
       155
       +
       

     

       152
       156
        
       # nixos-rebuild-ng

     

       153
       157
        
       /pkgs/by-name/ni/nixos-rebuild-ng                 @thiagokokada

     

       154
       154
       -
       

     

       155
       158
        
       

     

       156
       159
        
       # Updaters

     

       157
       160
        
       ## update.nix

maintainers/maintainer-list.nix

···

       13694
       13694
        
           githubId = 10554636;

     

       13695
       13695
        
           name = "Braian A. Diez";

     

       13696
       13696
        
         };

     

       13697
       13697
       +
         linuxwhata = {

     

       13698
       13698
       +
           email = "linuxwhata@qq.com";

     

       13699
       13699
       +
           matrix = "@lwa:envs.net";

     

       13700
       13700
       +
           github = "linuxwhata";

     

       13701
       13701
       +
           githubId = 68576488;

     

       13702
       13702
       +
           name = "Zhou Ke";

     

       13703
       13703
       +
         };

     

       13697
       13704
        
         lionello = {

     

       13698
       13705
        
           email = "lio@lunesu.com";

     

       13699
       13706
        
           github = "lionello";

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

···

       116
       116
        
       

     

       117
       117
        
       - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).

     

       118
       118
        
       

     

       119
       119
       +
       - [Fluent Bit](https://github.com/fluent/fluent-bit), a fast Log, Metrics and Traces Processor and Forwarder. Available as [services.fluent-bit](#opt-services.fluent-bit.enable).

     

       120
       120
       +
       

     

       119
       121
        
       - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).

     

       120
       122
        
       

     

       121
       123
        
       - [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](options.html#opt-services.autotierfs.enable).

nixos/modules/module-list.nix

···

       934
       934
        
         ./services/monitoring/das_watchdog.nix

     

       935
       935
        
         ./services/monitoring/datadog-agent.nix

     

       936
       936
        
         ./services/monitoring/do-agent.nix

     

       937
       937
       +
         ./services/monitoring/fluent-bit.nix

     

       937
       938
        
         ./services/monitoring/fusion-inventory.nix

     

       938
       939
        
         ./services/monitoring/gatus.nix

     

       939
       940
        
         ./services/monitoring/gitwatch.nix

+103

nixos/modules/services/monitoring/fluent-bit.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         utils,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.services.fluent-bit;

     

       10
       10
       +
       

     

       11
       11
       +
         yamlFormat = pkgs.formats.yaml { };

     

       12
       12
       +
       in

     

       13
       13
       +
       {

     

       14
       14
       +
         options.services.fluent-bit = {

     

       15
       15
       +
           enable = lib.mkEnableOption "Fluent Bit";

     

       16
       16
       +
           package = lib.mkPackageOption pkgs "fluent-bit" { };

     

       17
       17
       +
           configurationFile = lib.mkOption {

     

       18
       18
       +
             type = lib.types.path;

     

       19
       19
       +
             default = yamlFormat.generate "fluent-bit.yaml" cfg.settings;

     

       20
       20
       +
             defaultText = lib.literalExpression ''yamlFormat.generate "fluent-bit.yaml" cfg.settings'';

     

       21
       21
       +
             description = ''

     

       22
       22
       +
               Fluent Bit configuration. See

     

       23
       23
       +
               <https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml>

     

       24
       24
       +
               for supported values.

     

       25
       25
       +
       

     

       26
       26
       +
               {option}`configurationFile` takes precedence over {option}`settings`.

     

       27
       27
       +
       

     

       28
       28
       +
               Note: Restricted evaluation blocks access to paths outside the Nix store.

     

       29
       29
       +
               This means detecting content changes for mutable paths (i.e. not input or content-addressed) can't be done.

     

       30
       30
       +
               As a result, `nixos-rebuild` won't reload/restart the systemd unit when mutable path contents change.

     

       31
       31
       +
               `systemctl restart fluent-bit.service` must be used instead.

     

       32
       32
       +
             '';

     

       33
       33
       +
             example = "/etc/fluent-bit/fluent-bit.yaml";

     

       34
       34
       +
           };

     

       35
       35
       +
           settings = lib.mkOption {

     

       36
       36
       +
             type = yamlFormat.type;

     

       37
       37
       +
             default = { };

     

       38
       38
       +
             description = ''

     

       39
       39
       +
               See {option}`configurationFile`.

     

       40
       40
       +
       

     

       41
       41
       +
               {option}`configurationFile` takes precedence over {option}`settings`.

     

       42
       42
       +
             '';

     

       43
       43
       +
             example = {

     

       44
       44
       +
               service = {

     

       45
       45
       +
                 grace = 30;

     

       46
       46
       +
               };

     

       47
       47
       +
               pipeline = {

     

       48
       48
       +
                 inputs = [

     

       49
       49
       +
                   {

     

       50
       50
       +
                     name = "systemd";

     

       51
       51
       +
                     systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service";

     

       52
       52
       +
                   }

     

       53
       53
       +
                 ];

     

       54
       54
       +
                 outputs = [

     

       55
       55
       +
                   {

     

       56
       56
       +
                     name = "file";

     

       57
       57
       +
                     path = "/var/log/fluent-bit";

     

       58
       58
       +
                     file = "fluent-bit.out";

     

       59
       59
       +
                   }

     

       60
       60
       +
                 ];

     

       61
       61
       +
               };

     

       62
       62
       +
             };

     

       63
       63
       +
           };

     

       64
       64
       +
           # See https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml/service-section.

     

       65
       65
       +
           graceLimit = lib.mkOption {

     

       66
       66
       +
             type = lib.types.nullOr (

     

       67
       67
       +
               lib.types.oneOf [

     

       68
       68
       +
                 lib.types.ints.positive

     

       69
       69
       +
                 lib.types.str

     

       70
       70
       +
               ]

     

       71
       71
       +
             );

     

       72
       72
       +
             default = null;

     

       73
       73
       +
             description = ''

     

       74
       74
       +
               The grace time limit. Sets the systemd unit's `TimeoutStopSec`.

     

       75
       75
       +
       

     

       76
       76
       +
               The `service.grace` option in the Fluent Bit configuration should be ≤ this option.

     

       77
       77
       +
             '';

     

       78
       78
       +
             example = 30;

     

       79
       79
       +
           };

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         config = lib.mkIf cfg.enable {

     

       83
       83
       +
           # See https://github.com/fluent/fluent-bit/blob/v3.2.6/init/systemd.in.

     

       84
       84
       +
           systemd.services.fluent-bit = {

     

       85
       85
       +
             description = "Fluent Bit";

     

       86
       86
       +
             after = [ "network.target" ];

     

       87
       87
       +
             requires = [ "network.target" ];

     

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

     

       89
       89
       +
             serviceConfig = {

     

       90
       90
       +
               DynamicUser = true;

     

       91
       91
       +
               # See https://nixos.org/manual/nixos/stable#sec-logging.

     

       92
       92
       +
               SupplementaryGroups = "systemd-journal";

     

       93
       93
       +
               ExecStart = utils.escapeSystemdExecArgs [

     

       94
       94
       +
                 (lib.getExe cfg.package)

     

       95
       95
       +
                 "--config"

     

       96
       96
       +
                 cfg.configurationFile

     

       97
       97
       +
               ];

     

       98
       98
       +
               Restart = "always";

     

       99
       99
       +
               TimeoutStopSec = lib.mkIf (cfg.graceLimit != null) cfg.graceLimit;

     

       100
       100
       +
             };

     

       101
       101
       +
           };

     

       102
       102
       +
         };

     

       103
       103
       +
       }

+24 -3

nixos/modules/services/monitoring/scrutiny.nix

···

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

     

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

     

       2
       2
        
       let

     

       3
       3
        
         inherit (lib) maintainers;

     

       4
       4
        
         inherit (lib.meta) getExe;

     

       5
       5
        
         inherit (lib.modules) mkIf mkMerge;

     

       6
       6
        
         inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption;

     

       7
       7
        
         inherit (lib.types) bool enum nullOr port str submodule;

     

       8
       8
       +
         inherit (utils) genJqSecretsReplacementSnippet;

     

       8
       9
        
       

     

       9
       10
        
         cfg = config.services.scrutiny;

     

       10
       11
        
         # Define the settings format used for this program

     
···

       36
       37
        
                 Scrutiny settings to be rendered into the configuration file.

     

       37
       38
        
       

     

       38
       39
        
                 See <https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml>.

     

       40
       40
       +
       

     

       41
       41
       +
                 Options containing secret data should be set to an attribute set

     

       42
       42
       +
                 containing the attribute `_secret`. This attribute should be a string

     

       43
       43
       +
                 or structured JSON with `quote = false;`, pointing to a file that

     

       44
       44
       +
                 contains the value the option should be set to.

     

       39
       45
        
               '';

     

       40
       46
        
               default = { };

     

       41
       47
        
               type = submodule {

     
···

       130
       136
        
                   Collector settings to be rendered into the collector configuration file.

     

       131
       137
        
       

     

       132
       138
        
                   See <https://github.com/AnalogJ/scrutiny/blob/master/example.collector.yaml>.

     

       139
       139
       +
       

     

       140
       140
       +
                   Options containing secret data should be set to an attribute set

     

       141
       141
       +
                   containing the attribute `_secret`. This attribute should be a string

     

       142
       142
       +
                   or structured JSON with `quote = false;`, pointing to a file that

     

       143
       143
       +
                   contains the value the option should be set to.

     

       133
       144
        
                 '';

     

       134
       145
        
                 default = { };

     

       135
       146
        
                 type = submodule {

     
···

       177
       188
        
                 SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db";

     

       178
       189
        
                 SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny";

     

       179
       190
        
               };

     

       191
       191
       +
               preStart = ''

     

       192
       192
       +
                 ${genJqSecretsReplacementSnippet cfg.settings "/run/scrutiny/config.yaml"}

     

       193
       193
       +
               '';

     

       180
       194
        
               postStart = ''

     

       181
       195
        
                 for i in $(seq 300); do

     

       182
       196
        
                     if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then

     
···

       191
       205
        
               '';

     

       192
       206
        
               serviceConfig = {

     

       193
       207
        
                 DynamicUser = true;

     

       194
       194
       -
                 ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}";

     

       208
       208
       +
                 ExecStart = "${getExe cfg.package} start --config /run/scrutiny/config.yaml";

     

       195
       209
        
                 Restart = "always";

     

       210
       210
       +
                 RuntimeDirectory = "scrutiny";

     

       211
       211
       +
                 RuntimeDirectoryMode = "0700";

     

       196
       212
        
                 StateDirectory = "scrutiny";

     

       197
       213
        
                 StateDirectoryMode = "0750";

     

       198
       214
        
               };

     
···

       216
       232
        
                   COLLECTOR_VERSION = "1";

     

       217
       233
        
                   COLLECTOR_API_ENDPOINT = cfg.collector.settings.api.endpoint;

     

       218
       234
        
                 };

     

       235
       235
       +
                 preStart = ''

     

       236
       236
       +
                   ${genJqSecretsReplacementSnippet cfg.collector.settings "/run/scrutiny-collector/config.yaml"}

     

       237
       237
       +
                 '';

     

       219
       238
        
                 serviceConfig = {

     

       220
       239
        
                   Type = "oneshot";

     

       221
       221
       -
                   ExecStart = "${getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}";

     

       240
       240
       +
                   ExecStart = "${getExe cfg.collector.package} run --config /run/scrutiny-collector/config.yaml";

     

       241
       241
       +
                   RuntimeDirectory = "scrutiny-collector";

     

       242
       242
       +
                   RuntimeDirectoryMode = "0700";

     

       222
       243
        
                 };

     

       223
       244
        
                 startAt = cfg.collector.schedule;

     

       224
       245
        
               };

+1 -1

nixos/modules/services/networking/vdirsyncer.nix

···

       45
       45
        
             }

     

       46
       46
        
             // (optionalAttrs (cfg'.user == null) {

     

       47
       47
        
               DynamicUser = true;

     

       48
       48
       +
               ProtectHome = true;

     

       48
       49
        
             })

     

       49
       50
        
             // (optionalAttrs (cfg'.additionalGroups != [ ]) {

     

       50
       51
        
               SupplementaryGroups = cfg'.additionalGroups;

     
···

       63
       64
        
             PrivateTmp = true;

     

       64
       65
        
             NoNewPrivileges = true;

     

       65
       66
        
             ProtectSystem = "strict";

     

       66
       66
       -
             ProtectHome = true;

     

       67
       67
        
             ProtectKernelTunables = true;

     

       68
       68
        
             ProtectKernelModules = true;

     

       69
       69
        
             ProtectControlGroups = true;

nixos/modules/services/security/paretosecurity.nix

···

       9
       9
        
         options.services.paretosecurity = {

     

       10
       10
        
           enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper";

     

       11
       11
        
           package = lib.mkPackageOption pkgs "paretosecurity" { };

     

       12
       12
       +
           trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         config = lib.mkIf config.services.paretosecurity.enable {

     
···

       36
       37
        
               ProtectHome = true;

     

       37
       38
        
               StandardOutput = "journal";

     

       38
       39
        
               StandardError = "journal";

     

       40
       40
       +
             };

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       43
       43
       +
           systemd.user.services."paretosecurity-trayicon" = lib.mkIf config.services.paretosecurity.trayIcon {

     

       44
       44
       +
             wantedBy = [ "graphical-session.target" ];

     

       45
       45
       +
             serviceConfig = {

     

       46
       46
       +
               ExecStart = "${config.services.paretosecurity.package}/bin/paretosecurity trayicon";

     

       39
       47
        
             };

     

       40
       48
        
           };

     

       41
       49

+3 -1

nixos/tests/all-tests.nix

···

       433
       433
        
           imports = [ ./firefox.nix ] ;

     

       434
       434
        
           _module.args.firefoxPackage = pkgs.floorp;

     

       435
       435
        
         };

     

       436
       436
       +
         fluent-bit = handleTest ./fluent-bit.nix {};

     

       436
       437
        
         fluentd = handleTest ./fluentd.nix {};

     

       437
       438
        
         fluidd = handleTest ./fluidd.nix {};

     

       438
       439
        
         fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};

     
···

       1051
       1052
        
         scaphandre = handleTest ./scaphandre.nix {};

     

       1052
       1053
        
         schleuder = handleTest ./schleuder.nix {};

     

       1053
       1054
        
         scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {};

     

       1054
       1054
       -
         scrutiny = handleTest ./scrutiny.nix {};

     

       1055
       1055
       +
         scrutiny = runTest ./scrutiny.nix;

     

       1055
       1056
        
         sddm = handleTest ./sddm.nix {};

     

       1056
       1057
        
         sdl3 = handleTest ./sdl3.nix { };

     

       1057
       1058
        
         seafile = handleTest ./seafile.nix {};

     
···

       1276
       1277
        
         vault-dev = handleTest ./vault-dev.nix {};

     

       1277
       1278
        
         vault-postgresql = handleTest ./vault-postgresql.nix {};

     

       1278
       1279
        
         vaultwarden = discoverTests (import ./vaultwarden.nix);

     

       1280
       1280
       +
         vdirsyncer = handleTest ./vdirsyncer.nix {};

     

       1279
       1281
        
         vector = handleTest ./vector {};

     

       1280
       1282
        
         velocity = runTest ./velocity.nix;

     

       1281
       1283
        
         vengi-tools = handleTest ./vengi-tools.nix {};

+40

nixos/tests/fluent-bit.nix

···

       1
       1
       +
       import ./make-test-python.nix (

     

       2
       2
       +
         { lib, pkgs, ... }:

     

       3
       3
       +
         {

     

       4
       4
       +
           name = "fluent-bit";

     

       5
       5
       +
       

     

       6
       6
       +
           nodes.machine =

     

       7
       7
       +
             { config, pkgs, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.fluent-bit = {

     

       10
       10
       +
                 enable = true;

     

       11
       11
       +
                 settings = {

     

       12
       12
       +
                   pipeline = {

     

       13
       13
       +
                     inputs = [

     

       14
       14
       +
                       {

     

       15
       15
       +
                         name = "systemd";

     

       16
       16
       +
                         systemd_filter = "_SYSTEMD_UNIT=fluent-bit.service";

     

       17
       17
       +
                       }

     

       18
       18
       +
                     ];

     

       19
       19
       +
                     outputs = [

     

       20
       20
       +
                       {

     

       21
       21
       +
                         name = "file";

     

       22
       22
       +
                         path = "/var/log/fluent-bit";

     

       23
       23
       +
                         file = "fluent-bit.out";

     

       24
       24
       +
                       }

     

       25
       25
       +
                     ];

     

       26
       26
       +
                   };

     

       27
       27
       +
                 };

     

       28
       28
       +
               };

     

       29
       29
       +
       

     

       30
       30
       +
               systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
           testScript = ''

     

       34
       34
       +
             start_all()

     

       35
       35
       +
       

     

       36
       36
       +
             machine.wait_for_unit("fluent-bit.service")

     

       37
       37
       +
             machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")

     

       38
       38
       +
           '';

     

       39
       39
       +
         }

     

       40
       40
       +
       )

+1 -1

nixos/tests/glance.nix

···

       40
       40
        
           machine_custom_port.wait_for_open_port(5678)

     

       41
       41
        
       

     

       42
       42
        
           soup = BeautifulSoup(machine_default.succeed("curl http://localhost:8080"))

     

       43
       43
       -
           expected_version = "${config.nodes.machine_default.services.glance.package.version}"

     

       43
       43
       +
           expected_version = "v${config.nodes.machine_default.services.glance.package.version}"

     

       44
       44
        
           assert any(a.text == expected_version for a in soup.select(".footer a"))

     

       45
       45
        
         '';

     

       46
       46

+47 -3

nixos/tests/paretosecurity.nix

···

       3
       3
        
         name = "paretosecurity";

     

       4
       4
        
         meta.maintainers = [ lib.maintainers.zupo ];

     

       5
       5
        
       

     

       6
       6
       -
         nodes.machine =

     

       6
       6
       +
         nodes.terminal =

     

       7
       7
        
           { config, pkgs, ... }:

     

       8
       8
        
           {

     

       9
       9
       +
             imports = [ ./common/user-account.nix ];

     

       10
       10
       +
       

     

       9
       11
        
             services.paretosecurity.enable = true;

     

       10
       12
        
           };

     

       11
       13
        
       

     

       14
       14
       +
         nodes.xfce =

     

       15
       15
       +
           { config, pkgs, ... }:

     

       16
       16
       +
           {

     

       17
       17
       +
             imports = [ ./common/user-account.nix ];

     

       18
       18
       +
       

     

       19
       19
       +
             services.paretosecurity = {

     

       20
       20
       +
               enable = true;

     

       21
       21
       +
               trayIcon = true;

     

       22
       22
       +
             };

     

       23
       23
       +
       

     

       24
       24
       +
             services.xserver.enable = true;

     

       25
       25
       +
             services.xserver.displayManager.lightdm.enable = true;

     

       26
       26
       +
             services.xserver.desktopManager.xfce.enable = true;

     

       27
       27
       +
       

     

       28
       28
       +
             services.displayManager.autoLogin = {

     

       29
       29
       +
               enable = true;

     

       30
       30
       +
               user = "alice";

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
             environment.systemPackages = [ pkgs.xdotool ];

     

       34
       34
       +
             environment.variables.XAUTHORITY = "/home/alice/.Xauthority";

     

       35
       35
       +
       

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
         enableOCR = true;

     

       39
       39
       +
       

     

       12
       40
        
         testScript = ''

     

       13
       13
       -
           (status, out) = machine.execute("paretosecurity check")

     

       14
       14
       -
           assert status == 1, "paretosecurity did not return 1 on failing checks"

     

       41
       41
       +
           terminal.succeed(

     

       42
       42
       +
             "su -- alice -c 'paretosecurity check"

     

       43
       43
       +
             # Disable some checks that need intricate test setup so that this test

     

       44
       44
       +
             # remains simple and fast. Tests for all checks and edge cases available

     

       45
       45
       +
             # at https://github.com/ParetoSecurity/agent/tree/main/test/integration

     

       46
       46
       +
             + " --skip c96524f2-850b-4bb9-abc7-517051b6c14e"  # SecureBoot

     

       47
       47
       +
             + " --skip 37dee029-605b-4aab-96b9-5438e5aa44d8"  # Screen lock

     

       48
       48
       +
             + " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb"  # Disk encryption

     

       49
       49
       +
             + " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e"  # Pareto Security is up to date

     

       50
       50
       +
             + " --skip f962c423-fdf5-428a-a57a-827abc9b253e"  # Password manager installed

     

       51
       51
       +
             + "'"

     

       52
       52
       +
           )

     

       53
       53
       +
       

     

       54
       54
       +
           xfce.wait_for_x()

     

       55
       55
       +
           xfce.succeed("xdotool mousemove 850 10")

     

       56
       56
       +
           xfce.wait_for_text("Pareto Security")

     

       57
       57
       +
           xfce.succeed("xdotool click 1")

     

       58
       58
       +
           xfce.wait_for_text("Run Checks")

     

       15
       59
        
         '';

     

       16
       60
        
       }

+85 -70

nixos/tests/scrutiny.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, ... }:

     

       1
       1
       +
       { lib, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "scrutiny";

     

       6
       6
       -
           meta.maintainers = with lib.maintainers; [ jnsgruk ];

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "scrutiny";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ jnsgruk ];

     

       7
       6
        
       

     

       8
       8
       -
           nodes = {

     

       9
       9
       -
             machine =

     

       10
       10
       -
               {

     

       11
       11
       -
                 self,

     

       12
       12
       -
                 pkgs,

     

       13
       13
       -
                 lib,

     

       14
       14
       -
                 ...

     

       15
       15
       -
               }:

     

       16
       16
       -
               {

     

       17
       17
       -
                 services = {

     

       18
       18
       -
                   scrutiny.enable = true;

     

       19
       19
       -
                   scrutiny.collector.enable = true;

     

       7
       7
       +
         nodes = {

     

       8
       8
       +
           machine =

     

       9
       9
       +
             {

     

       10
       10
       +
               self,

     

       11
       11
       +
               pkgs,

     

       12
       12
       +
               lib,

     

       13
       13
       +
               ...

     

       14
       14
       +
             }:

     

       15
       15
       +
             {

     

       16
       16
       +
               services = {

     

       17
       17
       +
                 scrutiny = {

     

       18
       18
       +
                   enable = true;

     

       19
       19
       +
                   settings = {

     

       20
       20
       +
                     notify.urls = [

     

       21
       21
       +
                       {

     

       22
       22
       +
                         _secret = pkgs.writeText "notify-script" "script://${pkgs.writeShellScript "touch-test-file" ''

     

       23
       23
       +
                           echo "HelloWorld" > /run/scrutiny/hello

     

       24
       24
       +
                         ''}";

     

       25
       25
       +
                       }

     

       26
       26
       +
                     ];

     

       27
       27
       +
                   };

     

       20
       28
        
                 };

     

       29
       29
       +
                 scrutiny.collector.enable = true;

     

       30
       30
       +
               };

     

       21
       31
        
       

     

       22
       22
       -
                 environment.systemPackages =

     

       23
       23
       -
                   let

     

       24
       24
       -
                     seleniumScript =

     

       25
       25
       -
                       pkgs.writers.writePython3Bin "selenium-script"

     

       26
       26
       -
                         {

     

       27
       27
       -
                           libraries = with pkgs.python3Packages; [ selenium ];

     

       28
       28
       -
                         }

     

       29
       29
       -
                         ''

     

       30
       30
       -
                           from selenium import webdriver

     

       31
       31
       -
                           from selenium.webdriver.common.by import By

     

       32
       32
       -
                           from selenium.webdriver.firefox.options import Options

     

       33
       33
       -
                           from selenium.webdriver.support.ui import WebDriverWait

     

       34
       34
       -
                           from selenium.webdriver.support import expected_conditions as EC

     

       32
       32
       +
               environment.systemPackages =

     

       33
       33
       +
                 let

     

       34
       34
       +
                   seleniumScript =

     

       35
       35
       +
                     pkgs.writers.writePython3Bin "selenium-script"

     

       36
       36
       +
                       {

     

       37
       37
       +
                         libraries = with pkgs.python3Packages; [ selenium ];

     

       38
       38
       +
                       }

     

       39
       39
       +
                       ''

     

       40
       40
       +
                         from selenium import webdriver

     

       41
       41
       +
                         from selenium.webdriver.common.by import By

     

       42
       42
       +
                         from selenium.webdriver.firefox.options import Options

     

       43
       43
       +
                         from selenium.webdriver.support.ui import WebDriverWait

     

       44
       44
       +
                         from selenium.webdriver.support import expected_conditions as EC

     

       45
       45
       +
       

     

       46
       46
       +
                         options = Options()

     

       47
       47
       +
                         options.add_argument("--headless")

     

       48
       48
       +
                         service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501

     

       35
       49
        
       

     

       36
       36
       -
                           options = Options()

     

       37
       37
       -
                           options.add_argument("--headless")

     

       38
       38
       -
                           service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501

     

       50
       50
       +
                         driver = webdriver.Firefox(options=options, service=service)

     

       51
       51
       +
                         driver.implicitly_wait(10)

     

       52
       52
       +
                         driver.get("http://localhost:8080/web/dashboard")

     

       39
       53
        
       

     

       40
       40
       -
                           driver = webdriver.Firefox(options=options, service=service)

     

       41
       41
       -
                           driver.implicitly_wait(10)

     

       42
       42
       -
                           driver.get("http://localhost:8080/web/dashboard")

     

       54
       54
       +
                         wait = WebDriverWait(driver, 10).until(

     

       55
       55
       +
                           EC.text_to_be_present_in_element(

     

       56
       56
       +
                             (By.TAG_NAME, "body"), "Drive health at a glance")

     

       57
       57
       +
                         )

     

       43
       58
        
       

     

       44
       44
       -
                           wait = WebDriverWait(driver, 10).until(

     

       45
       45
       -
                             EC.text_to_be_present_in_element(

     

       46
       46
       -
                               (By.TAG_NAME, "body"), "Drive health at a glance")

     

       47
       47
       -
                           )

     

       59
       59
       +
                         body_text = driver.find_element(By.TAG_NAME, "body").text

     

       60
       60
       +
                         assert "Temperature history for each device" in body_text

     

       48
       61
        
       

     

       49
       49
       -
                           body_text = driver.find_element(By.TAG_NAME, "body").text

     

       50
       50
       -
                           assert "Temperature history for each device" in body_text

     

       62
       62
       +
                         driver.close()

     

       63
       63
       +
                       '';

     

       64
       64
       +
                 in

     

       65
       65
       +
                 with pkgs;

     

       66
       66
       +
                 [

     

       67
       67
       +
                   curl

     

       68
       68
       +
                   firefox-unwrapped

     

       69
       69
       +
                   geckodriver

     

       70
       70
       +
                   seleniumScript

     

       71
       71
       +
                 ];

     

       72
       72
       +
             };

     

       73
       73
       +
         };

     

       74
       74
       +
         # This is the test code that will check if our service is running correctly:

     

       75
       75
       +
         testScript = ''

     

       76
       76
       +
           start_all()

     

       51
       77
        
       

     

       52
       52
       -
                           driver.close()

     

       53
       53
       -
                         '';

     

       54
       54
       -
                   in

     

       55
       55
       -
                   with pkgs;

     

       56
       56
       -
                   [

     

       57
       57
       -
                     curl

     

       58
       58
       -
                     firefox-unwrapped

     

       59
       59
       -
                     geckodriver

     

       60
       60
       -
                     seleniumScript

     

       61
       61
       -
                   ];

     

       62
       62
       -
               };

     

       63
       63
       -
           };

     

       64
       64
       -
           # This is the test code that will check if our service is running correctly:

     

       65
       65
       -
           testScript = ''

     

       66
       66
       -
             start_all()

     

       78
       78
       +
           # Wait for Scrutiny to be available

     

       79
       79
       +
           machine.wait_for_unit("scrutiny")

     

       80
       80
       +
           machine.wait_for_open_port(8080)

     

       67
       81
        
       

     

       68
       68
       -
             # Wait for Scrutiny to be available

     

       69
       69
       -
             machine.wait_for_unit("scrutiny")

     

       70
       70
       -
             machine.wait_for_open_port(8080)

     

       82
       82
       +
           # Ensure the API responds as we expect

     

       83
       83
       +
           output = machine.succeed("curl localhost:8080/api/health")

     

       84
       84
       +
           assert output == '{"success":true}'

     

       71
       85
        
       

     

       72
       72
       -
             # Ensure the API responds as we expect

     

       73
       73
       -
             output = machine.succeed("curl localhost:8080/api/health")

     

       74
       74
       -
             assert output == '{"success":true}'

     

       86
       86
       +
           # Start the collector service to send some metrics

     

       87
       87
       +
           collect = machine.succeed("systemctl start scrutiny-collector.service")

     

       75
       88
        
       

     

       76
       76
       -
             # Start the collector service to send some metrics

     

       77
       77
       -
             collect = machine.succeed("systemctl start scrutiny-collector.service")

     

       89
       89
       +
           # Ensure the application is actually rendered by the Javascript

     

       90
       90
       +
           machine.succeed("PYTHONUNBUFFERED=1 selenium-script")

     

       78
       91
        
       

     

       79
       79
       -
             # Ensure the application is actually rendered by the Javascript

     

       80
       80
       -
             machine.succeed("PYTHONUNBUFFERED=1 selenium-script")

     

       81
       81
       -
           '';

     

       82
       82
       -
         }

     

       83
       83
       -
       )

     

       92
       92
       +
           # Test notification and genJqSecretsReplacementSnippet

     

       93
       93
       +
           machine.succeed("curl -X POST http://localhost:8080/api/health/notify")

     

       94
       94
       +
           machine.wait_for_file("/run/scrutiny/hello")

     

       95
       95
       +
           output = machine.succeed("cat /run/scrutiny/hello")

     

       96
       96
       +
           assert "HelloWorld" in output

     

       97
       97
       +
         '';

     

       98
       98
       +
       }

+300

nixos/tests/vdirsyncer.nix

···

       1
       1
       +
       import ./make-test-python.nix (

     

       2
       2
       +
         { pkgs, lib, ... }:

     

       3
       3
       +
       

     

       4
       4
       +
         let

     

       5
       5
       +
       

     

       6
       6
       +
           radicale_calendars = {

     

       7
       7
       +
             type = "caldav";

     

       8
       8
       +
             url = "http://localhost:5232/";

     

       9
       9
       +
             # Radicale needs username/password.

     

       10
       10
       +
             username = "alice";

     

       11
       11
       +
             password = "password";

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           radicale_contacts = {

     

       15
       15
       +
             type = "carddav";

     

       16
       16
       +
             url = "http://localhost:5232/";

     

       17
       17
       +
             # Radicale needs username/password.

     

       18
       18
       +
             username = "alice";

     

       19
       19
       +
             password = "password";

     

       20
       20
       +
           };

     

       21
       21
       +
       

     

       22
       22
       +
           xandikos_calendars = {

     

       23
       23
       +
             type = "caldav";

     

       24
       24
       +
             url = "http://localhost:8080/user/calendars";

     

       25
       25
       +
             # Xandikos warns

     

       26
       26
       +
             # > No current-user-principal returned, re-using URL http://localhost:8080/user/calendars/

     

       27
       27
       +
             # but we do not need username/password.

     

       28
       28
       +
           };

     

       29
       29
       +
       

     

       30
       30
       +
           xandikos_contacts = {

     

       31
       31
       +
             type = "carddav";

     

       32
       32
       +
             url = "http://localhost:8080/user/contacts";

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           local_calendars = {

     

       36
       36
       +
             type = "filesystem";

     

       37
       37
       +
             path = "~/calendars";

     

       38
       38
       +
             fileext = ".ics";

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
           local_contacts = {

     

       42
       42
       +
             type = "filesystem";

     

       43
       43
       +
             path = "~/contacts";

     

       44
       44
       +
             fileext = ".vcf";

     

       45
       45
       +
           };

     

       46
       46
       +
       

     

       47
       47
       +
           mkPairs = a: b: {

     

       48
       48
       +
             calendars = {

     

       49
       49
       +
               a = "${a}_calendars";

     

       50
       50
       +
               b = "${b}_calendars";

     

       51
       51
       +
               collections = [

     

       52
       52
       +
                 "from a"

     

       53
       53
       +
                 "from b"

     

       54
       54
       +
               ];

     

       55
       55
       +
             };

     

       56
       56
       +
             contacts = {

     

       57
       57
       +
               a = "${a}_contacts";

     

       58
       58
       +
               b = "${b}_contacts";

     

       59
       59
       +
               collections = [

     

       60
       60
       +
                 "from a"

     

       61
       61
       +
                 "from b"

     

       62
       62
       +
               ];

     

       63
       63
       +
             };

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
           mkRadicaleProps =

     

       67
       67
       +
             tag:

     

       68
       68
       +
             pkgs.writeText "Radicale.props" (

     

       69
       69
       +
               builtins.toJSON {

     

       70
       70
       +
                 inherit tag;

     

       71
       71
       +
               }

     

       72
       72
       +
             );

     

       73
       73
       +
       

     

       74
       74
       +
           writeLines =

     

       75
       75
       +
             name: eol: lines:

     

       76
       76
       +
             pkgs.writeText name (lib.concatMapStrings (l: "${l}${eol}") lines);

     

       77
       77
       +
       

     

       78
       78
       +
           prodid = "-//NixOS test//EN";

     

       79
       79
       +
           dtstamp = "20231129T194743Z";

     

       80
       80
       +
       

     

       81
       81
       +
           writeICS =

     

       82
       82
       +
             {

     

       83
       83
       +
               uid,

     

       84
       84
       +
               summary,

     

       85
       85
       +
               dtstart,

     

       86
       86
       +
               dtend,

     

       87
       87
       +
             }:

     

       88
       88
       +
             writeLines "${uid}.ics" "\r\n" [

     

       89
       89
       +
               "BEGIN:VCALENDAR"

     

       90
       90
       +
               "VERSION:2.0"

     

       91
       91
       +
               "PRODID:${prodid}"

     

       92
       92
       +
               "BEGIN:VEVENT"

     

       93
       93
       +
               "UID:${uid}"

     

       94
       94
       +
               "SUMMARY:${summary}"

     

       95
       95
       +
               "DTSTART:${dtstart}"

     

       96
       96
       +
               "DTEND:${dtend}"

     

       97
       97
       +
               "DTSTAMP:${dtstamp}"

     

       98
       98
       +
               "END:VEVENT"

     

       99
       99
       +
               "END:VCALENDAR"

     

       100
       100
       +
             ];

     

       101
       101
       +
       

     

       102
       102
       +
           foo_ics = writeICS {

     

       103
       103
       +
             uid = "foo";

     

       104
       104
       +
             summary = "Epochalypse";

     

       105
       105
       +
             dtstart = "19700101T000000Z";

     

       106
       106
       +
             dtend = "20380119T031407Z";

     

       107
       107
       +
           };

     

       108
       108
       +
       

     

       109
       109
       +
           bar_ics = writeICS {

     

       110
       110
       +
             uid = "bar";

     

       111
       111
       +
             summary = "One Billion Seconds";

     

       112
       112
       +
             dtstart = "19700101T000000Z";

     

       113
       113
       +
             dtend = "20010909T014640Z";

     

       114
       114
       +
           };

     

       115
       115
       +
       

     

       116
       116
       +
           writeVCF =

     

       117
       117
       +
             {

     

       118
       118
       +
               uid,

     

       119
       119
       +
               name,

     

       120
       120
       +
               displayName,

     

       121
       121
       +
               email,

     

       122
       122
       +
             }:

     

       123
       123
       +
             writeLines "${uid}.vcf" "\r\n" [

     

       124
       124
       +
               # One of the tools enforces this order of fields.

     

       125
       125
       +
               "BEGIN:VCARD"

     

       126
       126
       +
               "VERSION:4.0"

     

       127
       127
       +
               "UID:${uid}"

     

       128
       128
       +
               "EMAIL;TYPE=INTERNET:${email}"

     

       129
       129
       +
               "FN:${displayName}"

     

       130
       130
       +
               "N:${name}"

     

       131
       131
       +
               "END:VCARD"

     

       132
       132
       +
             ];

     

       133
       133
       +
       

     

       134
       134
       +
           foo_vcf = writeVCF {

     

       135
       135
       +
             uid = "foo";

     

       136
       136
       +
             name = "Doe;John;;;";

     

       137
       137
       +
             displayName = "John Doe";

     

       138
       138
       +
             email = "john.doe@example.org";

     

       139
       139
       +
           };

     

       140
       140
       +
       

     

       141
       141
       +
           bar_vcf = writeVCF {

     

       142
       142
       +
             uid = "bar";

     

       143
       143
       +
             name = "Doe;Jane;;;";

     

       144
       144
       +
             displayName = "Jane Doe";

     

       145
       145
       +
             email = "jane.doe@example.org";

     

       146
       146
       +
           };

     

       147
       147
       +
       

     

       148
       148
       +
         in

     

       149
       149
       +
         {

     

       150
       150
       +
           name = "vdirsyncer";

     

       151
       151
       +
       

     

       152
       152
       +
           meta.maintainers = with lib.maintainers; [ schnusch ];

     

       153
       153
       +
       

     

       154
       154
       +
           nodes = {

     

       155
       155
       +
             machine = {

     

       156
       156
       +
               services.radicale = {

     

       157
       157
       +
                 enable = true;

     

       158
       158
       +
                 settings.auth.type = "none";

     

       159
       159
       +
               };

     

       160
       160
       +
       

     

       161
       161
       +
               services.xandikos = {

     

       162
       162
       +
                 enable = true;

     

       163
       163
       +
                 extraOptions = [ "--autocreate" ];

     

       164
       164
       +
               };

     

       165
       165
       +
       

     

       166
       166
       +
               services.vdirsyncer = {

     

       167
       167
       +
                 enable = true;

     

       168
       168
       +
                 jobs = {

     

       169
       169
       +
       

     

       170
       170
       +
                   alice = {

     

       171
       171
       +
                     user = "alice";

     

       172
       172
       +
                     group = "users";

     

       173
       173
       +
                     config = {

     

       174
       174
       +
                       statusPath = "/home/alice/.vdirsyncer";

     

       175
       175
       +
                       storages = {

     

       176
       176
       +
                         inherit

     

       177
       177
       +
                           local_calendars

     

       178
       178
       +
                           local_contacts

     

       179
       179
       +
                           radicale_calendars

     

       180
       180
       +
                           radicale_contacts

     

       181
       181
       +
                           ;

     

       182
       182
       +
                       };

     

       183
       183
       +
                       pairs = mkPairs "local" "radicale";

     

       184
       184
       +
                     };

     

       185
       185
       +
                     forceDiscover = true;

     

       186
       186
       +
                   };

     

       187
       187
       +
       

     

       188
       188
       +
                   bob = {

     

       189
       189
       +
                     user = "bob";

     

       190
       190
       +
                     group = "users";

     

       191
       191
       +
                     config = {

     

       192
       192
       +
                       statusPath = "/home/bob/.vdirsyncer";

     

       193
       193
       +
                       storages = {

     

       194
       194
       +
                         inherit

     

       195
       195
       +
                           local_calendars

     

       196
       196
       +
                           local_contacts

     

       197
       197
       +
                           xandikos_calendars

     

       198
       198
       +
                           xandikos_contacts

     

       199
       199
       +
                           ;

     

       200
       200
       +
                       };

     

       201
       201
       +
                       pairs = mkPairs "local" "xandikos";

     

       202
       202
       +
                     };

     

       203
       203
       +
                     forceDiscover = true;

     

       204
       204
       +
                   };

     

       205
       205
       +
       

     

       206
       206
       +
                   remote = {

     

       207
       207
       +
                     config = {

     

       208
       208
       +
                       storages = {

     

       209
       209
       +
                         inherit

     

       210
       210
       +
                           radicale_calendars

     

       211
       211
       +
                           radicale_contacts

     

       212
       212
       +
                           xandikos_calendars

     

       213
       213
       +
                           xandikos_contacts

     

       214
       214
       +
                           ;

     

       215
       215
       +
                       };

     

       216
       216
       +
                       pairs = mkPairs "radicale" "xandikos";

     

       217
       217
       +
                     };

     

       218
       218
       +
                     forceDiscover = true;

     

       219
       219
       +
                   };

     

       220
       220
       +
       

     

       221
       221
       +
                 };

     

       222
       222
       +
               };

     

       223
       223
       +
       

     

       224
       224
       +
               users.users = {

     

       225
       225
       +
                 alice.isNormalUser = true;

     

       226
       226
       +
                 bob.isNormalUser = true;

     

       227
       227
       +
               };

     

       228
       228
       +
             };

     

       229
       229
       +
           };

     

       230
       230
       +
       

     

       231
       231
       +
           testScript = ''

     

       232
       232
       +
             def run_unit(name):

     

       233
       233
       +
                 machine.systemctl(f"start {name}")

     

       234
       234
       +
                 # The service is Type=oneshot without RemainAfterExit=yes. Once it

     

       235
       235
       +
                 # is finished it is no longer active and wait_for_unit will fail.

     

       236
       236
       +
                 # When that happens we check if it actually failed.

     

       237
       237
       +
                 try:

     

       238
       238
       +
                     machine.wait_for_unit(name)

     

       239
       239
       +
                 except:

     

       240
       240
       +
                     machine.fail(f"systemctl is-failed {name}")

     

       241
       241
       +
       

     

       242
       242
       +
             start_all()

     

       243
       243
       +
       

     

       244
       244
       +
             machine.wait_for_open_port(5232)

     

       245
       245
       +
             machine.wait_for_open_port(8080)

     

       246
       246
       +
             machine.wait_for_unit("multi-user.target")

     

       247
       247
       +
       

     

       248
       248
       +
             with subtest("alice -> radicale"):

     

       249
       249
       +
                 # vdirsyncer cannot create create collections on Radicale,

     

       250
       250
       +
                 # see https://vdirsyncer.pimutils.org/en/stable/tutorials/radicale.html

     

       251
       251
       +
                 machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VCALENDAR"} /var/lib/radicale/collections/collection-root/alice/foocal/.Radicale.props")

     

       252
       252
       +
                 machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VADDRESSBOOK"} /var/lib/radicale/collections/collection-root/alice/foocard/.Radicale.props")

     

       253
       253
       +
       

     

       254
       254
       +
                 machine.succeed("runuser -u alice -- install -Dm 644 ${foo_ics} /home/alice/calendars/foocal/foo.ics")

     

       255
       255
       +
                 machine.succeed("runuser -u alice -- install -Dm 644 ${foo_vcf} /home/alice/contacts/foocard/foo.vcf")

     

       256
       256
       +
                 run_unit("vdirsyncer@alice.service")

     

       257
       257
       +
       

     

       258
       258
       +
                 # test statusPath

     

       259
       259
       +
                 machine.succeed("test -d /home/alice/.vdirsyncer")

     

       260
       260
       +
                 machine.fail("test -e /var/lib/private/vdirsyncer/alice")

     

       261
       261
       +
       

     

       262
       262
       +
             with subtest("bob -> xandikos"):

     

       263
       263
       +
                 # I suspect Radicale shares the namespace for calendars and

     

       264
       264
       +
                 # contacts, but Xandikos separates them. We just use `barcal` and

     

       265
       265
       +
                 # `barcard` with Xandikos as well to avoid conflicts.

     

       266
       266
       +
                 machine.succeed("runuser -u bob -- install -Dm 644 ${bar_ics} /home/bob/calendars/barcal/bar.ics")

     

       267
       267
       +
                 machine.succeed("runuser -u bob -- install -Dm 644 ${bar_vcf} /home/bob/contacts/barcard/bar.vcf")

     

       268
       268
       +
                 run_unit("vdirsyncer@bob.service")

     

       269
       269
       +
       

     

       270
       270
       +
                 # test statusPath

     

       271
       271
       +
                 machine.succeed("test -d /home/bob/.vdirsyncer")

     

       272
       272
       +
                 machine.fail("test -e /var/lib/private/vdirsyncer/bob")

     

       273
       273
       +
       

     

       274
       274
       +
             with subtest("radicale <-> xandikos"):

     

       275
       275
       +
                 # vdirsyncer cannot create create collections on Radicale,

     

       276
       276
       +
                 # see https://vdirsyncer.pimutils.org/en/stable/tutorials/radicale.html

     

       277
       277
       +
                 machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VCALENDAR"} /var/lib/radicale/collections/collection-root/alice/barcal/.Radicale.props")

     

       278
       278
       +
                 machine.succeed("runuser -u radicale -- install -Dm 644 ${mkRadicaleProps "VADDRESSBOOK"} /var/lib/radicale/collections/collection-root/alice/barcard/.Radicale.props")

     

       279
       279
       +
       

     

       280
       280
       +
                 run_unit("vdirsyncer@remote.service")

     

       281
       281
       +
       

     

       282
       282
       +
                 # test statusPath

     

       283
       283
       +
                 machine.succeed("test -d /var/lib/private/vdirsyncer/remote")

     

       284
       284
       +
       

     

       285
       285
       +
             with subtest("radicale -> alice"):

     

       286
       286
       +
                 run_unit("vdirsyncer@alice.service")

     

       287
       287
       +
       

     

       288
       288
       +
             with subtest("xandikos -> bob"):

     

       289
       289
       +
                 run_unit("vdirsyncer@bob.service")

     

       290
       290
       +
       

     

       291
       291
       +
             with subtest("compare synced files"):

     

       292
       292
       +
                 # iCalendar files get reordered

     

       293
       293
       +
                 machine.succeed("diff -u --strip-trailing-cr <(sort /home/alice/calendars/foocal/foo.ics) <(sort /home/bob/calendars/foocal/foo.ics) >&2")

     

       294
       294
       +
                 machine.succeed("diff -u --strip-trailing-cr <(sort /home/bob/calendars/barcal/bar.ics) <(sort /home/alice/calendars/barcal/bar.ics) >&2")

     

       295
       295
       +
       

     

       296
       296
       +
                 machine.succeed("diff -u --strip-trailing-cr /home/alice/contacts/foocard/foo.vcf /home/bob/contacts/foocard/foo.vcf >&2")

     

       297
       297
       +
                 machine.succeed("diff -u --strip-trailing-cr /home/bob/contacts/barcard/bar.vcf /home/alice/contacts/barcard/bar.vcf >&2")

     

       298
       298
       +
           '';

     

       299
       299
       +
         }

     

       300
       300
       +
       )

+13

pkgs/applications/editors/vim/plugins/generated.nix

···

       5904
       5904
        
           meta.hydraPlatforms = [ ];

     

       5905
       5905
        
         };

     

       5906
       5906
        
       

     

       5907
       5907
       +
         houdini-nvim = buildVimPlugin {

     

       5908
       5908
       +
           pname = "houdini.nvim";

     

       5909
       5909
       +
           version = "2024-08-06";

     

       5910
       5910
       +
           src = fetchFromGitHub {

     

       5911
       5911
       +
             owner = "TheBlob42";

     

       5912
       5912
       +
             repo = "houdini.nvim";

     

       5913
       5913
       +
             rev = "1b7ec0a713a2aa9965848d8b93f66dc93716fd1c";

     

       5914
       5914
       +
             sha256 = "05np3p0lnsra6c6vx3h81vrba3nhwxrqb5l3qkdbx5bl58dds9bn";

     

       5915
       5915
       +
           };

     

       5916
       5916
       +
           meta.homepage = "https://github.com/TheBlob42/houdini.nvim";

     

       5917
       5917
       +
           meta.hydraPlatforms = [ ];

     

       5918
       5918
       +
         };

     

       5919
       5919
       +
       

     

       5907
       5920
        
         hover-nvim = buildVimPlugin {

     

       5908
       5921
        
           pname = "hover.nvim";

     

       5909
       5922
        
           version = "2024-12-11";

pkgs/applications/editors/vim/plugins/vim-plugin-names

···

       452
       452
        
       https://github.com/urbit/hoon.vim/,,

     

       453
       453
        
       https://github.com/smoka7/hop.nvim/,,

     

       454
       454
        
       https://github.com/rktjmp/hotpot.nvim/,,

     

       455
       455
       +
       https://github.com/TheBlob42/houdini.nvim/,HEAD,

     

       455
       456
        
       https://github.com/lewis6991/hover.nvim/,HEAD,

     

       456
       457
        
       https://github.com/othree/html5.vim/,HEAD,

     

       457
       458
        
       https://github.com/julienvincent/hunk.nvim/,HEAD,

+122

pkgs/applications/networking/cluster/rke2/1_29/images-versions.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "images-calico-linux-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "4b3743795b3fb431c53f183d43b004925ff06863bd95e9fbf3949c5c5092c7bd"

     

       5
       5
       +
         },

     

       6
       6
       +
         "images-calico-linux-amd64-tar-zst": {

     

       7
       7
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",

     

       8
       8
       +
           "sha256": "eca2ac2eda2fcaf055f54dfc1baf7f21a88f3454a84716d8d0f57574f2a36664"

     

       9
       9
       +
         },

     

       10
       10
       +
         "images-calico-linux-arm64-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",

     

       12
       12
       +
           "sha256": "d2baf446c4ec832bf870d57bc7cfd496de6bd1df3cc26b83ea7853a8e6e85de9"

     

       13
       13
       +
         },

     

       14
       14
       +
         "images-calico-linux-arm64-tar-zst": {

     

       15
       15
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",

     

       16
       16
       +
           "sha256": "18922628e7c9a9045b60393fe049a01ec2137b80b3312ea09735bce978ae88c8"

     

       17
       17
       +
         },

     

       18
       18
       +
         "images-canal-linux-amd64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",

     

       20
       20
       +
           "sha256": "351c2c73acc9a88869735430b604a60237122e778f5eb95c503530e8cc42d790"

     

       21
       21
       +
         },

     

       22
       22
       +
         "images-canal-linux-amd64-tar-zst": {

     

       23
       23
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",

     

       24
       24
       +
           "sha256": "a8b0825efd30f2e4ee0e82730d820b5ab0e2074b76d99a4662555726440a1542"

     

       25
       25
       +
         },

     

       26
       26
       +
         "images-canal-linux-arm64-tar-gz": {

     

       27
       27
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",

     

       28
       28
       +
           "sha256": "5a43dd70e1efac0ee0deeb5637b8fd8b19c4f70b5854d9af69dde7299c7315c0"

     

       29
       29
       +
         },

     

       30
       30
       +
         "images-canal-linux-arm64-tar-zst": {

     

       31
       31
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",

     

       32
       32
       +
           "sha256": "d42f6de81cc2a0ca8cb8716189c782c58de3ec7f6159ac240228755bfc586b4a"

     

       33
       33
       +
         },

     

       34
       34
       +
         "images-cilium-linux-amd64-tar-gz": {

     

       35
       35
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",

     

       36
       36
       +
           "sha256": "b8ead14a0c131f9a91997635670cb03191c4f4e4b14bee77fe0da0b9629d5b01"

     

       37
       37
       +
         },

     

       38
       38
       +
         "images-cilium-linux-amd64-tar-zst": {

     

       39
       39
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",

     

       40
       40
       +
           "sha256": "b89382ac45f36536ff8d458d74938f6558f510f7bed5cebbaf0834abbb81d03d"

     

       41
       41
       +
         },

     

       42
       42
       +
         "images-cilium-linux-arm64-tar-gz": {

     

       43
       43
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",

     

       44
       44
       +
           "sha256": "f6918df76be1395bb193091d5a356555284da56294f0ab6ed6e2c5f11bf9ddbb"

     

       45
       45
       +
         },

     

       46
       46
       +
         "images-cilium-linux-arm64-tar-zst": {

     

       47
       47
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",

     

       48
       48
       +
           "sha256": "7715c4073dfbba766605ec16aa238a7e171b53def9933e9e3cd6c69780dc669c"

     

       49
       49
       +
         },

     

       50
       50
       +
         "images-core-linux-amd64-tar-gz": {

     

       51
       51
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",

     

       52
       52
       +
           "sha256": "2d138c9f5c08e0783bcec973de388e21cb0733a30a8f87123662f155e22d1cb6"

     

       53
       53
       +
         },

     

       54
       54
       +
         "images-core-linux-amd64-tar-zst": {

     

       55
       55
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",

     

       56
       56
       +
           "sha256": "2eaae797f44ab269b271fa9fb0f02ecaf14d1209c16d83b395d9549b736c149d"

     

       57
       57
       +
         },

     

       58
       58
       +
         "images-core-linux-arm64-tar-gz": {

     

       59
       59
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",

     

       60
       60
       +
           "sha256": "caee89bef5f95aa812de8314cc8612b525840b98e7e654c7b256277df7faaf07"

     

       61
       61
       +
         },

     

       62
       62
       +
         "images-core-linux-arm64-tar-zst": {

     

       63
       63
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",

     

       64
       64
       +
           "sha256": "252cbe2f8f7d262a884094411b84a0e98b16886d2c0e13edea02b81993395283"

     

       65
       65
       +
         },

     

       66
       66
       +
         "images-flannel-linux-amd64-tar-gz": {

     

       67
       67
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",

     

       68
       68
       +
           "sha256": "1495baefc0b8d727e5baf16b71a56f3d8a9dee414e614e7511fd9ca629e6146f"

     

       69
       69
       +
         },

     

       70
       70
       +
         "images-flannel-linux-amd64-tar-zst": {

     

       71
       71
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",

     

       72
       72
       +
           "sha256": "925e1b36c1d1fd65e61de76f21816866dd539a3345e29ba9aca8a66b6aa1e135"

     

       73
       73
       +
         },

     

       74
       74
       +
         "images-flannel-linux-arm64-tar-gz": {

     

       75
       75
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",

     

       76
       76
       +
           "sha256": "fcf737645558c91d525fc8c855c3f674fa0c0dea2d2114b67d2df8236c1905ca"

     

       77
       77
       +
         },

     

       78
       78
       +
         "images-flannel-linux-arm64-tar-zst": {

     

       79
       79
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",

     

       80
       80
       +
           "sha256": "a1eda6aba79af9eb58614d656106196c9159253bb17f1418ee23c4eabf400410"

     

       81
       81
       +
         },

     

       82
       82
       +
         "images-harvester-linux-amd64-tar-gz": {

     

       83
       83
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",

     

       84
       84
       +
           "sha256": "3aff7d410d88fbffed80642c044958601e325a7fb3b5f11b7b989179659b8f14"

     

       85
       85
       +
         },

     

       86
       86
       +
         "images-harvester-linux-amd64-tar-zst": {

     

       87
       87
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",

     

       88
       88
       +
           "sha256": "3d7a80dc64e96c27fd5fe4210c02357c7f2870d25b8067338f45b12c92d80d9f"

     

       89
       89
       +
         },

     

       90
       90
       +
         "images-harvester-linux-arm64-tar-gz": {

     

       91
       91
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",

     

       92
       92
       +
           "sha256": "4fbefae4e2fd15e97e81f4a6eaa1b407d39125caaf60feb766197b1914afbef6"

     

       93
       93
       +
         },

     

       94
       94
       +
         "images-harvester-linux-arm64-tar-zst": {

     

       95
       95
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",

     

       96
       96
       +
           "sha256": "d1644e15125da089225372f44d9c537f5c4ac3b298024ecda0b1537bc245f896"

     

       97
       97
       +
         },

     

       98
       98
       +
         "images-multus-linux-amd64-tar-gz": {

     

       99
       99
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",

     

       100
       100
       +
           "sha256": "2327286a7d695c0596e7536018710373aff10c3f1adc847f07f820c33b68ad81"

     

       101
       101
       +
         },

     

       102
       102
       +
         "images-multus-linux-amd64-tar-zst": {

     

       103
       103
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",

     

       104
       104
       +
           "sha256": "2d5cb1b383aa2a6bb840d185e01a09e7d667b05c91e4be42a04dffa5cd6b4d92"

     

       105
       105
       +
         },

     

       106
       106
       +
         "images-multus-linux-arm64-tar-gz": {

     

       107
       107
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",

     

       108
       108
       +
           "sha256": "9bbd253fdb9fd7913569b651c2591e2b97bdd3b98d0398bcc563a09f1387d6a3"

     

       109
       109
       +
         },

     

       110
       110
       +
         "images-multus-linux-arm64-tar-zst": {

     

       111
       111
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",

     

       112
       112
       +
           "sha256": "ce929e823814cda57d187a219dc2719cbab390bf2a2d939e44d48d70f288d25c"

     

       113
       113
       +
         },

     

       114
       114
       +
         "images-vsphere-linux-amd64-tar-gz": {

     

       115
       115
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",

     

       116
       116
       +
           "sha256": "d405c544026e9aac8edad7cc64abcb4c20578a3abb8aff114910df3161aac28a"

     

       117
       117
       +
         },

     

       118
       118
       +
         "images-vsphere-linux-amd64-tar-zst": {

     

       119
       119
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.29.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",

     

       120
       120
       +
           "sha256": "d71d9dbc916988b2d9236c56ed46dfdd269db892bcbf8e5e11675d851ec7a3f6"

     

       121
       121
       +
         }

     

       122
       122
       +
       }

pkgs/applications/networking/cluster/rke2/1_29/versions.nix

···

       8
       8
        
         pauseVersion = "3.6";

     

       9
       9
        
         ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016";

     

       10
       10
        
         dockerizedVersion = "v1.29.14-rke2r1";

     

       11
       11
       +
         imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);

     

       11
       12
        
       }

+138

pkgs/applications/networking/cluster/rke2/1_30/images-versions.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "images-calico-linux-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "ad47733ffcfa7194ff3f8e9b1aad4028868b6def24bfc613d30104dfbaa103d2"

     

       5
       5
       +
         },

     

       6
       6
       +
         "images-calico-linux-amd64-tar-zst": {

     

       7
       7
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",

     

       8
       8
       +
           "sha256": "fda9d7d50ed44dd15a31b74720fa71fa5d6d504091a47bfa6f766adbeaf5eb08"

     

       9
       9
       +
         },

     

       10
       10
       +
         "images-calico-linux-arm64-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",

     

       12
       12
       +
           "sha256": "bb01eca1bb1a30e2ef83d4c528934a445e56e7e4c38d4ba795699827bcab1f79"

     

       13
       13
       +
         },

     

       14
       14
       +
         "images-calico-linux-arm64-tar-zst": {

     

       15
       15
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",

     

       16
       16
       +
           "sha256": "020b55868818efbf5b27854416ad2f5c71a757c674a49e493f44c1b4146b16cf"

     

       17
       17
       +
         },

     

       18
       18
       +
         "images-canal-linux-amd64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",

     

       20
       20
       +
           "sha256": "827fe2baa8ba2429cc5a6853c7447461e0452ad46bae46e47ab53d078c34856c"

     

       21
       21
       +
         },

     

       22
       22
       +
         "images-canal-linux-amd64-tar-zst": {

     

       23
       23
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",

     

       24
       24
       +
           "sha256": "931a778ff65cfca3b76bddf65d71792422d6ffe0abc6feecc1ca8923555550a3"

     

       25
       25
       +
         },

     

       26
       26
       +
         "images-canal-linux-arm64-tar-gz": {

     

       27
       27
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",

     

       28
       28
       +
           "sha256": "49d4502fab5236c7b96f07636349f902d781c55d03ecd2e563a8f7e544fd30af"

     

       29
       29
       +
         },

     

       30
       30
       +
         "images-canal-linux-arm64-tar-zst": {

     

       31
       31
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",

     

       32
       32
       +
           "sha256": "f75946b503600b0ca1b24f0da7355ece0a96380772fdc8c75f94ab6839bc559f"

     

       33
       33
       +
         },

     

       34
       34
       +
         "images-cilium-linux-amd64-tar-gz": {

     

       35
       35
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",

     

       36
       36
       +
           "sha256": "000c57f474e1b70a81dc7f0b831fd01cb8d147664e00eff566ab8d89fa9caf8a"

     

       37
       37
       +
         },

     

       38
       38
       +
         "images-cilium-linux-amd64-tar-zst": {

     

       39
       39
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",

     

       40
       40
       +
           "sha256": "00a5971a62c02e192de910f6c5f1cd230d23547335d94399fa306a355e23750f"

     

       41
       41
       +
         },

     

       42
       42
       +
         "images-cilium-linux-arm64-tar-gz": {

     

       43
       43
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",

     

       44
       44
       +
           "sha256": "da8793a53ac5c64387872db810d3b94f11ba063af6e11b48ac6df2a943ea8f79"

     

       45
       45
       +
         },

     

       46
       46
       +
         "images-cilium-linux-arm64-tar-zst": {

     

       47
       47
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",

     

       48
       48
       +
           "sha256": "85e78feaeac5dba9ef18eac8dd42081afe4f0bffe11921dbfd6b7cc585ca1496"

     

       49
       49
       +
         },

     

       50
       50
       +
         "images-core-linux-amd64-tar-gz": {

     

       51
       51
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",

     

       52
       52
       +
           "sha256": "c5c4c7389312642c6dc9ef3a07d954be5d3776a8fc1e6df90bb46eb95fd75513"

     

       53
       53
       +
         },

     

       54
       54
       +
         "images-core-linux-amd64-tar-zst": {

     

       55
       55
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",

     

       56
       56
       +
           "sha256": "8ec619a8b458c27f14bfdb796b1aa399ed34b7db176ea3ae64ba20189f529835"

     

       57
       57
       +
         },

     

       58
       58
       +
         "images-core-linux-arm64-tar-gz": {

     

       59
       59
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",

     

       60
       60
       +
           "sha256": "413566078e9315aa5d9339e6fb1f7859aea399a7f7934019aa7b1229e223e293"

     

       61
       61
       +
         },

     

       62
       62
       +
         "images-core-linux-arm64-tar-zst": {

     

       63
       63
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",

     

       64
       64
       +
           "sha256": "586a55ed0aff2bd149bd2a5ad586177ba78814a7da8acb0640365bffaa5c39bb"

     

       65
       65
       +
         },

     

       66
       66
       +
         "images-flannel-linux-amd64-tar-gz": {

     

       67
       67
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",

     

       68
       68
       +
           "sha256": "6eaa3a7f058abd192eab13533cc47a47d4571eee3f6f688f1c316c8a62c1f9d8"

     

       69
       69
       +
         },

     

       70
       70
       +
         "images-flannel-linux-amd64-tar-zst": {

     

       71
       71
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",

     

       72
       72
       +
           "sha256": "42e2f3ce038d7262afcea8c5603f59bd501653e6dcbcbf571e71c8637a85297a"

     

       73
       73
       +
         },

     

       74
       74
       +
         "images-flannel-linux-arm64-tar-gz": {

     

       75
       75
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",

     

       76
       76
       +
           "sha256": "e2a9164923bec9998879224c74edf36fa14e6534cddb20220f399679c28348ef"

     

       77
       77
       +
         },

     

       78
       78
       +
         "images-flannel-linux-arm64-tar-zst": {

     

       79
       79
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",

     

       80
       80
       +
           "sha256": "8b49d5670be6794813d70fbebf1b681d8d0661ada1cd15d74bf08d6302a85898"

     

       81
       81
       +
         },

     

       82
       82
       +
         "images-harvester-linux-amd64-tar-gz": {

     

       83
       83
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",

     

       84
       84
       +
           "sha256": "5c0e2ab04cf30e6e862f88d75cc2c5130da68d893be723f91212b9b49caa2a60"

     

       85
       85
       +
         },

     

       86
       86
       +
         "images-harvester-linux-amd64-tar-zst": {

     

       87
       87
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",

     

       88
       88
       +
           "sha256": "787ae168c950c6d5a10296511fc4a54d819f4587a8ffaaccafd766ea5252cc4d"

     

       89
       89
       +
         },

     

       90
       90
       +
         "images-harvester-linux-arm64-tar-gz": {

     

       91
       91
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",

     

       92
       92
       +
           "sha256": "89d2713b0843eb9638f3d242fd3d8f6a4ceb35d83c62067940d8624025fbfc0f"

     

       93
       93
       +
         },

     

       94
       94
       +
         "images-harvester-linux-arm64-tar-zst": {

     

       95
       95
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",

     

       96
       96
       +
           "sha256": "64c2a373c19ed7fc0254e24ce8d9dae4ae21826fea9094b14ece90471706b753"

     

       97
       97
       +
         },

     

       98
       98
       +
         "images-multus-linux-amd64-tar-gz": {

     

       99
       99
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",

     

       100
       100
       +
           "sha256": "20e1811dae1c233a836162b432540cb3e2f974aecf0d1b57bcf79d4b269a8531"

     

       101
       101
       +
         },

     

       102
       102
       +
         "images-multus-linux-amd64-tar-zst": {

     

       103
       103
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",

     

       104
       104
       +
           "sha256": "025ded7faf603991975c4f17708b0887bffbc265aa5546e6df96ab625ebb65ac"

     

       105
       105
       +
         },

     

       106
       106
       +
         "images-multus-linux-arm64-tar-gz": {

     

       107
       107
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",

     

       108
       108
       +
           "sha256": "e8919421560a548576eed90c9d442d84ce1a3cfab0739cd98c400f7ed17876d9"

     

       109
       109
       +
         },

     

       110
       110
       +
         "images-multus-linux-arm64-tar-zst": {

     

       111
       111
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",

     

       112
       112
       +
           "sha256": "55bb64bd256ac9a185db583d4dd178a609cb8a047123dbae5aadf9b56183f99b"

     

       113
       113
       +
         },

     

       114
       114
       +
         "images-traefik-linux-amd64-tar-gz": {

     

       115
       115
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",

     

       116
       116
       +
           "sha256": "c219b1c1fb311b2e0981c2c280e0e51e7b0e2081f5521ed0dedcc25aeaf701f4"

     

       117
       117
       +
         },

     

       118
       118
       +
         "images-traefik-linux-amd64-tar-zst": {

     

       119
       119
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",

     

       120
       120
       +
           "sha256": "5118c0fe338141c154eca5386db49b40d55f29a07d77486e6f82117c433176ae"

     

       121
       121
       +
         },

     

       122
       122
       +
         "images-traefik-linux-arm64-tar-gz": {

     

       123
       123
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",

     

       124
       124
       +
           "sha256": "0b618a0a48ffb91d61dc0f685dc1a0859ed7824c5ac315b7a62856cdd1282a83"

     

       125
       125
       +
         },

     

       126
       126
       +
         "images-traefik-linux-arm64-tar-zst": {

     

       127
       127
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",

     

       128
       128
       +
           "sha256": "24f90b544f5b962ca35333b9ae6bb3b1b5ce0bf0d270d006cad7c8c6ffa3f011"

     

       129
       129
       +
         },

     

       130
       130
       +
         "images-vsphere-linux-amd64-tar-gz": {

     

       131
       131
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",

     

       132
       132
       +
           "sha256": "93f668a01a753c40b72ba9936909bf49bc2c6c857bdb900eef22f237a2600d07"

     

       133
       133
       +
         },

     

       134
       134
       +
         "images-vsphere-linux-amd64-tar-zst": {

     

       135
       135
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.30.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",

     

       136
       136
       +
           "sha256": "e68ff9127360537ef0f351741fbbd27b6fe927cf792a0a80c25a9a78f1aeeab1"

     

       137
       137
       +
         }

     

       138
       138
       +
       }

pkgs/applications/networking/cluster/rke2/1_30/versions.nix

···

       8
       8
        
         pauseVersion = "3.6";

     

       9
       9
        
         ccmVersion = "v1.30.6-0.20241016053533-5ec454f50e7a-build20241016";

     

       10
       10
        
         dockerizedVersion = "v1.30.10-rke2r1";

     

       11
       11
       +
         imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);

     

       11
       12
        
       }

+138

pkgs/applications/networking/cluster/rke2/1_31/images-versions.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "images-calico-linux-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "5a3b85760345b131e733be993b5a7fff7b244095d04d1f3b09085167eda5ec48"

     

       5
       5
       +
         },

     

       6
       6
       +
         "images-calico-linux-amd64-tar-zst": {

     

       7
       7
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",

     

       8
       8
       +
           "sha256": "3c4b349c4c5dcf77d5c064ac7d8e7cd17b86575f1861d423f02f5e5dde4bab2a"

     

       9
       9
       +
         },

     

       10
       10
       +
         "images-calico-linux-arm64-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",

     

       12
       12
       +
           "sha256": "11db0d5a766421ffd11009f78444d42f20fca5ddc35654aaadcc32aae31f487b"

     

       13
       13
       +
         },

     

       14
       14
       +
         "images-calico-linux-arm64-tar-zst": {

     

       15
       15
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",

     

       16
       16
       +
           "sha256": "d1570a698616ee0f9dc430e6374f299fc93b0b53da7b61f9b0e0e66562ddb001"

     

       17
       17
       +
         },

     

       18
       18
       +
         "images-canal-linux-amd64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",

     

       20
       20
       +
           "sha256": "d26574208df6e8196066620c12854c73ec3f9d92ae927ba401447f54bbd9bf65"

     

       21
       21
       +
         },

     

       22
       22
       +
         "images-canal-linux-amd64-tar-zst": {

     

       23
       23
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",

     

       24
       24
       +
           "sha256": "b5945ac08d74bcc67415efc1c293b2af119befe04f377880eb045ca7dcf4276c"

     

       25
       25
       +
         },

     

       26
       26
       +
         "images-canal-linux-arm64-tar-gz": {

     

       27
       27
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",

     

       28
       28
       +
           "sha256": "8a63fe4069c811d94004132afa16fb21b8ca1548eba075529ef3d812b682119a"

     

       29
       29
       +
         },

     

       30
       30
       +
         "images-canal-linux-arm64-tar-zst": {

     

       31
       31
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",

     

       32
       32
       +
           "sha256": "8cbb92e40590b372cb1b962de2c2e8d6b92d26bd5d9b71aee577865587e46e56"

     

       33
       33
       +
         },

     

       34
       34
       +
         "images-cilium-linux-amd64-tar-gz": {

     

       35
       35
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",

     

       36
       36
       +
           "sha256": "f989d984753b166cffbfaec8866ec9b28ca852978de737f5195cd8da929fbd31"

     

       37
       37
       +
         },

     

       38
       38
       +
         "images-cilium-linux-amd64-tar-zst": {

     

       39
       39
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",

     

       40
       40
       +
           "sha256": "784b5817f5f8ab4226cbce3d074d467d397dd0ed0ed6397e4c1be0a327423f13"

     

       41
       41
       +
         },

     

       42
       42
       +
         "images-cilium-linux-arm64-tar-gz": {

     

       43
       43
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",

     

       44
       44
       +
           "sha256": "b4dc7787e43d3148cd45f56ba2197469b9901e710a844b49024e7d675862f1d8"

     

       45
       45
       +
         },

     

       46
       46
       +
         "images-cilium-linux-arm64-tar-zst": {

     

       47
       47
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",

     

       48
       48
       +
           "sha256": "209d566b382c6c8af5ddfd2350228ec0669b341ce503ac001cc79928add3accd"

     

       49
       49
       +
         },

     

       50
       50
       +
         "images-core-linux-amd64-tar-gz": {

     

       51
       51
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",

     

       52
       52
       +
           "sha256": "e8e687f3063cfdc7e6f93feffc0a2e63b90f3228c4f6c85532d4e1f436fbaeb7"

     

       53
       53
       +
         },

     

       54
       54
       +
         "images-core-linux-amd64-tar-zst": {

     

       55
       55
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",

     

       56
       56
       +
           "sha256": "2faf4f9ee2e77b7db6963147d3685197f32f6af5b3dd2305221273bcfefa5af9"

     

       57
       57
       +
         },

     

       58
       58
       +
         "images-core-linux-arm64-tar-gz": {

     

       59
       59
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",

     

       60
       60
       +
           "sha256": "1d514169c112dd295a03f22ba35905edd0c550e0b09ef5191b9389bb7fd1a945"

     

       61
       61
       +
         },

     

       62
       62
       +
         "images-core-linux-arm64-tar-zst": {

     

       63
       63
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",

     

       64
       64
       +
           "sha256": "b4e3cfe5f250dcdb1daa02002d4caf9349add11c4392df644c9fb16c5605ffd9"

     

       65
       65
       +
         },

     

       66
       66
       +
         "images-flannel-linux-amd64-tar-gz": {

     

       67
       67
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",

     

       68
       68
       +
           "sha256": "1f069844a35857e264065c2e5f9157b1005fda3eb7dcffd20e2218f7ab64c250"

     

       69
       69
       +
         },

     

       70
       70
       +
         "images-flannel-linux-amd64-tar-zst": {

     

       71
       71
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",

     

       72
       72
       +
           "sha256": "1bd4e97a5391916cf703d8503d51f05c8db1fe5e130a718fe8fefb4cf8d95e4b"

     

       73
       73
       +
         },

     

       74
       74
       +
         "images-flannel-linux-arm64-tar-gz": {

     

       75
       75
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",

     

       76
       76
       +
           "sha256": "c49971bcc55765e3ac036f59cb6df5158efcb664d4fc5a3e0f7f40e962e5b153"

     

       77
       77
       +
         },

     

       78
       78
       +
         "images-flannel-linux-arm64-tar-zst": {

     

       79
       79
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",

     

       80
       80
       +
           "sha256": "9dc874dc452cd3c28cb313c70b1cbfb465195b4c308d893555b1fb8b20296756"

     

       81
       81
       +
         },

     

       82
       82
       +
         "images-harvester-linux-amd64-tar-gz": {

     

       83
       83
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",

     

       84
       84
       +
           "sha256": "4837a8c559fca6e31436128040b99e90f3ab2210022f02a618405ccfc7185e7a"

     

       85
       85
       +
         },

     

       86
       86
       +
         "images-harvester-linux-amd64-tar-zst": {

     

       87
       87
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",

     

       88
       88
       +
           "sha256": "a38aa37f2f8362055ef5dfa16a3c4d9f85eaed6e1b56b928bb4888c52e96b76f"

     

       89
       89
       +
         },

     

       90
       90
       +
         "images-harvester-linux-arm64-tar-gz": {

     

       91
       91
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",

     

       92
       92
       +
           "sha256": "beea6e39cc1f522b59de42598a8431ee006292bb6568cb8a0b46ed614225264d"

     

       93
       93
       +
         },

     

       94
       94
       +
         "images-harvester-linux-arm64-tar-zst": {

     

       95
       95
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",

     

       96
       96
       +
           "sha256": "cf7f030fd86fcc2425a7a7819c523f6497eae59066fab04a56d8f1cf01c7aac2"

     

       97
       97
       +
         },

     

       98
       98
       +
         "images-multus-linux-amd64-tar-gz": {

     

       99
       99
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",

     

       100
       100
       +
           "sha256": "d473aee06f24d49d1d6b6baee9bfd2079036ef40c0cda126a83851078b0f7e40"

     

       101
       101
       +
         },

     

       102
       102
       +
         "images-multus-linux-amd64-tar-zst": {

     

       103
       103
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",

     

       104
       104
       +
           "sha256": "18957569b6a5fa5aab5fd4dc180fec8b403cae2c07ee07b18505a5f6901d5e5b"

     

       105
       105
       +
         },

     

       106
       106
       +
         "images-multus-linux-arm64-tar-gz": {

     

       107
       107
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",

     

       108
       108
       +
           "sha256": "b5acbce9e9ccd2213807bd27896a6d6b29795dd2f55e5b2281a77dfa41366a60"

     

       109
       109
       +
         },

     

       110
       110
       +
         "images-multus-linux-arm64-tar-zst": {

     

       111
       111
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",

     

       112
       112
       +
           "sha256": "eb7ea1b45d01cab215a1bba7bfc223ed03c16d1383a5e0df141e5ecee9708def"

     

       113
       113
       +
         },

     

       114
       114
       +
         "images-traefik-linux-amd64-tar-gz": {

     

       115
       115
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",

     

       116
       116
       +
           "sha256": "2b29e30e1daac4277da7f6a27ad021e0380a4585278d7e8440b38b2e1207ee68"

     

       117
       117
       +
         },

     

       118
       118
       +
         "images-traefik-linux-amd64-tar-zst": {

     

       119
       119
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",

     

       120
       120
       +
           "sha256": "70147f487109bd7e4db5b525a8a2a01030f3a6e985e4ce06e8c28dd98e6ff131"

     

       121
       121
       +
         },

     

       122
       122
       +
         "images-traefik-linux-arm64-tar-gz": {

     

       123
       123
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",

     

       124
       124
       +
           "sha256": "15c03df525be312caac8431bfb9d0a3842834b25faf0551bc8e185337d623522"

     

       125
       125
       +
         },

     

       126
       126
       +
         "images-traefik-linux-arm64-tar-zst": {

     

       127
       127
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",

     

       128
       128
       +
           "sha256": "4b53b94f2dbdc142987718dff210d381cb6d38ad01846278654d77ec1f6f44f0"

     

       129
       129
       +
         },

     

       130
       130
       +
         "images-vsphere-linux-amd64-tar-gz": {

     

       131
       131
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",

     

       132
       132
       +
           "sha256": "169828a17efdd4a14682c49c0bed437bcec6cde27378d985e15ecbfdfa1523e4"

     

       133
       133
       +
         },

     

       134
       134
       +
         "images-vsphere-linux-amd64-tar-zst": {

     

       135
       135
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.31.6%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",

     

       136
       136
       +
           "sha256": "4f7663357f47f696eaf2de34d980ba3aebaa8e42de635e17736ae1ef6c58629c"

     

       137
       137
       +
         }

     

       138
       138
       +
       }

pkgs/applications/networking/cluster/rke2/1_31/versions.nix

···

       8
       8
        
         pauseVersion = "3.6";

     

       9
       9
        
         ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";

     

       10
       10
        
         dockerizedVersion = "v1.31.6-rke2r1";

     

       11
       11
       +
         imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);

     

       11
       12
        
       }

+138

pkgs/applications/networking/cluster/rke2/1_32/images-versions.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "images-calico-linux-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "a5bbae876483eac841d0c86d07b9a2f681d14ceba49127d86f206c60416dea02"

     

       5
       5
       +
         },

     

       6
       6
       +
         "images-calico-linux-amd64-tar-zst": {

     

       7
       7
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",

     

       8
       8
       +
           "sha256": "f5bb26e2d2c755b19459af960c5e06f45771f95c257aa40aa206d65712664784"

     

       9
       9
       +
         },

     

       10
       10
       +
         "images-calico-linux-arm64-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",

     

       12
       12
       +
           "sha256": "8a1854a27c1269628a2318ef9b200f861a3a9b390948ac50340d1fa2c338c22d"

     

       13
       13
       +
         },

     

       14
       14
       +
         "images-calico-linux-arm64-tar-zst": {

     

       15
       15
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",

     

       16
       16
       +
           "sha256": "844d7ed5be7525971de7612980a49f0c326be638dbd59146bf22d02b65687ac6"

     

       17
       17
       +
         },

     

       18
       18
       +
         "images-canal-linux-amd64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",

     

       20
       20
       +
           "sha256": "052ffd11c271daf158361d6b2ad99b8c2a7b30d110e6530b3db1d08a809861b9"

     

       21
       21
       +
         },

     

       22
       22
       +
         "images-canal-linux-amd64-tar-zst": {

     

       23
       23
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",

     

       24
       24
       +
           "sha256": "c4f2434302fa287e13385d3c7f50ec0b3f9989cf8a16a70f5d0c85232570371a"

     

       25
       25
       +
         },

     

       26
       26
       +
         "images-canal-linux-arm64-tar-gz": {

     

       27
       27
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",

     

       28
       28
       +
           "sha256": "433d22412cdeadaf3dad899517af66aaf2167c096c95ef2462b0b2ed74bbd036"

     

       29
       29
       +
         },

     

       30
       30
       +
         "images-canal-linux-arm64-tar-zst": {

     

       31
       31
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",

     

       32
       32
       +
           "sha256": "445cd57b28cc69f487e95698c84c4339729a5a6f11fd36d57b37cc3ef49d11ab"

     

       33
       33
       +
         },

     

       34
       34
       +
         "images-cilium-linux-amd64-tar-gz": {

     

       35
       35
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",

     

       36
       36
       +
           "sha256": "e6facccbc711757982f5b625427e04e286671a14be7fed13647d7ce59fdd6f5b"

     

       37
       37
       +
         },

     

       38
       38
       +
         "images-cilium-linux-amd64-tar-zst": {

     

       39
       39
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",

     

       40
       40
       +
           "sha256": "745216763991e712800edb5f04ba0a3a647a73e5076d28237cd44064da0254e8"

     

       41
       41
       +
         },

     

       42
       42
       +
         "images-cilium-linux-arm64-tar-gz": {

     

       43
       43
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",

     

       44
       44
       +
           "sha256": "3ab86ac3c021681ee1cb10d0d7bb4dd05f96830ea84e8bfdd1d5c239e1c1db00"

     

       45
       45
       +
         },

     

       46
       46
       +
         "images-cilium-linux-arm64-tar-zst": {

     

       47
       47
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",

     

       48
       48
       +
           "sha256": "b160d69f45818dbc8526aa92784c935c471863d9d6ad5f83a434419cee0d1dd1"

     

       49
       49
       +
         },

     

       50
       50
       +
         "images-core-linux-amd64-tar-gz": {

     

       51
       51
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",

     

       52
       52
       +
           "sha256": "5da5bc70814ae25f55e75d194d3e56eed9d48d2e2bd50cce329f72a8658a2c71"

     

       53
       53
       +
         },

     

       54
       54
       +
         "images-core-linux-amd64-tar-zst": {

     

       55
       55
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",

     

       56
       56
       +
           "sha256": "9542793ad13822d02bc5b3aef237c21cb8ea807cde8c1f7edd50c9c8de3257a1"

     

       57
       57
       +
         },

     

       58
       58
       +
         "images-core-linux-arm64-tar-gz": {

     

       59
       59
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",

     

       60
       60
       +
           "sha256": "b48c79e0e68d7c8ae3dd52f6647f4f859eb0a81e4cb81ca98a08788a3eeb208c"

     

       61
       61
       +
         },

     

       62
       62
       +
         "images-core-linux-arm64-tar-zst": {

     

       63
       63
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",

     

       64
       64
       +
           "sha256": "97ebc6e37d73d2fefbd861ae9e44a97c649c5876def02fa0e99b136e4cc43834"

     

       65
       65
       +
         },

     

       66
       66
       +
         "images-flannel-linux-amd64-tar-gz": {

     

       67
       67
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",

     

       68
       68
       +
           "sha256": "cebc30d3648804c8f6a57de63b7a8c6dd131e2338e4c7e40bb4a3a4ec9962033"

     

       69
       69
       +
         },

     

       70
       70
       +
         "images-flannel-linux-amd64-tar-zst": {

     

       71
       71
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",

     

       72
       72
       +
           "sha256": "2caa2ba283f683070cedfbcef4058a0172541c0675d2582cffc09a8ab97c3af8"

     

       73
       73
       +
         },

     

       74
       74
       +
         "images-flannel-linux-arm64-tar-gz": {

     

       75
       75
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",

     

       76
       76
       +
           "sha256": "cbbbadf33bb38b22340db52c7f72e2685ad20f64f27a31eb3c90ae2575ac676d"

     

       77
       77
       +
         },

     

       78
       78
       +
         "images-flannel-linux-arm64-tar-zst": {

     

       79
       79
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",

     

       80
       80
       +
           "sha256": "db13267b1bf8d27003f6056cea683e34af4ff3743d05de7f84bfb089cc2e28ad"

     

       81
       81
       +
         },

     

       82
       82
       +
         "images-harvester-linux-amd64-tar-gz": {

     

       83
       83
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",

     

       84
       84
       +
           "sha256": "b54b4ba783469334a492fdb4f2cfb68ce4a57a7f700d27d060d11213bb026a33"

     

       85
       85
       +
         },

     

       86
       86
       +
         "images-harvester-linux-amd64-tar-zst": {

     

       87
       87
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",

     

       88
       88
       +
           "sha256": "68e232d40c9ddb67ce17181e48e8accd6be6b55ee01d78937100ce3faf3f7042"

     

       89
       89
       +
         },

     

       90
       90
       +
         "images-harvester-linux-arm64-tar-gz": {

     

       91
       91
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",

     

       92
       92
       +
           "sha256": "3847f03a2351ed9182ae52b0b03f8cf7705123b301f1cc4d7da01cfd2359f743"

     

       93
       93
       +
         },

     

       94
       94
       +
         "images-harvester-linux-arm64-tar-zst": {

     

       95
       95
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",

     

       96
       96
       +
           "sha256": "abdae17a19b8da8aeda83e434052c86e4be24bb37dc64c696e42ed59dac9d3c9"

     

       97
       97
       +
         },

     

       98
       98
       +
         "images-multus-linux-amd64-tar-gz": {

     

       99
       99
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",

     

       100
       100
       +
           "sha256": "712ff37f4ea472c485fa887ab6b60df441ebda40c7b6bc66c28433b52f69a0d9"

     

       101
       101
       +
         },

     

       102
       102
       +
         "images-multus-linux-amd64-tar-zst": {

     

       103
       103
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",

     

       104
       104
       +
           "sha256": "e556ae1d1db3923e57a050da3a9176fa9e7c3a0378229f7dd7a1c34145e8b96e"

     

       105
       105
       +
         },

     

       106
       106
       +
         "images-multus-linux-arm64-tar-gz": {

     

       107
       107
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",

     

       108
       108
       +
           "sha256": "0308c83ee9f8affa237cc7b528639558e18b9fdbf5a914220f1c1818654c5874"

     

       109
       109
       +
         },

     

       110
       110
       +
         "images-multus-linux-arm64-tar-zst": {

     

       111
       111
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",

     

       112
       112
       +
           "sha256": "d420a305e3d5b95f05da90177484df38b7178381acdb0806bd17aa2612a26583"

     

       113
       113
       +
         },

     

       114
       114
       +
         "images-traefik-linux-amd64-tar-gz": {

     

       115
       115
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",

     

       116
       116
       +
           "sha256": "39f6f02a012e24237b8ed0106d83f6248f133a6d83feaca2aaf4c692b31edd94"

     

       117
       117
       +
         },

     

       118
       118
       +
         "images-traefik-linux-amd64-tar-zst": {

     

       119
       119
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",

     

       120
       120
       +
           "sha256": "8608cd8d01fd2ad00fcc28bf7a9a54e89f96b2d0efe45ea6ce940fefc22ba36e"

     

       121
       121
       +
         },

     

       122
       122
       +
         "images-traefik-linux-arm64-tar-gz": {

     

       123
       123
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",

     

       124
       124
       +
           "sha256": "3a47c3207fcf3e670f8b58262aecb777d63a56f744feb3b99612d86516f63f90"

     

       125
       125
       +
         },

     

       126
       126
       +
         "images-traefik-linux-arm64-tar-zst": {

     

       127
       127
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",

     

       128
       128
       +
           "sha256": "afd2e4c6066fcbbde4d7cb2245cdc18542b9f510e8908c4ffe07181a459d6703"

     

       129
       129
       +
         },

     

       130
       130
       +
         "images-vsphere-linux-amd64-tar-gz": {

     

       131
       131
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",

     

       132
       132
       +
           "sha256": "5c5531032ded256f0834169fe4db65e698ef4b44a76128b9aec174d8cc24d6e0"

     

       133
       133
       +
         },

     

       134
       134
       +
         "images-vsphere-linux-amd64-tar-zst": {

     

       135
       135
       +
           "url": "https://github.com/rancher/rke2/releases/download/v1.32.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",

     

       136
       136
       +
           "sha256": "5f38ba2a8060f82ee407edb77433afb53635798f1be6f1fa53fbe9921c2eb3a0"

     

       137
       137
       +
         }

     

       138
       138
       +
       }

pkgs/applications/networking/cluster/rke2/1_32/versions.nix

···

       8
       8
        
         pauseVersion = "3.6";

     

       9
       9
        
         ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";

     

       10
       10
        
         dockerizedVersion = "v1.32.2-rke2r1";

     

       11
       11
       +
         imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);

     

       11
       12
        
       }

+14 -11

pkgs/applications/networking/cluster/rke2/builder.nix

···

       10
       10
        
         pauseVersion,

     

       11
       11
        
         ccmVersion,

     

       12
       12
        
         dockerizedVersion,

     

       13
       13
       +
         imagesVersions,

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       # Build dependencies

     
···

       20
       21
        
         go,

     

       21
       22
        
         makeWrapper,

     

       22
       23
        
         fetchzip,

     

       24
       24
       +
         fetchurl,

     

       23
       25
        
       

     

       24
       26
        
         # Runtime dependencies

     

       25
       27
        
         procps,

     
···

       118
       120
        
       

     

       119
       121
        
           doCheck = false;

     

       120
       122
        
       

     

       121
       121
       -
           passthru.updateScript = updateScript;

     

       122
       122
       -
       

     

       123
       123
       -
           passthru.tests =

     

       124
       124
       -
             {

     

       125
       125
       -
               version = testers.testVersion {

     

       126
       126
       -
                 package = rke2;

     

       127
       127
       -
                 version = "v${version}";

     

       123
       123
       +
           passthru = {

     

       124
       124
       +
             inherit updateScript;

     

       125
       125
       +
             tests =

     

       126
       126
       +
               {

     

       127
       127
       +
                 version = testers.testVersion {

     

       128
       128
       +
                   package = rke2;

     

       129
       129
       +
                   version = "v${version}";

     

       130
       130
       +
                 };

     

       131
       131
       +
               }

     

       132
       132
       +
               // lib.optionalAttrs stdenv.hostPlatform.isLinux {

     

       133
       133
       +
                 inherit (nixosTests) rke2;

     

       128
       134
        
               };

     

       129
       129
       -
             }

     

       130
       130
       -
             // lib.optionalAttrs stdenv.hostPlatform.isLinux {

     

       131
       131
       -
               inherit (nixosTests) rke2;

     

       132
       132
       -
             };

     

       135
       135
       +
           } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions);

     

       133
       136
        
       

     

       134
       137
        
           meta = with lib; {

     

       135
       138
        
             homepage = "https://github.com/rancher/rke2";

+22

pkgs/applications/networking/cluster/rke2/update-script.sh

···

       39
       39
        
       

     

       40
       40
        
       FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="

     

       41
       41
        
       

     

       42
       42
       +
       # Get sha256sums for amd64 and arm64

     

       43
       43
       +
       SHA256_AMD64=$(curl -L "https://github.com/rancher/rke2/releases/download/v${RKE2_VERSION}/sha256sum-amd64.txt")

     

       44
       44
       +
       SHA256_ARM64=$(curl -L "https://github.com/rancher/rke2/releases/download/v${RKE2_VERSION}/sha256sum-arm64.txt")

     

       45
       45
       +
       # Merge both sha256sums in a single variable, one entry per line

     

       46
       46
       +
       SHA256_SUMS="$SHA256_AMD64\n$SHA256_ARM64"

     

       47
       47
       +
       # Get a list of images archives that are assets of this release, one entry (name and download_url) per line

     

       48
       48
       +
       IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/rancher/rke2/releases/tags/v${RKE2_VERSION}" | \

     

       49
       49
       +
           # Filter the assets by name, discard .txt files and legacy image archives (e.g. rke2-images.linux-arm64.tar.gz)

     

       50
       50
       +
           jq -r '.assets[] | select(.name | test("^rke2-images-.*\\.tar\\.")) | "\(.name) \(.browser_download_url)"')

     

       51
       51
       +
       # Iterate over all lines of IMAGES_ARCHIVES, pick the appropriate sha256, and create a JSON file

     

       52
       52
       +
       # that can be imported by builder.nix

     

       53
       53
       +
       while read -r name url; do

     

       54
       54
       +
         sha256=$(grep "$name" <<< "$SHA256_SUMS" | cut -d ' ' -f 1)

     

       55
       55
       +
         # Remove the rke2 prefix and replace all dots in $name with hyphens

     

       56
       56
       +
         clean_name=$(sed -e "s/^rke2-//" -e "s/\./-/g" <<< "$name")

     

       57
       57
       +
         jq --null-input --arg name "$clean_name" \

     

       58
       58
       +
           --arg url "$url" \

     

       59
       59
       +
           --arg sha256 "$sha256" \

     

       60
       60
       +
           '{$name: {"url": $url, "sha256": $sha256}}'

     

       61
       61
       +
       done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > "${WORKDIR}/1_${MINOR_VERSION}/images-versions.json"

     

       62
       62
       +
       

     

       42
       63
        
       cat << EOF > "${WORKDIR}/1_${MINOR_VERSION}/versions.nix"

     

       43
       64
        
       {

     

       44
       65
        
         rke2Version = "${RKE2_VERSION}";

     
···

       50
       71
        
         pauseVersion = "${PAUSE_VERSION}";

     

       51
       72
        
         ccmVersion = "${CCM_VERSION}";

     

       52
       73
        
         dockerizedVersion = "${DOCKERIZED_VERSION}";

     

       74
       74
       +
         imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);

     

       53
       75
        
       }

     

       54
       76
        
       EOF

     

       55
       77

+4 -4

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       252
       252
        
           "vendorHash": "sha256-lQrtAU8zbeIGplfC8+017Ib9d4MFVF0pMvxmE3MLt3M="

     

       253
       253
        
         },

     

       254
       254
        
         "cloudflare": {

     

       255
       255
       -
           "hash": "sha256-ne+G7tn09sDWVoU9JezCJxIn3F/bHXBp9QIDd0UhH9c=",

     

       255
       255
       +
           "hash": "sha256-5L5fnJCQU2gcXbbUq8KDid8NhedFXyYBgysggPxNxSY=",

     

       256
       256
        
           "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",

     

       257
       257
        
           "owner": "cloudflare",

     

       258
       258
        
           "repo": "terraform-provider-cloudflare",

     

       259
       259
       -
           "rev": "v4.51.0",

     

       260
       260
       -
           "spdx": "MPL-2.0",

     

       261
       261
       -
           "vendorHash": "sha256-jZLkDnZpguVEZpbXG/IhgeyyvRLOVWBacoFTs7H8js0="

     

       259
       259
       +
           "rev": "v5.2.0",

     

       260
       260
       +
           "spdx": "Apache-2.0",

     

       261
       261
       +
           "vendorHash": "sha256-vh31Teu4PruX3i7EIlfumOn/R6libKzAxMPqhTxqBTA="

     

       262
       262
        
         },

     

       263
       263
        
         "cloudfoundry": {

     

       264
       264
        
           "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

pkgs/applications/video/obs-studio/plugins/default.nix

···

       16
       16
        
       

     

       17
       17
        
         obs-3d-effect = callPackage ./obs-3d-effect.nix { };

     

       18
       18
        
       

     

       19
       19
       +
         obs-advanced-masks = callPackage ./obs-advanced-masks.nix { };

     

       20
       20
       +
       

     

       19
       21
        
         obs-backgroundremoval = callPackage ./obs-backgroundremoval { };

     

       20
       22
        
       

     

       21
       23
        
         obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { };

+43

pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         obs-studio,

     

       6
       6
       +
         cmake,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation rec {

     

       10
       10
       +
         pname = "obs-advanced-masks";

     

       11
       11
       +
         version = "1.1.0";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "FiniteSingularity";

     

       15
       15
       +
           repo = "obs-advanced-masks";

     

       16
       16
       +
           rev = "refs/tags/v${version}";

     

       17
       17
       +
           hash = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         buildInputs = [

     

       21
       21
       +
           obs-studio

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           cmake

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         postInstall = ''

     

       29
       29
       +
           rm -rf "$out/share"

     

       30
       30
       +
           mkdir -p "$out/share/obs"

     

       31
       31
       +
           mv "$out/data/obs-plugins" "$out/share/obs"

     

       32
       32
       +
           rm -rf "$out/obs-plugins" "$out/data"

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         meta = {

     

       36
       36
       +
           description = "Advanced Masking Plugin for OBS";

     

       37
       37
       +
           homepage = "https://github.com/FiniteSingularity/obs-advanced-masks";

     

       38
       38
       +
           license = lib.licenses.gpl2Only;

     

       39
       39
       +
           maintainers = with lib.maintainers; [ rytswd ];

     

       40
       40
       +
           mainProgram = "obs-advanced-masks";

     

       41
       41
       +
           platforms = lib.platforms.linux;

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+2 -2

pkgs/by-name/ac/acr-cli/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "acr-cli";

     

       11
       11
       -
         version = "0.14";

     

       11
       11
       +
         version = "0.15";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Azure";

     

       15
       15
        
           repo = "acr-cli";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-h4vRtxAu/ggEu5HuzaiEoLslOyAXP1rMI1/ua9YARug=";

     

       17
       17
       +
           hash = "sha256-5uEaptJSB5mb12vqeSGkRj4oRed+0VgcJx4vpTBQCAU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         vendorHash = null;

+3 -3

pkgs/by-name/ep/epson-escpr2/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation {

     

       10
       10
        
         pname = "epson-inkjet-printer-escpr2";

     

       11
       11
       -
         version = "1.2.27";

     

       11
       11
       +
         version = "1.2.28";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           # To find the most recent version go to

     

       15
       15
        
           # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php

     

       16
       16
        
           # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)

     

       17
       17
       -
           url = "https://download3.ebz.epson.net/dsc/f/03/00/16/77/53/1540531c6f47c62d3846d9a8943b1ecec7f825a1/epson-inkjet-printer-escpr2-1.2.27-1.tar.gz";

     

       18
       18
       -
           hash = "sha256-h1RaqkN+hdVGVy0ancqfYoeNp/TTfJYy5oRxhPizO2Q=";

     

       17
       17
       +
           url = "https://download3.ebz.epson.net/dsc/f/03/00/16/80/15/8bd63ccd14a1966e9c3658d374686c5bb104bb04/epson-inkjet-printer-escpr2-1.2.28-1.tar.gz";

     

       18
       18
       +
           hash = "sha256-lv8Hgo7JzT4igY8ek7EXdyFO34l735dpMC+gWkO5rvY=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ cups ];

-17

pkgs/by-name/fl/fluent-bit/macos-11-sdk-compat.patch

···

       1
       1
       -
       diff --git i/src/flb_utils.c w/src/flb_utils.c

     

       2
       2
       -
       index 87637f1331d7..7a0036566438 100644

     

       3
       3
       -
       --- i/src/flb_utils.c

     

       4
       4
       -
       +++ w/src/flb_utils.c

     

       5
       5
       -
       @@ -1424,11 +1424,11 @@ int flb_utils_get_machine_id(char **out_id, size_t *out_size)

     

       6
       6
       -
                return 0;

     

       7
       7
       -
            }

     

       8
       8
       -
        #elif defined (FLB_SYSTEM_MACOS)

     

       9
       9
       -
            bool bret;

     

       10
       10
       -
            CFStringRef serialNumber;

     

       11
       11
       -
       -    io_service_t platformExpert = IOServiceGetMatchingService(kIOMainPortDefault,

     

       12
       12
       -
       +    io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault,

     

       13
       13
       -
                IOServiceMatching("IOPlatformExpertDevice"));

     

       14
       14
       -
       

     

       15
       15
       -
            if (platformExpert) {

     

       16
       16
       -
                CFTypeRef serialNumberAsCFString =

     

       17
       17
       -
                    IORegistryEntryCreateCFProperty(platformExpert,

+101 -37

pkgs/by-name/fl/fluent-bit/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       +
         arrow-glib,

     

       5
       5
       +
         bison,

     

       6
       6
       +
         c-ares,

     

       7
       7
       +
         cmake,

     

       8
       8
       +
         curl,

     

       4
       9
        
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       10
        
         flex,

     

       7
       7
       -
         bison,

     

       8
       8
       -
         systemd,

     

       11
       11
       +
         jemalloc,

     

       12
       12
       +
         libbacktrace,

     

       13
       13
       +
         libbpf,

     

       14
       14
       +
         libnghttp2,

     

       9
       15
        
         libpq,

     

       16
       16
       +
         libyaml,

     

       17
       17
       +
         luajit,

     

       18
       18
       +
         nix-update-script,

     

       19
       19
       +
         nixosTests,

     

       10
       20
        
         openssl,

     

       11
       11
       -
         libyaml,

     

       12
       12
       -
         darwin,

     

       21
       21
       +
         pkg-config,

     

       22
       22
       +
         rdkafka,

     

       23
       23
       +
         systemd,

     

       24
       24
       +
         versionCheckHook,

     

       25
       25
       +
         zlib,

     

       26
       26
       +
         zstd,

     

       13
       27
        
       }:

     

       14
       28
        
       

     

       15
       29
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       19
       33
        
         src = fetchFromGitHub {

     

       20
       34
        
           owner = "fluent";

     

       21
       35
        
           repo = "fluent-bit";

     

       22
       22
       -
           rev = "v${finalAttrs.version}";

     

       36
       36
       +
           tag = "v${finalAttrs.version}";

     

       23
       37
        
           hash = "sha256-E+y8lZ5fgJORFkig6aSVMYGk0US1b4xwjO9qnGu4R/Y=";

     

       24
       38
        
         };

     

       25
       39
        
       

     

       26
       26
       -
         # optional only to avoid linux rebuild

     

       27
       27
       -
         patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macos-11-sdk-compat.patch ];

     

       40
       40
       +
         # The source build documentation covers some dependencies and CMake options.

     

       41
       41
       +
         #

     

       42
       42
       +
         # - Linux: https://docs.fluentbit.io/manual/installation/sources/build-and-install

     

       43
       43
       +
         # - Darwin: https://docs.fluentbit.io/manual/installation/macos#compile-from-source

     

       44
       44
       +
         #

     

       45
       45
       +
         # Unfortunately, fluent-bit vends many dependencies (e.g. luajit) as source files and tries to compile them by

     

       46
       46
       +
         # default, with none of their dependencies and CMake options documented.

     

       47
       47
       +
         #

     

       48
       48
       +
         # Fortunately, there's the undocumented `FLB_PREFER_SYSTEM_LIBS` CMake option to link against system libraries for

     

       49
       49
       +
         # some dependencies.

     

       50
       50
       +
         #

     

       51
       51
       +
         # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L211-L218.

     

       52
       52
       +
         #

     

       53
       53
       +
         # Like `FLB_PREFER_SYSTEM_LIBS`, several CMake options aren't documented.

     

       54
       54
       +
         #

     

       55
       55
       +
         # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L111-L157.

     

       56
       56
       +
         #

     

       57
       57
       +
         # The CMake options may differ across target platforms. We'll stick to the minimum.

     

       58
       58
       +
         #

     

       59
       59
       +
         # See https://github.com/fluent/fluent-bit/tree/v3.2.6/packaging/distros.

     

       60
       60
       +
       

     

       61
       61
       +
         strictDeps = true;

     

       28
       62
        
       

     

       29
       63
        
         nativeBuildInputs = [

     

       64
       64
       +
           bison

     

       30
       65
        
           cmake

     

       31
       66
        
           flex

     

       32
       32
       -
           bison

     

       67
       67
       +
           pkg-config

     

       33
       68
        
         ];

     

       34
       69
        
       

     

       35
       70
        
         buildInputs =

     

       36
       71
        
           [

     

       37
       37
       -
             openssl

     

       72
       72
       +
             arrow-glib

     

       73
       73
       +
             c-ares

     

       74
       74
       +
             # Needed by rdkafka.

     

       75
       75
       +
             curl

     

       76
       76
       +
             jemalloc

     

       77
       77
       +
             libbacktrace

     

       78
       78
       +
             libnghttp2

     

       79
       79
       +
             libpq

     

       38
       80
        
             libyaml

     

       39
       39
       -
             libpq

     

       81
       81
       +
             luajit

     

       82
       82
       +
             openssl

     

       83
       83
       +
             rdkafka

     

       84
       84
       +
             # Needed by rdkafka.

     

       85
       85
       +
             zlib

     

       86
       86
       +
             # Needed by rdkafka.

     

       87
       87
       +
             zstd

     

       40
       88
        
           ]

     

       41
       41
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]

     

       42
       42
       -
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       43
       43
       -
             darwin.apple_sdk_11_0.frameworks.IOKit

     

       44
       44
       -
             darwin.apple_sdk_11_0.frameworks.Foundation

     

       89
       89
       +
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       90
       90
       +
             # libbpf doesn't build for Darwin yet.

     

       91
       91
       +
             libbpf

     

       92
       92
       +
             systemd

     

       45
       93
        
           ];

     

       46
       94
        
       

     

       47
       47
       -
         cmakeFlags = [

     

       48
       48
       -
           "-DFLB_RELEASE=ON"

     

       49
       49
       -
           "-DFLB_METRICS=ON"

     

       50
       50
       -
           "-DFLB_HTTP_SERVER=ON"

     

       51
       51
       -
           "-DFLB_OUT_PGSQL=ON"

     

       52
       52
       -
         ];

     

       95
       95
       +
         cmakeFlags =

     

       96
       96
       +
           [

     

       97
       97
       +
             (lib.cmakeBool "FLB_RELEASE" true)

     

       98
       98
       +
             (lib.cmakeBool "FLB_PREFER_SYSTEM_LIBS" true)

     

       99
       99
       +
           ]

     

       100
       100
       +
           ++ lib.optionals stdenv.cc.isClang [

     

       101
       101
       +
             # `FLB_SECURITY` causes bad linker options for Clang to be set.

     

       102
       102
       +
             (lib.cmakeBool "FLB_SECURITY" false)

     

       103
       103
       +
           ];

     

       53
       104
        
       

     

       54
       54
       -
         env.NIX_CFLAGS_COMPILE = toString (

     

       55
       55
       -
           # Assumes GNU version of strerror_r, and the posix version has an

     

       56
       56
       -
           # incompatible return type.

     

       57
       57
       -
           lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ]

     

       58
       58
       -
         );

     

       105
       105
       +
         # `src/CMakeLists.txt` installs fluent-bit's systemd unit files at the path in the `SYSTEMD_UNITDIR` CMake variable.

     

       106
       106
       +
         #

     

       107
       107
       +
         # The initial value of `SYSTEMD_UNITDIR` is set in `cmake/FindJournald` which uses pkg-config to find the systemd

     

       108
       108
       +
         # unit directory in the systemd package's `systemdsystemunitdir` pkg-config variable. `src/CMakeLists.txt` only

     

       109
       109
       +
         # sets `SYSTEMD_UNITDIR` to `/lib/systemd/system` if it's unset.

     

       110
       110
       +
         #

     

       111
       111
       +
         # By default, this resolves to systemd's Nix store path which is immutable. Consequently, CMake fails when trying

     

       112
       112
       +
         # to install fluent-bit's systemd unit files to the systemd Nix store path.

     

       113
       113
       +
         #

     

       114
       114
       +
         # We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable.

     

       115
       115
       +
         #

     

       116
       116
       +
         # https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE

     

       117
       117
       +
         PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${builtins.placeholder "out"}/lib/systemd/system";

     

       59
       118
        
       

     

       60
       119
        
         outputs = [

     

       61
       120
        
           "out"

     

       62
       121
        
           "dev"

     

       63
       122
        
         ];

     

       64
       123
        
       

     

       65
       65
       -
         postPatch = ''

     

       66
       66
       -
           substituteInPlace src/CMakeLists.txt \

     

       67
       67
       -
             --replace /lib/systemd $out/lib/systemd

     

       68
       68
       -
         '';

     

       124
       124
       +
         doInstallCheck = true;

     

       125
       125
       +
       

     

       126
       126
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       127
       127
       +
       

     

       128
       128
       +
         versionCheckProgramArg = "--version";

     

       129
       129
       +
       

     

       130
       130
       +
         passthru = {

     

       131
       131
       +
           tests = lib.optionalAttrs stdenv.isLinux {

     

       132
       132
       +
             inherit (nixosTests) fluent-bit;

     

       133
       133
       +
           };

     

       134
       134
       +
       

     

       135
       135
       +
           updateScript = nix-update-script { };

     

       136
       136
       +
         };

     

       69
       137
        
       

     

       70
       138
        
         meta = {

     

       71
       71
       -
           changelog = "https://github.com/fluent/fluent-bit/releases/tag/v${finalAttrs.version}";

     

       72
       72
       -
           description = "Log forwarder and processor, part of Fluentd ecosystem";

     

       139
       139
       +
           description = "Fast and lightweight logs and metrics processor for Linux, BSD, OSX and Windows";

     

       73
       140
        
           homepage = "https://fluentbit.io";

     

       74
       141
        
           license = lib.licenses.asl20;

     

       75
       75
       -
           maintainers = with lib.maintainers; [

     

       76
       76
       -
             samrose

     

       77
       77
       -
             fpletz

     

       78
       78
       -
           ];

     

       79
       79
       -
           platforms = lib.platforms.unix;

     

       142
       142
       +
           mainProgram = "fluent-bit";

     

       143
       143
       +
           maintainers = with lib.maintainers; [ arianvp ];

     

       80
       144
        
         };

     

       81
       145
        
       })

+14 -7

pkgs/by-name/go/golangci-lint-langserver/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
       +
         golangci-lint,

     

       5
       5
       +
         writableTmpDirAsHomeHook,

     

       4
       6
        
         fetchFromGitHub,

     

       5
       7
        
       }:

     

       6
       8
        
       

     

       7
       9
        
       buildGoModule rec {

     

       8
       10
        
         pname = "golangci-lint-langserver";

     

       9
       9
       -
         version = "0.0.9";

     

       11
       11
       +
         version = "0.0.10";

     

       10
       12
        
       

     

       11
       13
        
         src = fetchFromGitHub {

     

       12
       14
        
           owner = "nametake";

     

       13
       15
        
           repo = "golangci-lint-langserver";

     

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

     

       15
       15
       -
           sha256 = "sha256-jNRDqg2a5dXo7QI4CBRw0MLwhfpdGuhygpMoSKNcgC0=";

     

       16
       16
       +
           tag = "v${version}";

     

       17
       17
       +
           hash = "sha256-wNofr/s8K+vbvNZWrQ97g2V0fNAS2P/Zf7tsOmly+gc=";

     

       16
       18
        
         };

     

       17
       19
        
       

     

       18
       18
       -
         vendorHash = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg=";

     

       20
       20
       +
         vendorHash = "sha256-SsGw26y/ZIBFp9dBk55ebQgJiLWOFRNe21h6huYE84I=";

     

       19
       21
        
       

     

       20
       22
        
         subPackages = [ "." ];

     

       21
       23
        
       

     

       22
       22
       -
         meta = with lib; {

     

       24
       24
       +
         nativeCheckInputs = [

     

       25
       25
       +
           golangci-lint

     

       26
       26
       +
           writableTmpDirAsHomeHook

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       23
       30
        
           description = "Language server for golangci-lint";

     

       24
       31
        
           homepage = "https://github.com/nametake/golangci-lint-langserver";

     

       25
       25
       -
           license = licenses.mit;

     

       26
       26
       -
           maintainers = with maintainers; [ kirillrdy ];

     

       32
       32
       +
           license = lib.licenses.mit;

     

       33
       33
       +
           maintainers = with lib.maintainers; [ kirillrdy ];

     

       27
       34
        
           mainProgram = "golangci-lint-langserver";

     

       28
       35
        
         };

     

       29
       36
        
       }

+2 -2

pkgs/by-name/go/gosmee/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "gosmee";

     

       10
       10
       -
         version = "0.22.4";

     

       10
       10
       +
         version = "0.23.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "chmouel";

     

       14
       14
        
           repo = "gosmee";

     

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

     

       16
       16
       -
           hash = "sha256-e+Mkhkk+PTeTipWFnjiJ8jLMYB7D+/FCWaOuaKe1jr4=";

     

       16
       16
       +
           hash = "sha256-4Y5aExRjR2JPa9iTJPQE7qCRnQpqLBYVPLf6v7Z07a8=";

     

       17
       17
        
         };

     

       18
       18
        
         vendorHash = null;

     

       19
       19

+10

pkgs/by-name/ma/maven/package.nix

···

       5
       5
        
         jdk_headless,

     

       6
       6
        
         makeWrapper,

     

       7
       7
        
         stdenvNoCC,

     

       8
       8
       +
         testers,

     

       8
       9
        
       }:

     

       9
       10
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       10
       11
        
         pname = "maven";

     
···

       57
       58
        
                 maven = finalAttrs.finalPackage;

     

       58
       59
        
               }

     

       59
       60
        
             );

     

       61
       61
       +
             tests = {

     

       62
       62
       +
               version = testers.testVersion {

     

       63
       63
       +
                 package = finalAttrs.finalPackage;

     

       64
       64
       +
                 command = ''

     

       65
       65
       +
                   env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \

     

       66
       66
       +
                     mvn --version

     

       67
       67
       +
                 '';

     

       68
       68
       +
               };

     

       69
       69
       +
             };

     

       60
       70
        
           };

     

       61
       71
        
       

     

       62
       72
        
         meta = {

+25

pkgs/by-name/mu/multiviewer-for-f1/package.nix

···

       22
       22
        
         nss,

     

       23
       23
        
         pango,

     

       24
       24
        
         xorg,

     

       25
       25
       +
         writeScript,

     

       25
       26
        
       }:

     

       26
       27
        
       let

     

       27
       28
        
         id = "232635194";

     
···

       91
       92
        
             }:\"$out/share/Multiviewer for F1\""

     

       92
       93
        
       

     

       93
       94
        
           runHook postInstall

     

       95
       95
       +
         '';

     

       96
       96
       +
       

     

       97
       97
       +
         passthru.updateScript = writeScript "update-multiviewer-for-f1" ''

     

       98
       98
       +
           #!/usr/bin/env nix-shell

     

       99
       99
       +
           #!nix-shell -i bash -p curl common-updater-scripts

     

       100
       100
       +
           set -eu -o pipefail

     

       101
       101
       +
       

     

       102
       102
       +
           # Get latest API for packages, store so we only make one request

     

       103
       103
       +
           latest=$(curl -s "https://api.multiviewer.app/api/v1/releases/latest/")

     

       104
       104
       +
       

     

       105
       105
       +
           # From the downloaded JSON extract the url, version and id

     

       106
       106
       +
           link=$(echo $latest | jq -r '.downloads[] | select(.platform=="linux_deb").url')

     

       107
       107
       +
           id=$(echo $latest | jq -r '.downloads[] | select(.platform=="linux_deb").id')

     

       108
       108
       +
           version=$(echo $latest | jq -r '.version')

     

       109
       109
       +
       

     

       110
       110
       +
           if [ "$version" != "${version}" ]

     

       111
       111
       +
           then

     

       112
       112
       +
             # Pre-calculate package hash

     

       113
       113
       +
             hash=$(nix-prefetch-url --type sha256 $link)

     

       114
       114
       +
       

     

       115
       115
       +
             # Update ID and version in source

     

       116
       116
       +
             update-source-version ${pname} "$id" --version-key=id

     

       117
       117
       +
             update-source-version ${pname} "$version" "$hash" --system=x86_64-linux

     

       118
       118
       +
           fi

     

       94
       119
        
         '';

     

       95
       120
        
       

     

       96
       121
        
         meta = with lib; {

+8 -4

pkgs/by-name/pa/paretosecurity/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "paretosecurity";

     

       12
       12
       -
         version = "0.0.88";

     

       12
       12
       +
         version = "0.0.91";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "ParetoSecurity";

     

       16
       16
        
           repo = "agent";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           hash = "sha256-UVnZhkajrc9q6AZvIU7oi931ugxkiVSPk1NugAERnek=";

     

       18
       18
       +
           hash = "sha256-/kGwV96Jp7U08jh/wPQMcoV48zQe9ixY7gpNdtFyOkk=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-HReQu23sHLaxc5N8h2vYv64ruJPmY4HM9whAEKV+3Eo=";

     

       21
       21
       +
         vendorHash = "sha256-kGrYoN0dGcSuQW47Y4LUFdHQYAoY74NOM1LLPdhmLhc=";

     

       22
       22
        
         proxyVendor = true;

     

       23
       23
        
       

     

       24
       24
        
         subPackages = [

     
···

       53
       53
        
             root helper, so that you can run the checker in userspace. Some checks

     

       54
       54
        
             require root permissions, and the checker asks the helper to run those.

     

       55
       55
        
       

     

       56
       56
       -
             Additionally, you can run `paretosecurity link` to configure the agent

     

       56
       56
       +
             Additionally, if you enable `services.paretosecurity.trayIcon`, you get a

     

       57
       57
       +
             little Vilfredo Pareto living in your systray showing your the current

     

       58
       58
       +
             status of checks.

     

       59
       59
       +
       

     

       60
       60
       +
             Finally, you can run `paretosecurity link` to configure the agent

     

       57
       61
        
             to send the status of checks to https://dash.paretosecurity.com to make

     

       58
       62
        
             compliance people happy. No sending happens until your device is linked.

     

       59
       63
        
           '';

+54

pkgs/by-name/sn/snac2/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitea,

     

       5
       5
       +
         curl,

     

       6
       6
       +
         openssl,

     

       7
       7
       +
         nix-update-script,

     

       8
       8
       +
         versionCheckHook,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
       +
         pname = "snac2";

     

       13
       13
       +
         version = "2.74";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitea {

     

       16
       16
       +
           domain = "codeberg.org";

     

       17
       17
       +
           owner = "grunfink";

     

       18
       18
       +
           repo = "snac2";

     

       19
       19
       +
           tag = finalAttrs.version;

     

       20
       20
       +
           hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           curl

     

       25
       25
       +
           openssl

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       29
       29
       +
       

     

       30
       30
       +
         env.NIX_CFLAGS_COMPILE = toString (

     

       31
       31
       +
           lib.optionals stdenv.hostPlatform.isDarwin [

     

       32
       32
       +
             "-Dst_mtim=st_mtimespec"

     

       33
       33
       +
             "-Dst_ctim=st_ctimespec"

     

       34
       34
       +
           ]

     

       35
       35
       +
         );

     

       36
       36
       +
       

     

       37
       37
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       38
       38
       +
         versionCheckProgram = "${placeholder "out"}/bin/snac";

     

       39
       39
       +
         doInstallCheck = true;

     

       40
       40
       +
       

     

       41
       41
       +
         passthru = {

     

       42
       42
       +
           updateScript = nix-update-script { };

     

       43
       43
       +
         };

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           changelog = "https://codeberg.org/grunfink/snac2/src/tag/${finalAttrs.version}/RELEASE_NOTES.md";

     

       47
       47
       +
           description = "Simple, minimalistic ActivityPub instance (2.x, C)";

     

       48
       48
       +
           homepage = "https://codeberg.org/grunfink/snac2";

     

       49
       49
       +
           license = lib.licenses.mit;

     

       50
       50
       +
           mainProgram = "snac";

     

       51
       51
       +
           maintainers = with lib.maintainers; [ misuzu ];

     

       52
       52
       +
           platforms = lib.platforms.unix;

     

       53
       53
       +
         };

     

       54
       54
       +
       })

+2 -2

pkgs/by-name/te/tevent/package.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "tevent";

     

       21
       21
       -
         version = "0.16.1";

     

       21
       21
       +
         version = "0.16.2";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "mirror://samba/tevent/${pname}-${version}.tar.gz";

     

       25
       25
       -
           sha256 = "sha256-Nilx4PMtwZBfb+RzYxnEuDSMItyFqmw/aQoo7+VIAp4=";

     

       25
       25
       +
           sha256 = "sha256-8LvSnfq7y7zp9HGPwWVBDN1PfY7h89/FRhjUwDGZzqM=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/tp/tpnote/package.nix

···

       14
       14
        
       

     

       15
       15
        
       rustPlatform.buildRustPackage rec {

     

       16
       16
        
         pname = "tpnote";

     

       17
       17
       -
         version = "1.25.4";

     

       17
       17
       +
         version = "1.25.5";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "getreu";

     

       21
       21
        
           repo = "tp-note";

     

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

     

       23
       23
       -
           hash = "sha256-1KcTY98QNOic0riHhLi4HcSREboMaXq7lb1+LsB0HL0=";

     

       23
       23
       +
           hash = "sha256-UNWnjcwIVRCmRp+i02sDKE9nF2YBc9TQuXLNjkpRZhc=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         useFetchCargoVendor = true;

     

       27
       27
       -
         cargoHash = "sha256-c6Kz6Z8yfdh7QaDlgI2qSCoG+4c/g9rjBikjN31JftM=";

     

       27
       27
       +
         cargoHash = "sha256-/VRVFDzUqMS3y6e5I+ZX8ULxJ2kL8ycesWEYUeZSujo=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           cmake

+102

pkgs/by-name/xu/xunlei-uos/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         dpkg,

     

       4
       4
       +
         stdenv,

     

       5
       5
       +
         fetchurl,

     

       6
       6
       +
         buildFHSEnv,

     

       7
       7
       +
         autoPatchelfHook,

     

       8
       8
       +
         writeShellScript,

     

       9
       9
       +
         zenity,

     

       10
       10
       +
         nss,

     

       11
       11
       +
         gtk2,

     

       12
       12
       +
         alsa-lib,

     

       13
       13
       +
         dbus-glib,

     

       14
       14
       +
         libXtst,

     

       15
       15
       +
         libXdamage,

     

       16
       16
       +
         libXScrnSaver,

     

       17
       17
       +
       }:

     

       18
       18
       +
       

     

       19
       19
       +
       let

     

       20
       20
       +
         sources = import ./sources.nix;

     

       21
       21
       +
       

     

       22
       22
       +
         xunlei-unwrapped = stdenv.mkDerivation rec {

     

       23
       23
       +
           pname = "xunlei-uos";

     

       24
       24
       +
           version = sources.version;

     

       25
       25
       +
       

     

       26
       26
       +
           src =

     

       27
       27
       +
             {

     

       28
       28
       +
               x86_64-linux = fetchurl {

     

       29
       29
       +
                 url = sources.amd64_url;

     

       30
       30
       +
                 hash = sources.amd64_hash;

     

       31
       31
       +
               };

     

       32
       32
       +
               aarch64-linux = fetchurl {

     

       33
       33
       +
                 url = sources.arm64_url;

     

       34
       34
       +
                 hash = sources.arm64_hash;

     

       35
       35
       +
               };

     

       36
       36
       +
               loongarch64-linux = fetchurl {

     

       37
       37
       +
                 url = sources.loongarch64_url;

     

       38
       38
       +
                 hash = sources.loongarch64_hash;

     

       39
       39
       +
               };

     

       40
       40
       +
             }

     

       41
       41
       +
             .${stdenv.hostPlatform.system}

     

       42
       42
       +
               or (throw "${pname}-${version}: ${stdenv.hostPlatform.system} is unsupported.");

     

       43
       43
       +
       

     

       44
       44
       +
           buildInputs = [

     

       45
       45
       +
             nss

     

       46
       46
       +
             gtk2

     

       47
       47
       +
             alsa-lib

     

       48
       48
       +
             dbus-glib

     

       49
       49
       +
             libXtst

     

       50
       50
       +
             libXdamage

     

       51
       51
       +
             libXScrnSaver

     

       52
       52
       +
           ];

     

       53
       53
       +
       

     

       54
       54
       +
           nativeBuildInputs = [

     

       55
       55
       +
             dpkg

     

       56
       56
       +
             autoPatchelfHook

     

       57
       57
       +
           ];

     

       58
       58
       +
       

     

       59
       59
       +
           installPhase = ''

     

       60
       60
       +
             runHook preInstall

     

       61
       61
       +
       

     

       62
       62
       +
             mkdir -p $out/lib

     

       63
       63
       +
             cp -r opt/apps/com.xunlei.download/files $out/lib/xunlei

     

       64
       64
       +
             cp -r opt/apps/com.xunlei.download/entries $out/share

     

       65
       65
       +
             mv $out/share/icons/hicolor/scalable/apps/com.thunder.download.svg \

     

       66
       66
       +
               $out/share/icons/hicolor/scalable/apps/com.xunlei.download.svg

     

       67
       67
       +
             substituteInPlace $out/share/applications/com.xunlei.download.desktop \

     

       68
       68
       +
               --replace-fail "Categories=net" "Categories=Network" \

     

       69
       69
       +
               --replace-fail "/opt/apps/com.xunlei.download/files/start.sh" "xunlei-uos" \

     

       70
       70
       +
               --replace-fail "/opt/apps/com.xunlei.download/entries/icons/hicolor/256x256/apps/com.xunlei.download.png" "com.xunlei.download"

     

       71
       71
       +
       

     

       72
       72
       +
             runHook postInstall

     

       73
       73
       +
           '';

     

       74
       74
       +
       

     

       75
       75
       +
           meta = {

     

       76
       76
       +
             description = "Download manager supporting HTTP, FTP, BitTorrent, and eDonkey network protocols";

     

       77
       77
       +
             homepage = "https://www.xunlei.com";

     

       78
       78
       +
             license = lib.licenses.unfree;

     

       79
       79
       +
             maintainers = [ lib.maintainers.linuxwhata ];

     

       80
       80
       +
             platforms = [

     

       81
       81
       +
               "x86_64-linux"

     

       82
       82
       +
               "aarch64-linux"

     

       83
       83
       +
               "loongarch64-linux"

     

       84
       84
       +
             ];

     

       85
       85
       +
           };

     

       86
       86
       +
         };

     

       87
       87
       +
       in

     

       88
       88
       +
       buildFHSEnv {

     

       89
       89
       +
         inherit (xunlei-unwrapped) pname version meta;

     

       90
       90
       +
         runScript = writeShellScript "xunlei-launcher" ''

     

       91
       91
       +
           exec ${xunlei-unwrapped}/lib/xunlei/thunder -start $1 "$@"

     

       92
       92
       +
         '';

     

       93
       93
       +
         extraInstallCommands = ''

     

       94
       94
       +
           mkdir -p $out

     

       95
       95
       +
           ln -s ${xunlei-unwrapped}/share $out/share

     

       96
       96
       +
         '';

     

       97
       97
       +
       

     

       98
       98
       +
         passthru.updateScript = ./update.sh;

     

       99
       99
       +
       

     

       100
       100
       +
         includeClosures = true;

     

       101
       101
       +
         targetPkgs = pkgs: [ zenity ]; # system tray click events

     

       102
       102
       +
       }

+11

pkgs/by-name/xu/xunlei-uos/sources.nix

···

       1
       1
       +
       # Generated by ./update.sh - do not update manually!

     

       2
       2
       +
       # Last updated: 2025-03-19

     

       3
       3
       +
       {

     

       4
       4
       +
         version = "1.0.0.5";

     

       5
       5
       +
         amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_amd64.deb";

     

       6
       6
       +
         arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_arm64.deb";

     

       7
       7
       +
         loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_1.0.0.5_loongarch64.deb";

     

       8
       8
       +
         amd64_hash = "sha256-K+eHPmG2tT5Z+RWxigg03itw6Rcnk5MZlODqS/JtAnk=";

     

       9
       9
       +
         arm64_hash = "sha256-iA9mbp0wSe66qC5lphMTFPzmOJjzHfWKubGRPiKcVdg=";

     

       10
       10
       +
         loongarch64_hash = "sha256-44QPnB/1uWHaQkd3DBMDvYXfXwch9HywZUvg71z8fts=";

     

       11
       11
       +
       }

+60

pkgs/by-name/xu/xunlei-uos/update.sh

···

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip

     

       3
       3
       +
       

     

       4
       4
       +
       base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-"

     

       5
       5
       +
       base_url_appendix="/Packages.gz"

     

       6
       6
       +
       target_package="com.xunlei.download"

     

       7
       7
       +
       packages_file="Packages.gz"

     

       8
       8
       +
       

     

       9
       9
       +
       url=()

     

       10
       10
       +
       version=()  # TODO: Currently, there is no version differences between archs. This is reserved for future use.

     

       11
       11
       +
       hash=()

     

       12
       12
       +
       

     

       13
       13
       +
       for i in amd64 arm64 loongarch64

     

       14
       14
       +
       do

     

       15
       15
       +
           current_url=$base_url_suffix$i$base_url_appendix

     

       16
       16
       +
           curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url

     

       17
       17
       +
           current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '

     

       18
       18
       +
           BEGIN { found = 0 }

     

       19
       19
       +
           {

     

       20
       20
       +
               if ($0 ~ "^Package: "pkg) {

     

       21
       21
       +
                   found = 1;

     

       22
       22
       +
               }

     

       23
       23
       +
               if (found && $1 == "Version:") {

     

       24
       24
       +
                   print $2;

     

       25
       25
       +
                   exit;

     

       26
       26
       +
               }

     

       27
       27
       +
           }

     

       28
       28
       +
           ')

     

       29
       29
       +
           version+=("$current_version")

     

       30
       30
       +
           sha256sum=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '

     

       31
       31
       +
           BEGIN { found = 0 }

     

       32
       32
       +
               {

     

       33
       33
       +
                   if ($0 ~ "^Package: "pkg) {

     

       34
       34
       +
                   found = 1;

     

       35
       35
       +
               }

     

       36
       36
       +
               if (found && $1 == "SHA256:") {

     

       37
       37
       +
                   print $2;

     

       38
       38
       +
                   exit;

     

       39
       39
       +
               }

     

       40
       40
       +
           }

     

       41
       41
       +
           ')

     

       42
       42
       +
           url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.xunlei.download/com.xunlei.download_"$version"_"$i".deb")

     

       43
       43
       +
           hash+=("$(nix hash convert --to sri --hash-algo sha256 $sha256sum)")

     

       44
       44
       +
       done

     

       45
       45
       +
       

     

       46
       46
       +
       cat >sources.nix <<EOF

     

       47
       47
       +
       # Generated by ./update.sh - do not update manually!

     

       48
       48
       +
       # Last updated: $(date +%F)

     

       49
       49
       +
       {

     

       50
       50
       +
         version = "${version[0]}";

     

       51
       51
       +
         amd64_url = "${url[0]}";

     

       52
       52
       +
         arm64_url = "${url[1]}";

     

       53
       53
       +
         loongarch64_url = "${url[2]}";

     

       54
       54
       +
         amd64_hash = "${hash[0]}";

     

       55
       55
       +
         arm64_hash = "${hash[1]}";

     

       56
       56
       +
         loongarch64_hash = "${hash[2]}";

     

       57
       57
       +
       }

     

       58
       58
       +
       EOF

     

       59
       59
       +
       

     

       60
       60
       +
       rm -r Packages.gz

-22

pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch

···

       1
       1
       -
       diff --git a/script/generate-licenses b/script/generate-licenses

     

       2
       2
       -
       index 368f63b..c2bf3a5 100644

     

       3
       3
       -
       --- a/script/generate-licenses

     

       4
       4
       -
       +++ b/script/generate-licenses

     

       5
       5
       -
       @@ -18,17 +18,9 @@ echo -n "" > "$OUTPUT_FILE"

     

       6
       6
       -
            echo -e "\n# ###### CODE LICENSES ######\n"

     

       7
       7
       -
        } >> "$OUTPUT_FILE"

     

       8
       8
       -
        

     

       9
       9
       -
       -if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then

     

       10
       10
       -
       -  echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."

     

       11
       11
       -
       -  cargo install "cargo-about@$CARGO_ABOUT_VERSION"

     

       12
       12
       -
       -else

     

       13
       13
       -
       -  echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."

     

       14
       14
       -
       -fi

     

       15
       15
       -
       -

     

       16
       16
       -
        echo "Generating cargo licenses"

     

       17
       17
       -
        

     

       18
       18
       -
        cargo about generate \

     

       19
       19
       -
       -    --fail \

     

       20
       20
       -
            -c script/licenses/zed-licenses.toml \

     

       21
       21
       -
            "$TEMPLATE_FILE" >> "$OUTPUT_FILE"

     

       22
       22
       -

pkgs/by-name/ze/zed-editor/0002-linux-linker.patch pkgs/by-name/ze/zed-editor/0001-linux-linker.patch

+5 -10

pkgs/by-name/ze/zed-editor/package.nix

···

       98
       98
        
       in

     

       99
       99
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       100
       100
        
         pname = "zed-editor";

     

       101
       101
       -
         version = "0.177.11";

     

       101
       101
       +
         version = "0.178.5";

     

       102
       102
        
       

     

       103
       103
        
         outputs =

     

       104
       104
        
           [ "out" ]

     
···

       110
       110
        
           owner = "zed-industries";

     

       111
       111
        
           repo = "zed";

     

       112
       112
        
           tag = "v${finalAttrs.version}";

     

       113
       113
       -
           hash = "sha256-cnzaW0paORio8AONtVVGUZWG+HsWte12aWK2qvfj8oI=";

     

       113
       113
       +
           hash = "sha256-YkoIOBoR5hMt99D1bJ1yWLv7C/rY6VKC5J/7c5SMUFs=";

     

       114
       114
        
         };

     

       115
       115
        
       

     

       116
       116
        
         patches = [

     

       117
       117
       -
           # Zed uses cargo-install to install cargo-about during the script execution.

     

       118
       118
       -
           # We provide cargo-about ourselves and can skip this step.

     

       119
       119
       -
           # Until https://github.com/zed-industries/zed/issues/19971 is fixed,

     

       120
       120
       -
           # we also skip any crate for which the license cannot be determined.

     

       121
       121
       -
           ./0001-generate-licenses.patch

     

       122
       122
       -
       

     

       123
       117
        
           # Upstream delegates linking on Linux to clang to make use of mold,

     

       124
       118
        
           # but builds fine with our standard linker.

     

       125
       119
        
           # This patch removes their linker override from the cargo config.

     

       126
       126
       -
           ./0002-linux-linker.patch

     

       120
       120
       +
           ./0001-linux-linker.patch

     

       127
       121
        
       

     

       128
       122
        
           # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840

     

       129
       123
        
           "script/patches/use-cross-platform-livekit.patch"

     
···

       136
       130
        
         '';

     

       137
       131
        
       

     

       138
       132
        
         useFetchCargoVendor = true;

     

       139
       139
       -
         cargoHash = "sha256-Hl5QWU9yKXedQFVd60Fz5O7B2e/YUqj3BLNmqC44UP0=";

     

       133
       133
       +
         cargoHash = "sha256-xJaiHngsm74RdcEUXaDrc/Hwy4ywZrEiJt7JYTc/NpM=";

     

       140
       134
        
       

     

       141
       135
        
         nativeBuildInputs =

     

       142
       136
        
           [

     
···

       192
       186
        
         buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];

     

       193
       187
        
       

     

       194
       188
        
         env = {

     

       189
       189
       +
           ALLOW_MISSING_LICENSES = true;

     

       195
       190
        
           ZSTD_SYS_USE_PKG_CONFIG = true;

     

       196
       191
        
           FONTCONFIG_FILE = makeFontsConf {

     

       197
       192
        
             fontDirectories = [

+4 -4

pkgs/by-name/ze/zellij/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       17
       17
        
         pname = "zellij";

     

       18
       18
       -
         version = "0.42.0";

     

       18
       18
       +
         version = "0.42.1";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "zellij-org";

     

       22
       22
        
           repo = "zellij";

     

       23
       23
        
           tag = "v${finalAttrs.version}";

     

       24
       24
       -
           hash = "sha256-qvm8mRm/YYcuNX2Rv0tYjcIXjaF9dkwd7wpL++ho3t0=";

     

       24
       24
       +
           hash = "sha256-EK+eQfNhfVxjIsoyj43tcRjHDT9O8/n7hUz24BC42nw=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of

     
···

       32
       32
        
         '';

     

       33
       33
        
       

     

       34
       34
        
         useFetchCargoVendor = true;

     

       35
       35
       -
         cargoHash = "sha256-cAO8A/e6tkUY7pm/T4Riz4UPIc22oj5FFC6sQL1QIuc=";

     

       35
       35
       +
         cargoHash = "sha256-0+cU2C6zjVv2G8h7oK0ztMDdukVR6QRzN81/SfLZapY=";

     

       36
       36
        
       

     

       37
       37
        
         env.OPENSSL_NO_VENDOR = 1;

     

       38
       38
        
       

     
···

       55
       55
        
         nativeInstallCheckInputs = [

     

       56
       56
        
           versionCheckHook

     

       57
       57
        
         ];

     

       58
       58
       -
         versionCheckProgramArg = [ "--version" ];

     

       58
       58
       +
         versionCheckProgramArg = "--version";

     

       59
       59
        
         doInstallCheck = true;

     

       60
       60
        
       

     

       61
       61
        
         # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs

+2 -2

pkgs/desktops/enlightenment/efl/default.nix

···

       60
       60
        
       

     

       61
       61
        
       stdenv.mkDerivation rec {

     

       62
       62
        
         pname = "efl";

     

       63
       63
       -
         version = "1.28.0";

     

       63
       63
       +
         version = "1.28.1";

     

       64
       64
        
       

     

       65
       65
        
         src = fetchurl {

     

       66
       66
        
           url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";

     

       67
       67
       -
           sha256 = "sha256-8JpD1rSGG+BswOKEnFMpZBPU5SyOMfUvyV6epfHFmjY=";

     

       67
       67
       +
           sha256 = "sha256-hM9hRfnMgr//aQAFviQ5LI88UvjgD/BNjuo3FCnAlCQ=";

     

       68
       68
        
         };

     

       69
       69
        
       

     

       70
       70
        
         nativeBuildInputs = [

+2 -2

pkgs/desktops/enlightenment/enlightenment/default.nix

···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "enlightenment";

     

       30
       30
       -
         version = "0.27.0";

     

       30
       30
       +
         version = "0.27.1";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchurl {

     

       33
       33
        
           url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";

     

       34
       34
       -
           sha256 = "sha256-W2a5FMbZCpFrP+ZrX/cKn9kSCIqmOZvd4bOlBarlAzE=";

     

       34
       34
       +
           sha256 = "sha256-tB34dx9g47lqGXOuVm10JcU6gznxjlTjEjAhh4HaL6k=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [

+4 -7

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

···

       5
       5
        
         cryptography,

     

       6
       6
        
         dnspython,

     

       7
       7
        
         fetchFromGitHub,

     

       8
       8
       -
         gssapi,

     

       9
       8
        
         hatchling,

     

       10
       10
       -
         ldap3,

     

       9
       9
       +
         minikerberos,

     

       11
       10
        
         msldap,

     

       12
       11
        
         pyasn1,

     

       13
       12
        
         pytestCheckHook,

     
···

       17
       16
        
       

     

       18
       17
        
       buildPythonPackage rec {

     

       19
       18
        
         pname = "bloodyad";

     

       20
       20
       -
         version = "2.1.8";

     

       19
       19
       +
         version = "2.1.9";

     

       21
       20
        
         pyproject = true;

     

       22
       21
        
       

     

       23
       22
        
         disabled = pythonOlder "3.8";

     
···

       26
       25
        
           owner = "CravateRouge";

     

       27
       26
        
           repo = "bloodyAD";

     

       28
       27
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-CggC7Cdw++Rgp6U4zK3er+ctBbfsxtxow9gFkYvIDds=";

     

       28
       28
       +
           hash = "sha256-XqCP2GfS8hxlFU4Mndeh+7Ll2kXJ3Dei+AGp/oy0PUg=";

     

       30
       29
        
         };

     

       31
       30
        
       

     

       32
       31
        
         build-system = [ hatchling ];

     
···

       35
       34
        
           asn1crypto

     

       36
       35
        
           cryptography

     

       37
       36
        
           dnspython

     

       38
       38
       -
           gssapi

     

       39
       39
       -
           ldap3

     

       37
       37
       +
           minikerberos

     

       40
       38
        
           msldap

     

       41
       41
       -
           pyasn1

     

       42
       39
        
           winacl

     

       43
       40
        
         ];

     

       44
       41

+2 -2

pkgs/development/python-modules/boto3-stubs/default.nix

···

       359
       359
        
       

     

       360
       360
        
       buildPythonPackage rec {

     

       361
       361
        
         pname = "boto3-stubs";

     

       362
       362
       -
         version = "1.37.13";

     

       362
       362
       +
         version = "1.37.17";

     

       363
       363
        
         pyproject = true;

     

       364
       364
        
       

     

       365
       365
        
         disabled = pythonOlder "3.7";

     
···

       367
       367
        
         src = fetchPypi {

     

       368
       368
        
           pname = "boto3_stubs";

     

       369
       369
        
           inherit version;

     

       370
       370
       -
           hash = "sha256-vZIxrbBXis/GLIIW9j4jqdQJzSpUtl8xJo4JRw+78FM=";

     

       370
       370
       +
           hash = "sha256-kjhXUrThwsdffKfZW1lr7duAbh8DpValQWc2Gsm0PeM=";

     

       371
       371
        
         };

     

       372
       372
        
       

     

       373
       373
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/botocore-stubs/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "botocore-stubs";

     

       13
       13
       -
         version = "1.37.13";

     

       13
       13
       +
         version = "1.37.17";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           pname = "botocore_stubs";

     

       20
       20
        
           inherit version;

     

       21
       21
       -
           hash = "sha256-6h6aOA5BGcVwzAd6lMc3cn2MgeC4Z6PXXdlL6xe7F7c=";

     

       21
       21
       +
           hash = "sha256-ucOh6PtX+3C0mqU4DKvvqzLsAo2KHY9ayD3YNsW0Kag=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ setuptools ];

+23 -18

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

···

       15
       15
        
         pythonOlder,

     

       16
       16
        
         requests,

     

       17
       17
        
         responses,

     

       18
       18
       +
         setuptools,

     

       18
       19
        
         tqdm,

     

       19
       20
        
         xxhash,

     

       20
       21
        
       }:

     

       21
       21
       -
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "datasets";

     

       24
       24
       -
         version = "3.2.0";

     

       25
       25
       -
         format = "setuptools";

     

       26
       26
       -
       

     

       27
       27
       -
         disabled = pythonOlder "3.8";

     

       24
       24
       +
         version = "3.4.1";

     

       25
       25
       +
         pyproject = true;

     

       28
       26
        
       

     

       29
       27
        
         src = fetchFromGitHub {

     

       30
       28
        
           owner = "huggingface";

     

       31
       31
       -
           repo = pname;

     

       29
       29
       +
           repo = "datasets";

     

       32
       30
        
           tag = version;

     

       33
       33
       -
           hash = "sha256-3Q4tNLA9qUb7XdxP1NftYDcVUgq5ol9OZfklhmadk5I=";

     

       31
       31
       +
           hash = "sha256-a0c5E4N1X+PtO4+UZn8l1JcLGTNpLPyfEkrrxNsjfLA=";

     

       34
       32
        
         };

     

       35
       33
        
       

     

       36
       36
       -
         # remove pyarrow<14.0.1 vulnerability fix

     

       37
       37
       -
         postPatch = ''

     

       38
       38
       -
           substituteInPlace src/datasets/features/features.py \

     

       39
       39
       -
             --replace "import pyarrow_hotfix" "#import pyarrow_hotfix"

     

       40
       40
       -
         '';

     

       34
       34
       +
         build-system = [

     

       35
       35
       +
           setuptools

     

       36
       36
       +
         ];

     

       41
       37
        
       

     

       42
       42
       -
         propagatedBuildInputs = [

     

       38
       38
       +
         dependencies = [

     

       43
       39
        
           aiohttp

     

       44
       40
        
           dill

     

       45
       41
        
           fsspec

     
···

       53
       49
        
           responses

     

       54
       50
        
           tqdm

     

       55
       51
        
           xxhash

     

       56
       56
       -
         ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         pythonRelaxDeps = [

     

       55
       55
       +
           # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L117

     

       56
       56
       +
           # "pin until dill has official support for determinism"

     

       57
       57
       +
           "dill"

     

       58
       58
       +
           "multiprocess"

     

       59
       59
       +
           # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L129

     

       60
       60
       +
           # "to support protocol=kwargs in fsspec's `open`, `get_fs_token_paths`"

     

       61
       61
       +
           "fsspec"

     

       62
       62
       +
         ];

     

       57
       63
        
       

     

       58
       64
        
         # Tests require pervasive internet access

     

       59
       65
        
         doCheck = false;

     
···

       63
       69
        
       

     

       64
       70
        
         pythonImportsCheck = [ "datasets" ];

     

       65
       71
        
       

     

       66
       66
       -
         meta = with lib; {

     

       72
       72
       +
         meta = {

     

       67
       73
        
           description = "Open-access datasets and evaluation metrics for natural language processing";

     

       68
       74
        
           mainProgram = "datasets-cli";

     

       69
       75
        
           homepage = "https://github.com/huggingface/datasets";

     

       70
       76
        
           changelog = "https://github.com/huggingface/datasets/releases/tag/${src.tag}";

     

       71
       71
       -
           license = licenses.asl20;

     

       72
       72
       -
           platforms = platforms.unix;

     

       73
       73
       -
           maintainers = [ ];

     

       77
       77
       +
           license = lib.licenses.asl20;

     

       78
       78
       +
           maintainers = with lib.maintainers; [ osbm ];

     

       74
       79
        
         };

     

       75
       80
        
       }

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "dsnap";

     

       20
       20
       -
         version = "1.0.0";

     

       20
       20
       +
         version = "1.0.1";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.7";

     
···

       26
       26
        
           owner = "RhinoSecurityLabs";

     

       27
       27
        
           repo = "dsnap";

     

       28
       28
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-yKch+tKjFhvZfzloazMH378dkERF8gnZEX1Som+d670=";

     

       29
       29
       +
           hash = "sha256-h5zeyfkBoHnvjqHYahDXEEbGdmMti2Y56R/8OKyxOOM=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

+8 -10

pkgs/development/python-modules/fastapi-sso/default.nix

···

       8
       8
        
         oauthlib,

     

       9
       9
        
         poetry-core,

     

       10
       10
        
         pydantic,

     

       11
       11
       -
         pylint,

     

       11
       11
       +
         pyjwt,

     

       12
       12
       +
         pytest-cov-stub,

     

       12
       13
        
         pytest-asyncio,

     

       13
       14
        
         pytest-xdist,

     

       14
       15
        
         pytestCheckHook,

     
···

       17
       18
        
       

     

       18
       19
        
       buildPythonPackage rec {

     

       19
       20
        
         pname = "fastapi-sso";

     

       20
       20
       -
         version = "0.17.0";

     

       21
       21
       +
         version = "0.18.0";

     

       21
       22
        
         pyproject = true;

     

       22
       23
        
       

     

       23
       23
       -
         disabled = pythonOlder "3.8";

     

       24
       24
       +
         disabled = pythonOlder "3.11";

     

       24
       25
        
       

     

       25
       26
        
         src = fetchFromGitHub {

     

       26
       27
        
           owner = "tomasvotava";

     

       27
       28
        
           repo = "fastapi-sso";

     

       28
       29
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-CkYAF2GmVCooyHt3Tua6ClYMbgyLosqSa8z/zkV2eIE=";

     

       30
       30
       +
           hash = "sha256-591+7Jjg3Pb0qXZsj4tEk8lHqxAzWrs5GO92jFJ4Qmo=";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       32
       -
         postPatch = ''

     

       33
       33
       -
           sed -i "/--cov/d" pyproject.toml

     

       34
       34
       -
         '';

     

       35
       35
       -
       

     

       36
       33
        
         build-system = [ poetry-core ];

     

       37
       34
        
       

     

       38
       35
        
         dependencies = [

     
···

       40
       37
        
           httpx

     

       41
       38
        
           oauthlib

     

       42
       39
        
           pydantic

     

       43
       43
       -
           pylint

     

       44
       44
       -
         ];

     

       40
       40
       +
           pyjwt

     

       41
       41
       +
         ] ++ pydantic.optional-dependencies.email;

     

       45
       42
        
       

     

       46
       43
        
         nativeCheckInputs = [

     

       47
       44
        
           email-validator

     

       48
       45
        
           pytest-asyncio

     

       46
       46
       +
           pytest-cov-stub

     

       49
       47
        
           pytest-xdist

     

       50
       48
        
           pytestCheckHook

     

       51
       49
        
         ];

+1 -1

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "fastcore";

     

       12
       12
       -
         version = "1.7.29";

     

       12
       12
       +
         version = "1.8.0";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

+2 -2

pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-bigquery-logging";

     

       18
       18
       -
         version = "1.6.1";

     

       18
       18
       +
         version = "1.6.2";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           pname = "google_cloud_bigquery_logging";

     

       25
       25
        
           inherit version;

     

       26
       26
       -
           hash = "sha256-gkozSu9UENr/4LRmHdS+efRH8t63ZO64zAx7i2cT51E=";

     

       26
       26
       +
           hash = "sha256-sVWeTqq4drPOmlUXd6R2O44PpNfcbsglhXeh6umYMZI=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/google-cloud-iam-logging/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-iam-logging";

     

       18
       18
       -
         version = "1.4.1";

     

       18
       18
       +
         version = "1.4.2";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           pname = "google_cloud_iam_logging";

     

       25
       25
        
           inherit version;

     

       26
       26
       -
           hash = "sha256-+rgtIj4Q+ZL8ENeigmF0dJYzIbJ797A1bOs2mbH4AKI=";

     

       26
       26
       +
           hash = "sha256-2tpXDDqP6JN9y8wqku/C3+I9ymns5EfxvfR5eeTDstU=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/google-cloud-network-connectivity/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-network-connectivity";

     

       18
       18
       -
         version = "2.7.1";

     

       18
       18
       +
         version = "2.7.2";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           inherit version;

     

       25
       25
        
           pname = "google_cloud_network_connectivity";

     

       26
       26
       -
           hash = "sha256-caOyIo4FKGQgpa0x7lKzrsaL5nrqqg8Q1iGITY3foME=";

     

       26
       26
       +
           hash = "sha256-7whrWtASCSsmPP6/gj9Jc5dvn56H2QPyEseELxbn0tg=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/google-cloud-shell/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-shell";

     

       18
       18
       -
         version = "1.12.0";

     

       18
       18
       +
         version = "1.12.1";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           pname = "google_cloud_shell";

     

       25
       25
        
           inherit version;

     

       26
       26
       -
           hash = "sha256-PQzFvc/ZGAp6SsMGT2mMQJN5feaI5E7WSODWccRNYx4=";

     

       26
       26
       +
           hash = "sha256-nRuFxyxtJmKiI0BtV8VEu8mRZ5JU2S0gGU9aef9I6Zg=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/google-cloud-vpc-access/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-vpc-access";

     

       18
       18
       -
         version = "1.13.0";

     

       18
       18
       +
         version = "1.13.1";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           pname = "google_cloud_vpc_access";

     

       25
       25
        
           inherit version;

     

       26
       26
       -
           hash = "sha256-jMZtqtbNtocz6NeUJupU+Gkk2L48S5FfrvRrQ5/SZx8=";

     

       26
       26
       +
           hash = "sha256-tgSvaJvXhEt6isC6C+w0APq2ULUYkKdva9vb6yZ4MYM=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/google-cloud-webrisk/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "google-cloud-webrisk";

     

       18
       18
       -
         version = "1.17.0";

     

       18
       18
       +
         version = "1.17.1";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           pname = "google_cloud_webrisk";

     

       25
       25
        
           inherit version;

     

       26
       26
       -
           hash = "sha256-Qcw5LyPhu9ZbYSz3Jnkr8byXiTZfW7BtQapT7MhkEug=";

     

       26
       26
       +
           hash = "sha256-apCNF81eeLIP4nNdzm9KeUlUO7pjN6quKTrl1xsUn0Q=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "holidays";

     

       17
       17
       -
         version = "0.68";

     

       17
       17
       +
         version = "0.69";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
           owner = "vacanza";

     

       24
       24
        
           repo = "python-holidays";

     

       25
       25
        
           tag = "v${version}";

     

       26
       26
       -
           hash = "sha256-Lftt4NzOZYYE7q7acdljosE0Ox/5hKbbwsYx4g2OU+Y=";

     

       26
       26
       +
           hash = "sha256-dt5f4Mu44YPKdoO6J3WKM5KXrHeAs+hKDF/c5mee6Z8=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [

+2 -2

pkgs/development/python-modules/msgraph-sdk/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "msgraph-sdk";

     

       20
       20
       -
         version = "1.24.0";

     

       20
       20
       +
         version = "1.25.0";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.8";

     
···

       26
       26
        
           owner = "microsoftgraph";

     

       27
       27
        
           repo = "msgraph-sdk-python";

     

       28
       28
        
           tag = "v${version}";

     

       29
       29
       -
           hash = "sha256-7r7TuGR8J31BZdG8wJJAgWwllbkf3wYj1xLULNm8+xQ=";

     

       29
       29
       +
           hash = "sha256-CRs9Pqgv8sVhjlMPmC8UR03b4jP1Pm39Yndn2LF51jU=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [ flit-core ];

+26 -26

pkgs/development/python-modules/mypy-boto3/default.nix

···

       66
       66
        
             "sha256-rxpBCIXOkSl5UeP1e0Rz8VK4tU3qD7nqG77YiGTv/0U=";

     

       67
       67
        
       

     

       68
       68
        
         mypy-boto3-amplify =

     

       69
       69
       -
           buildMypyBoto3Package "amplify" "1.37.12"

     

       70
       70
       -
             "sha256-uUxc61azT+b/eP+nDc1l8BAVYr73sQWg9RMXBHcq7Ic=";

     

       69
       69
       +
           buildMypyBoto3Package "amplify" "1.37.17"

     

       70
       70
       +
             "sha256-Q9nHb3kc2RHQEbBzZ1H8tYAULuPZlOvEYJvZ1znOj3c=";

     

       71
       71
        
       

     

       72
       72
        
         mypy-boto3-amplifybackend =

     

       73
       73
        
           buildMypyBoto3Package "amplifybackend" "1.37.0"

     
···

       134
       134
        
             "sha256-v47OKnLvmkjv8+HBRlrv+wP+MIapoiz3HGplK6SEXGM=";

     

       135
       135
        
       

     

       136
       136
        
         mypy-boto3-appsync =

     

       137
       137
       -
           buildMypyBoto3Package "appsync" "1.37.0"

     

       138
       138
       -
             "sha256-KuiUFCfIcGHwIRrKsezOcGodrA3UrqdDPI3yl5Lpkmw=";

     

       137
       137
       +
           buildMypyBoto3Package "appsync" "1.37.15"

     

       138
       138
       +
             "sha256-4eY2gziQLvX2t39e201UitkV/Cs0E2RSP4yAG6/OdbI=";

     

       139
       139
        
       

     

       140
       140
        
         mypy-boto3-arc-zonal-shift =

     

       141
       141
        
           buildMypyBoto3Package "arc-zonal-shift" "1.37.0"

     
···

       210
       210
        
             "sha256-FINgDMmIhMn5M/qVGE3rzZJZEU121rDXNQYa39veAYk=";

     

       211
       211
        
       

     

       212
       212
        
         mypy-boto3-cleanrooms =

     

       213
       213
       -
           buildMypyBoto3Package "cleanrooms" "1.37.0"

     

       214
       214
       -
             "sha256-ovn/hkWHBBTUsDkQppzTApcVRYZXwxTOugZHIPnbCQk=";

     

       213
       213
       +
           buildMypyBoto3Package "cleanrooms" "1.37.15"

     

       214
       214
       +
             "sha256-6hJ2F3fQMPHe8VEcd4ZSb7zyeVs4rG3agDHTyICkCsE=";

     

       215
       215
        
       

     

       216
       216
        
         mypy-boto3-cloud9 =

     

       217
       217
        
           buildMypyBoto3Package "cloud9" "1.37.0"

     
···

       314
       314
        
             "sha256-6w2v795pNhcKZlWayROdYe5bzQvSmkITxErl2M0F5o4=";

     

       315
       315
        
       

     

       316
       316
        
         mypy-boto3-cognito-idp =

     

       317
       317
       -
           buildMypyBoto3Package "cognito-idp" "1.37.13"

     

       318
       318
       -
             "sha256-L9F74KW7z+Q+7hUoGIQR67TQyNiJF8nW4XHWBppFO4Q=";

     

       317
       317
       +
           buildMypyBoto3Package "cognito-idp" "1.37.13.post1"

     

       318
       318
       +
             "sha256-EHys56ylhnO6wwWLKMABYrjf9K3D02lZbpcghQlXxRI=";

     

       319
       319
        
       

     

       320
       320
        
         mypy-boto3-cognito-sync =

     

       321
       321
        
           buildMypyBoto3Package "cognito-sync" "1.37.0"

     
···

       446
       446
        
             "sha256-wvOqjmqNMbCG7E1o+ZSOlWEwBdcCKjD/qVFlepZ51ec=";

     

       447
       447
        
       

     

       448
       448
        
         mypy-boto3-ec2 =

     

       449
       449
       -
           buildMypyBoto3Package "ec2" "1.37.12"

     

       450
       450
       -
             "sha256-tK8CshexXUuOPFxAkWZXtAk82CgiHVR0D5BSjgEztIU=";

     

       449
       449
       +
           buildMypyBoto3Package "ec2" "1.37.16"

     

       450
       450
       +
             "sha256-04vwzTTK0gE3yWvOVbXUXFXijf4k6/oSZXR6tqxfN3U=";

     

       451
       451
        
       

     

       452
       452
        
         mypy-boto3-ec2-instance-connect =

     

       453
       453
        
           buildMypyBoto3Package "ec2-instance-connect" "1.37.0"

     
···

       770
       770
        
             "sha256-E5A6wS8kwjG1rWo1RFT7kwpqmWKGZ7UAmcR4KUvUrzg=";

     

       771
       771
        
       

     

       772
       772
        
         mypy-boto3-lambda =

     

       773
       773
       -
           buildMypyBoto3Package "lambda" "1.37.0"

     

       774
       774
       -
             "sha256-YbGr1bfbpdFvneTZcX8vZ0OCRtEc3hwrvjHqOHUzM8g=";

     

       773
       773
       +
           buildMypyBoto3Package "lambda" "1.37.16"

     

       774
       774
       +
             "sha256-1Y8guwQWrrBP2mz6qKLywxUyylAJAEw+K8vorFCoz3w=";

     

       775
       775
        
       

     

       776
       776
        
         mypy-boto3-lex-models =

     

       777
       777
        
           buildMypyBoto3Package "lex-models" "1.37.0"

     
···

       858
       858
        
             "sha256-nh2m7H6RlfQlqmiifwYJ3SANi73zcju/v5s9z26HIvo=";

     

       859
       859
        
       

     

       860
       860
        
         mypy-boto3-mediaconnect =

     

       861
       861
       -
           buildMypyBoto3Package "mediaconnect" "1.37.0"

     

       862
       862
       -
             "sha256-KFa0yNwhYlFGz4ADpsxt3OCZfYDBv6Hfw9Ti09f7fIc=";

     

       861
       861
       +
           buildMypyBoto3Package "mediaconnect" "1.37.16"

     

       862
       862
       +
             "sha256-TfeKy6dyjQJVyhmCjttwBxBQNi3iZdJQQwpY/HRvnf0=";

     

       863
       863
        
       

     

       864
       864
        
         mypy-boto3-mediaconvert =

     

       865
       865
       -
           buildMypyBoto3Package "mediaconvert" "1.37.4"

     

       866
       866
       -
             "sha256-xBMBhCrnTV7sILg2/dXUy2PeNeCuNHkb7plAumD5Pq8=";

     

       865
       865
       +
           buildMypyBoto3Package "mediaconvert" "1.37.15"

     

       866
       866
       +
             "sha256-bs9Zvpv3AyT/zhucLMqtdhmocG4+hbHkPjyGsvviFJ8=";

     

       867
       867
        
       

     

       868
       868
        
         mypy-boto3-medialive =

     

       869
       869
        
           buildMypyBoto3Package "medialive" "1.37.11"

     
···

       950
       950
        
             "sha256-gA8+WKvFzCegzUUWvsTbEmHkYPLIomBrqaIRJHkJqhE=";

     

       951
       951
        
       

     

       952
       952
        
         mypy-boto3-network-firewall =

     

       953
       953
       -
           buildMypyBoto3Package "network-firewall" "1.37.0"

     

       954
       954
       -
             "sha256-O9iEc3Yla0/bmvhouX1PLQQET79uJlbQtuz7aKrOekY=";

     

       953
       953
       +
           buildMypyBoto3Package "network-firewall" "1.37.17"

     

       954
       954
       +
             "sha256-Lth+Py9qwXU+mnbV21d9H7QoONrwWU1UmMCJWorypxs=";

     

       955
       955
        
       

     

       956
       956
        
         mypy-boto3-networkmanager =

     

       957
       957
        
           buildMypyBoto3Package "networkmanager" "1.37.0"

     
···

       1134
       1134
        
             "sha256-axaTu4XmHGc3a/Uzs1/0IqLJdZFBfEQ9pzi42XW11y0=";

     

       1135
       1135
        
       

     

       1136
       1136
        
         mypy-boto3-route53 =

     

       1137
       1137
       -
           buildMypyBoto3Package "route53" "1.37.0"

     

       1138
       1138
       -
             "sha256-mI9acOp7w3pD+5eD3z7pSgTxZHjYWWbkRnWYUWy7UpE=";

     

       1137
       1137
       +
           buildMypyBoto3Package "route53" "1.37.15"

     

       1138
       1138
       +
             "sha256-sXSxaqe0kqx1ZCinJKI67ekBZW81RwoC1fSEDrlCDc4=";

     

       1139
       1139
        
       

     

       1140
       1140
        
         mypy-boto3-route53-recovery-cluster =

     

       1141
       1141
        
           buildMypyBoto3Package "route53-recovery-cluster" "1.37.0"

     
···

       1158
       1158
        
             "sha256-/4XdwWIkx8VYxrUp7I8IDCPZ34cFudV+gp3xR4uS8jk=";

     

       1159
       1159
        
       

     

       1160
       1160
        
         mypy-boto3-rum =

     

       1161
       1161
       -
           buildMypyBoto3Package "rum" "1.37.5"

     

       1162
       1162
       -
             "sha256-/cLHocPVefBea8g6oIRrSis6JOL7wFw+AEYyGNEOdx0=";

     

       1161
       1161
       +
           buildMypyBoto3Package "rum" "1.37.14"

     

       1162
       1162
       +
             "sha256-bcK4J78YctKUypiegFviiZ2TorcXA5SPh9dhbRigVhk=";

     

       1163
       1163
        
       

     

       1164
       1164
        
         mypy-boto3-s3 =

     

       1165
       1165
        
           buildMypyBoto3Package "s3" "1.37.0"

     
···

       1174
       1174
        
             "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";

     

       1175
       1175
        
       

     

       1176
       1176
        
         mypy-boto3-sagemaker =

     

       1177
       1177
       -
           buildMypyBoto3Package "sagemaker" "1.37.5"

     

       1178
       1178
       -
             "sha256-CZmB3zmQwsWy85vzK891HXuRfmgNBg2YXEasihOrbUY=";

     

       1177
       1177
       +
           buildMypyBoto3Package "sagemaker" "1.37.16"

     

       1178
       1178
       +
             "sha256-fEvGy0Zp2ouvVGXi+yFpX1RTNVacb53UFXxv0rfNBd0=";

     

       1179
       1179
        
       

     

       1180
       1180
        
         mypy-boto3-sagemaker-a2i-runtime =

     

       1181
       1181
        
           buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"

     
···

       1398
       1398
        
             "sha256-nBigZ8YNNcy6TrQQ+dThN62xZ5IOq92EHbC3/tZbbuE=";

     

       1399
       1399
        
       

     

       1400
       1400
        
         mypy-boto3-wafv2 =

     

       1401
       1401
       -
           buildMypyBoto3Package "wafv2" "1.37.8"

     

       1402
       1402
       -
             "sha256-kFDCZkFA474JtReUOZlN3Si0qZU21sUWOAUVTNl7uFo=";

     

       1401
       1401
       +
           buildMypyBoto3Package "wafv2" "1.37.14"

     

       1402
       1402
       +
             "sha256-wfndS06dDJCEqVLceB+WMTIh1laTi9eVfTzx23K47nk=";

     

       1403
       1403
        
       

     

       1404
       1404
        
         mypy-boto3-wellarchitected =

     

       1405
       1405
        
           buildMypyBoto3Package "wellarchitected" "1.37.0"

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "nexia";

     

       17
       17
       -
         version = "2.4.0";

     

       17
       17
       +
         version = "2.5.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.9";

     
···

       23
       23
        
           owner = "bdraco";

     

       24
       24
        
           repo = "nexia";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-DO6UJ/oLCLZdRR2f0rXe4R5nQtByqzHrLXhyUsvY/jw=";

     

       26
       26
       +
           hash = "sha256-vw4lUBD7VUpOkm+JGD06tLuM/g2iLQ/qFLIyMobnQS0=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "nibe";

     

       22
       22
       -
         version = "2.16.0";

     

       22
       22
       +
         version = "2.17.0";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.9";

     
···

       28
       28
        
           owner = "yozik04";

     

       29
       29
        
           repo = "nibe";

     

       30
       30
        
           tag = version;

     

       31
       31
       -
           hash = "sha256-iY7HjHxuQGrkiVPxUhELdij8u6g5IZxp/6Jydo7SOfQ=";

     

       31
       31
       +
           hash = "sha256-wq+Gtt2oW8koxOqu3z8G3XvHo6Ur+FhWPe+KslDG754=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         pythonRelaxDeps = [ "async-modbus" ];

+30 -6

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         pythonOlder,

     

       5
       5
       -
         fetchPypi,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
        
         setuptools,

     

       7
       7
        
         ply,

     

       8
       8
       +
       

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         pycodestyle,

     

       11
       11
       +
         pydocstyle,

     

       12
       12
       +
         pyflakes,

     

       13
       13
       +
         coverage,

     

       8
       14
        
       }:

     

       9
       15
        
       

     

       10
       16
        
       buildPythonPackage rec {

     
···

       14
       20
        
       

     

       15
       21
        
         disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+"

     

       16
       22
        
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-zmpb5r3BcveLsQ0uIgQJx2vUaz2p/0PlO76E0e7elwA=";

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "plyara";

     

       25
       25
       +
           repo = "plyara";

     

       26
       26
       +
           tag = "v${version}";

     

       27
       27
       +
           hash = "sha256-WaQgqx003it+D0AGDxV6aSKO89F2iR9d8L4zvHyd0iQ=";

     

       20
       28
        
         };

     

       21
       29
        
       

     

       22
       30
        
         build-system = [

     
···

       31
       39
        
           "plyara"

     

       32
       40
        
         ];

     

       33
       41
        
       

     

       42
       42
       +
         nativeCheckInputs = [

     

       43
       43
       +
           pytestCheckHook

     

       44
       44
       +
           pycodestyle

     

       45
       45
       +
           pydocstyle

     

       46
       46
       +
           pyflakes

     

       47
       47
       +
           coverage

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         disabledTests = [

     

       51
       51
       +
           # touches network

     

       52
       52
       +
           "test_third_party_repositories"

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       34
       55
        
         meta = {

     

       35
       56
        
           description = "Parse YARA rules";

     

       36
       36
       -
           homepage = "https://pypi.org/project/plyara/";

     

       57
       57
       +
           homepage = "https://github.com/plyara/plyara";

     

       37
       58
        
           changelog = "https://github.com/plyara/plyara/releases/tag/v${version}";

     

       38
       59
        
           license = lib.licenses.asl20;

     

       39
       39
       -
           maintainers = with lib.maintainers; [ _13621 ];

     

       60
       60
       +
           maintainers = with lib.maintainers; [

     

       61
       61
       +
             _13621

     

       62
       62
       +
             ivyfanchiang

     

       63
       63
       +
           ];

     

       40
       64
        
         };

     

       41
       65
        
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pyexploitdb";

     

       13
       13
       -
         version = "0.2.71";

     

       13
       13
       +
         version = "0.2.72";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           pname = "pyExploitDb";

     

       20
       20
        
           inherit version;

     

       21
       21
       -
           hash = "sha256-AE9fD7OKrpi74rXQibtmyQoAeMAO2QCagpCT3HaUGaQ=";

     

       21
       21
       +
           hash = "sha256-zWgI6cNSm3hXZXrrQsSpr4BsSPA7JawQOz2hwmnybDI=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [ setuptools ];

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "pysmartthings";

     

       21
       21
       -
         version = "2.7.2";

     

       21
       21
       +
         version = "2.7.4";

     

       22
       22
        
         pyproject = true;

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.12";

     
···

       27
       27
        
           owner = "andrewsayre";

     

       28
       28
        
           repo = "pysmartthings";

     

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

     

       30
       30
       -
           hash = "sha256-2MBm0I9dBr2N5iorN9BSKecHLnvmiTmcsIuGjDIWIKQ=";

     

       30
       30
       +
           hash = "sha256-WkUFAsZzdQI/LopJp5m1Nj4kLsRFmQWRe10eTcAUYGw=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         build-system = [ poetry-core ];

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "pyswitchbot";

     

       19
       19
       -
         version = "0.57.0";

     

       19
       19
       +
         version = "0.57.1";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.8";

     
···

       25
       25
        
           owner = "Danielhiversen";

     

       26
       26
        
           repo = "pySwitchbot";

     

       27
       27
        
           tag = version;

     

       28
       28
       -
           hash = "sha256-9jA1V6Wri923pc2+MXLwF2hNgIPIYh3M8UBj0jc/548=";

     

       28
       28
       +
           hash = "sha256-bG0jRGhioNm0QNe7ymRKYO4hdgkiZypul79+gxN3Gsk=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ setuptools ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pywizlight";

     

       13
       13
       -
         version = "0.5.14";

     

       13
       13
       +
         version = "0.6.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "sbidy";

     

       20
       20
        
           repo = pname;

     

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

     

       22
       22
       -
           hash = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ=";

     

       22
       22
       +
           hash = "sha256-4z1PmVoRs7mql/PhSG9Ek6NRkGXIXAYxaV8nNDoJjeY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ click ];

+19 -19

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

···

       66
       66
        
       

     

       67
       67
        
       let

     

       68
       68
        
         pname = "ray";

     

       69
       69
       -
         version = "2.43.0";

     

       69
       69
       +
         version = "2.44.0";

     

       70
       70
        
       in

     

       71
       71
        
       buildPythonPackage rec {

     

       72
       72
        
         inherit pname version;

     
···

       83
       83
        
               x86_64-darwin = "macosx_10_15_x86_64";

     

       84
       84
        
               x86_64-linux = "manylinux2014_x86_64";

     

       85
       85
        
             };

     

       86
       86
       -
             # hashes retrieved via the following command

     

       87
       87
       -
             # curl https://pypi.org/pypi/ray/${version}/json | jq -r '.urls[] | "\(.digests.sha256)  \(.filename)"'

     

       86
       86
       +
             # ./pkgs/development/python-modules/ray/prefetch.sh

     

       87
       87
       +
             # Results are in ./ray-hashes.nix

     

       88
       88
        
             hashes = {

     

       89
       89
        
               x86_64-linux = {

     

       90
       90
       -
                 cp39 = "sha256-Xt89oYBB4LYXDGLghICrBQ8HZjYf8/bhElfMBKtG5ZI=";

     

       91
       91
       -
                 cp310 = "sha256-GHKYOihahbd2vzEcgJ1Vn4SCkJotOerV8qxpz+OqhUQ=";

     

       92
       92
       -
                 cp311 = "sha256-eMO9vxgrTQGfqaiqvVXDm/cFu2MK6gZPdo8wX8Ry0es=";

     

       93
       93
       -
                 cp312 = "sha256-tF9HjSnOXfP8GYYd9k/vntXCXx6D+hACjTP63v3soJU=";

     

       90
       90
       +
                 cp39 = "sha256-Ucy9W/gEXWnx+NL4WpL2aoKBjz2S1wx3xmJ1eYHDDZ8=";

     

       91
       91
       +
                 cp310 = "sha256-tP29SytbReQT3Bahmkq/UADTbDxYVJCNykaXMj/11+E=";

     

       92
       92
       +
                 cp311 = "sha256-hk8KabPNfKTrcEP3953JzotxosmC7ux/EX9I8oRrcTw=";

     

       93
       93
       +
                 cp312 = "sha256-DWWsUjgB5Ao5e79VL0BoZ7uUad0mEEbKY83C7DEQ24c=";

     

       94
       94
        
               };

     

       95
       95
        
               aarch64-linux = {

     

       96
       96
       -
                 cp39 = "sha256-h+DKyFGJ3FGa8bbvKr1lSATEiMkyyq3WWLkMqqZfja4=";

     

       97
       97
       -
                 cp310 = "sha256-VzgcVPIA5sAgPV9wrG+IKxPMGoD68zZRh4ejmm1vZdA=";

     

       98
       98
       -
                 cp311 = "sha256-R27D4fokZN3V8EnA8nWP+d/swh+430Jm8d8BsngMZlM=";

     

       99
       99
       -
                 cp312 = "sha256-c3cNTIqYlzCYX/K0KSEpJJ4oweKehFiUcMm6GukcqDI=";

     

       96
       96
       +
                 cp39 = "sha256-Lxj0j8N95kAxXZNgECbfqiPwr0y6jwd9sT8dd+mR2a8=";

     

       97
       97
       +
                 cp310 = "sha256-qZ+7mtLBryIYcNhrio49WcGKVROt3p1wiKSiddxZ2n8=";

     

       98
       98
       +
                 cp311 = "sha256-wzcjfnqKHYcC3PZ+CpjqjNTsA1fSiL8IFviZDCWNi8M=";

     

       99
       99
       +
                 cp312 = "sha256-KpEeaZ5IOsSHkRC2CLBrNeYCGRwOe5cybKSXxcqv5qg=";

     

       100
       100
        
               };

     

       101
       101
        
               x86_64-darwin = {

     

       102
       102
       -
                 cp39 = "sha256-0OJvnbkaWzND8IWOslYlWzXH6X/Gv5cGX1dErX6Mwpc=";

     

       103
       103
       -
                 cp310 = "sha256-GGJv/zaEUaN6drM9UqcPBbIKIR6whn2GByHI6Gy2lVo=";

     

       104
       104
       -
                 cp311 = "sha256-/eioEoDwevmDvDdpyZQdtdsnPOEOkquzNI5BvtAj1zU=";

     

       105
       105
       -
                 cp312 = "sha256-USH99Ly8sP2jubcRZN1sj8x5ouJYAioqOVfkAQGJE/s=";

     

       102
       102
       +
                 cp39 = "sha256-4373wSlDArrp2SFoCi2jR5iMHh4qmCo+coktEa4A4j4=";

     

       103
       103
       +
                 cp310 = "sha256-YyeQwyfmkxp6jMrd6P06+utzrTgvh99N1HpSyov+BRw=";

     

       104
       104
       +
                 cp311 = "sha256-++SDLLLvz8BJPqR0K0gosesNq8/t+H9kvmvh0M6HTGk=";

     

       105
       105
       +
                 cp312 = "sha256-U9x16itP2GnqSmzKneXgKqJPLw0Y4KCLinZasr5l3Rw=";

     

       106
       106
        
               };

     

       107
       107
        
               aarch64-darwin = {

     

       108
       108
       -
                 cp39 = "sha256-2M/ewr9hxIaQ9stDJfFnPg0dAN6pJbWbYxGW5n9Cag4=";

     

       109
       109
       -
                 cp310 = "sha256-t8T97FmhTWspOdkf7m78hLYUpnIsO+Cyf6Nx4/VjJV8=";

     

       110
       110
       -
                 cp311 = "sha256-6TwyrQy2fx99p2+sQJ2H1c1eo+sDuDaDDp71zIELwsA=";

     

       111
       111
       -
                 cp312 = "sha256-fyb3ty2gTDxEIiacMbBnq9Fcs4QktwEtgS3fssd0Yuo=";

     

       108
       108
       +
                 cp39 = "sha256-Ef62eG+CAQRke2aiklRVNsA36Cl/FP4BI0t7JN2PJzk=";

     

       109
       109
       +
                 cp310 = "sha256-XfvyazCuw35dRCXGYBReVSApmohVMkaG4vF/yGAb9Mg=";

     

       110
       110
       +
                 cp311 = "sha256-Uzcifcn4CEKAwpRWmIokTKm0zg+8c4XXMHASD0fkaXk=";

     

       111
       111
       +
                 cp312 = "sha256-OY6b4ZPJf3NK8Bnw76zh9FyUGVuW7MSmR61gdlDfVyw=";

     

       112
       112
        
               };

     

       113
       113
        
             };

     

       114
       114
        
           in

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "setupmeta";

     

       17
       17
       -
         version = "3.6.1";

     

       17
       17
       +
         version = "3.7.2";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     
···

       23
       23
        
           owner = "codrsquad";

     

       24
       24
        
           repo = "setupmeta";

     

       25
       25
        
           tag = "v${version}";

     

       26
       26
       -
           hash = "sha256-L8RDfcAa2Zhr6huFt0AmNt0Qzea2xNtCX1BIULsiQgA=";

     

       26
       26
       +
           hash = "sha256-qtnewUmTApPYq7/X82GsduW0VcioW4huRAyDMHUD74Q=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         preBuild = ''

+2 -2

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "tencentcloud-sdk-python";

     

       13
       13
       -
         version = "3.0.1340";

     

       13
       13
       +
         version = "3.0.1342";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.9";

     
···

       19
       19
        
           owner = "TencentCloud";

     

       20
       20
        
           repo = "tencentcloud-sdk-python";

     

       21
       21
        
           tag = version;

     

       22
       22
       -
           hash = "sha256-CbGYPoliqc3RuKC1vMaUwopqrGe/9T/E4i9a0w33UTE=";

     

       22
       22
       +
           hash = "sha256-Hjb458+cOIIaPj7OnKmbcliI+caRx0JYoio+d5SrAuw=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ setuptools ];

-55

pkgs/servers/snac2/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitea,

     

       5
       5
       -
         curl,

     

       6
       6
       -
         openssl,

     

       7
       7
       -
         nix-update-script,

     

       8
       8
       -
         testers,

     

       9
       9
       -
         snac2,

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       stdenv.mkDerivation rec {

     

       13
       13
       -
         pname = "snac2";

     

       14
       14
       -
         version = "2.73";

     

       15
       15
       -
       

     

       16
       16
       -
         src = fetchFromGitea {

     

       17
       17
       -
           domain = "codeberg.org";

     

       18
       18
       -
           owner = "grunfink";

     

       19
       19
       -
           repo = pname;

     

       20
       20
       -
           rev = version;

     

       21
       21
       -
           hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y=";

     

       22
       22
       -
         };

     

       23
       23
       -
       

     

       24
       24
       -
         buildInputs = [

     

       25
       25
       -
           curl

     

       26
       26
       -
           openssl

     

       27
       27
       -
         ];

     

       28
       28
       -
       

     

       29
       29
       -
         makeFlags = [ "PREFIX=$(out)" ];

     

       30
       30
       -
       

     

       31
       31
       -
         env.NIX_CFLAGS_COMPILE = toString (

     

       32
       32
       -
           lib.optionals stdenv.hostPlatform.isDarwin [

     

       33
       33
       -
             "-Dst_mtim=st_mtimespec"

     

       34
       34
       -
             "-Dst_ctim=st_ctimespec"

     

       35
       35
       -
           ]

     

       36
       36
       -
         );

     

       37
       37
       -
       

     

       38
       38
       -
         passthru = {

     

       39
       39
       -
           tests.version = testers.testVersion {

     

       40
       40
       -
             package = snac2;

     

       41
       41
       -
             command = "${meta.mainProgram} || true";

     

       42
       42
       -
           };

     

       43
       43
       -
           updateScript = nix-update-script { };

     

       44
       44
       -
         };

     

       45
       45
       -
       

     

       46
       46
       -
         meta = with lib; {

     

       47
       47
       -
           homepage = "https://codeberg.org/grunfink/snac2";

     

       48
       48
       -
           description = "Simple, minimalistic ActivityPub instance (2.x, C)";

     

       49
       49
       -
           changelog = "https://codeberg.org/grunfink/snac2/src/tag/${version}/RELEASE_NOTES.md";

     

       50
       50
       -
           license = licenses.mit;

     

       51
       51
       -
           maintainers = with maintainers; [ misuzu ];

     

       52
       52
       -
           platforms = platforms.unix;

     

       53
       53
       -
           mainProgram = "snac";

     

       54
       54
       -
         };

     

       55
       55
       -
       }

-2

pkgs/top-level/all-packages.nix

···

       10427
       10427
        
           scheme = guile;

     

       10428
       10428
        
         };

     

       10429
       10429
        
       

     

       10430
       10430
       -
         snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { };

     

       10431
       10431
       -
       

     

       10432
       10430
        
         soapyairspy = callPackage ../applications/radio/soapyairspy {

     

       10433
       10431
        
           inherit (darwin) libobjc;

     

       10434
       10432
        
           inherit (darwin.apple_sdk.frameworks) IOKit Security;