commit f609feb30fe15f3586195fd99769600e842d7cad · pyrox.dev/nixpkgs

+18

doc/hooks/cmake.section.md

···

       33
       33
        
       #### `dontUseCmakeConfigure` {#dont-use-cmake-configure}

     

       34
       34
        
       

     

       35
       35
        
       When set to true, don't use the predefined `cmakeConfigurePhase`.

     

       36
       36
       +
       

     

       37
       37
       +
       ## Controlling CTest invocation {#cmake-ctest}

     

       38
       38
       +
       

     

       39
       39
       +
       By default tests are run by make in [`checkPhase`](#ssec-check-phase) or by [ninja](#ninja) if `ninja` is

     

       40
       40
       +
       available in `nativeBuildInputs`. Makefile and Ninja generators produce the `test` target, which invokes `ctest` under the hood.

     

       41
       41
       +
       This makes passing additional arguments to `ctest` difficult, so it's possible to invoke it directly in `checkPhase`

     

       42
       42
       +
       by adding `ctestCheckHook` to `nativeCheckInputs`.

     

       43
       43
       +
       

     

       44
       44
       +
       ### CTest Variables {#cmake-ctest-variables}

     

       45
       45
       +
       

     

       46
       46
       +
       #### `disabledTests` {#cmake-ctest-disabled-tests}

     

       47
       47
       +
       

     

       48
       48
       +
       Allows to disable running a list of tests. Note that regular expressions are not supported by `disabledTests`, but

     

       49
       49
       +
       it can be combined with `--exclude-regex` option.

     

       50
       50
       +
       

     

       51
       51
       +
       #### `ctestFlags` {#cmake-ctest-flags}

     

       52
       52
       +
       

     

       53
       53
       +
       Additional options passed to `ctest` together with `checkFlags`.

+12

doc/redirects.json

···

       5
       5
        
         "chap-release-notes": [

     

       6
       6
        
           "release-notes.html#chap-release-notes"

     

       7
       7
        
         ],

     

       8
       8
       +
         "cmake-ctest": [

     

       9
       9
       +
           "index.html#cmake-ctest"

     

       10
       10
       +
         ],

     

       11
       11
       +
         "cmake-ctest-disabled-tests": [

     

       12
       12
       +
           "index.html#cmake-ctest-disabled-tests"

     

       13
       13
       +
         ],

     

       14
       14
       +
         "cmake-ctest-flags": [

     

       15
       15
       +
           "index.html#cmake-ctest-flags"

     

       16
       16
       +
         ],

     

       17
       17
       +
         "cmake-ctest-variables": [

     

       18
       18
       +
           "index.html#cmake-ctest-variables"

     

       19
       19
       +
         ],

     

       8
       20
        
         "ex-build-helpers-extendMkDerivation": [

     

       9
       21
        
           "index.html#ex-build-helpers-extendMkDerivation"

     

       10
       22
        
         ],

nixos/tests/all-tests.nix

···

       1388
       1388
        
         tuptime = handleTest ./tuptime.nix { };

     

       1389
       1389
        
         turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { };

     

       1390
       1390
        
         turn-rs = handleTest ./turn-rs.nix { };

     

       1391
       1391
       +
         tusd = runTest ./tusd/default.nix;

     

       1391
       1392
        
         tuxguitar = runTest ./tuxguitar.nix;

     

       1392
       1393
        
         twingate = runTest ./twingate.nix;

     

       1393
       1394
        
         typesense = handleTest ./typesense.nix { };

+50

nixos/tests/tusd/default.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         port = 1080;

     

       5
       5
       +
       

     

       6
       6
       +
         client =

     

       7
       7
       +
           { pkgs, ... }:

     

       8
       8
       +
           {

     

       9
       9
       +
             environment.systemPackages = [ pkgs.curl ];

     

       10
       10
       +
           };

     

       11
       11
       +
       

     

       12
       12
       +
         server =

     

       13
       13
       +
           { pkgs, ... }:

     

       14
       14
       +
           {

     

       15
       15
       +
             # tusd does not have a NixOS service yet.

     

       16
       16
       +
             systemd.services.tusd = {

     

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

     

       18
       18
       +
       

     

       19
       19
       +
               serviceConfig = {

     

       20
       20
       +
                 ExecStart = ''${pkgs.tusd}/bin/tusd -port "${toString port}" -upload-dir=/data'';

     

       21
       21
       +
               };

     

       22
       22
       +
             };

     

       23
       23
       +
             networking.firewall.allowedTCPPorts = [ port ];

     

       24
       24
       +
           };

     

       25
       25
       +
       in

     

       26
       26
       +
       {

     

       27
       27
       +
         name = "tusd";

     

       28
       28
       +
         meta.maintainers = with lib.maintainers; [

     

       29
       29
       +
           nh2

     

       30
       30
       +
           kalbasit

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         nodes = {

     

       34
       34
       +
           inherit server;

     

       35
       35
       +
           inherit client;

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       38
       38
       +
         testScript = ''

     

       39
       39
       +
           server.wait_for_unit("tusd.service")

     

       40
       40
       +
           server.wait_for_open_port(${toString port})

     

       41
       41
       +
       

     

       42
       42
       +
           # Create large file.

     

       43
       43
       +
           client.succeed("${pkgs.coreutils}/bin/truncate --size=100M file-100M.bin")

     

       44
       44
       +
       

     

       45
       45
       +
           # Upload it.

     

       46
       46
       +
           client.succeed("${./tus-curl-upload.sh} file-100M.bin http://server:${toString port}/files/")

     

       47
       47
       +
       

     

       48
       48
       +
           print("Upload succeeded")

     

       49
       49
       +
         '';

     

       50
       50
       +
       }

+50

nixos/tests/tusd/tus-curl-upload.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       

     

       3
       3
       +
       # Adapted from:

     

       4
       4
       +
       # - https://github.com/tus/tus.io/issues/96

     

       5
       5
       +
       

     

       6
       6
       +
       if [ ! -f "${1}" ]; then

     

       7
       7
       +
         echo -e "\n\033[1;31m✘\033[0m First argument needs to be an existing file.\n"

     

       8
       8
       +
         exit 1

     

       9
       9
       +
       fi

     

       10
       10
       +
       

     

       11
       11
       +
       if [ -z "${2}" ]; then

     

       12
       12
       +
         echo -e "\n\033[1;31m✘\033[0m Second argument needs to be the TUS server's URL.\n"

     

       13
       13
       +
         exit 1

     

       14
       14
       +
       fi

     

       15
       15
       +
       

     

       16
       16
       +
       file=${1}

     

       17
       17
       +
       TUS_URL=${2}

     

       18
       18
       +
       filename=$(basename "${file}" | base64)

     

       19
       19
       +
       filesize="$(wc -c <"${file}")"

     

       20
       20
       +
       

     

       21
       21
       +
       # Apparently 'Location: ..' is terminated by CRLF. grep and awk faithfully

     

       22
       22
       +
       # preserve the line ending, and the shell's $() substitution strips off the

     

       23
       23
       +
       # final LF leaving you with a string that just ends with a CR.

     

       24
       24
       +
       #

     

       25
       25
       +
       # When the CR is printed, the cursor moves to the beginning of the line and

     

       26
       26
       +
       # whatever gets printed next overwrites what was there.

     

       27
       27
       +
       # ... | tr -d '\015'

     

       28
       28
       +
       location=$(curl \

     

       29
       29
       +
         --silent --show-error \

     

       30
       30
       +
         -I \

     

       31
       31
       +
         -X POST \

     

       32
       32
       +
         -H "Tus-Resumable: 1.0.0" \

     

       33
       33
       +
         -H "Content-Length: 0" \

     

       34
       34
       +
         -H "Upload-Length: ${filesize}" \

     

       35
       35
       +
         -H "Upload-Metadata: name ${filename}" \

     

       36
       36
       +
         "${TUS_URL}" | grep 'Location:' | awk '{print $2}' | tr -d '\015')

     

       37
       37
       +
       

     

       38
       38
       +
       if [ -n "${location}" ]; then

     

       39
       39
       +
         curl \

     

       40
       40
       +
           -X PATCH \

     

       41
       41
       +
           -H "Tus-Resumable: 1.0.0" \

     

       42
       42
       +
           -H "Upload-Offset: 0" \

     

       43
       43
       +
           -H "Content-Length: ${filesize}" \

     

       44
       44
       +
           -H "Content-Type: application/offset+octet-stream" \

     

       45
       45
       +
           --data-binary "@${file}" \

     

       46
       46
       +
           "${location}" -v

     

       47
       47
       +
       else

     

       48
       48
       +
         echo -e "\n\033[1;31m✘\033[0m File creation failed..\n"

     

       49
       49
       +
         exit 1

     

       50
       50
       +
       fi

nixos/tests/vector/default.nix

···

       8
       8
        
         file-sink = import ./file-sink.nix { inherit system pkgs; };

     

       9
       9
        
         api = import ./api.nix { inherit system pkgs; };

     

       10
       10
        
         dnstap = import ./dnstap.nix { inherit system pkgs; };

     

       11
       11
       +
         journald-clickhouse = import ./journald-clickhouse.nix { inherit system pkgs; };

     

       11
       12
        
         nginx-clickhouse = import ./nginx-clickhouse.nix { inherit system pkgs; };

     

       12
       13
        
         syslog-quickwit = import ./syslog-quickwit.nix { inherit system pkgs; };

     

       13
       14
        
       }

+157

nixos/tests/vector/journald-clickhouse.nix

···

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

     

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

     

       3
       3
       +
         let

     

       4
       4
       +
           # Take the original journald message and create a new payload which only

     

       5
       5
       +
           # contains the relevant fields - these must match the database columns.

     

       6
       6
       +
           journalVrlRemapTransform = {

     

       7
       7
       +
             journald_remap = {

     

       8
       8
       +
               inputs = [ "journald" ];

     

       9
       9
       +
               type = "remap";

     

       10
       10
       +
               source = ''

     

       11
       11
       +
                 m = {}

     

       12
       12
       +
                 m.app = .SYSLOG_IDENTIFIER

     

       13
       13
       +
                 m.host = .host

     

       14
       14
       +
                 m.severity = to_int(.PRIORITY) ?? 0

     

       15
       15
       +
                 m.level = to_syslog_level(m.severity) ?? ""

     

       16
       16
       +
                 m.message = strip_ansi_escape_codes!(.message)

     

       17
       17
       +
                 m.timestamp = .timestamp

     

       18
       18
       +
                 m.uid = to_int(._UID) ?? 0

     

       19
       19
       +
                 m.pid = to_int(._PID) ?? 0

     

       20
       20
       +
                 . = [m]

     

       21
       21
       +
               '';

     

       22
       22
       +
             };

     

       23
       23
       +
           };

     

       24
       24
       +
         in

     

       25
       25
       +
         {

     

       26
       26
       +
           name = "vector-journald-clickhouse";

     

       27
       27
       +
           meta.maintainers = [ pkgs.lib.maintainers.happysalada ];

     

       28
       28
       +
       

     

       29
       29
       +
           nodes = {

     

       30
       30
       +
             clickhouse =

     

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

     

       32
       32
       +
               {

     

       33
       33
       +
                 virtualisation.diskSize = 5 * 1024;

     

       34
       34
       +
                 virtualisation.memorySize = 4096;

     

       35
       35
       +
       

     

       36
       36
       +
                 networking.firewall.allowedTCPPorts = [ 6000 ];

     

       37
       37
       +
       

     

       38
       38
       +
                 services.vector = {

     

       39
       39
       +
                   enable = true;

     

       40
       40
       +
                   journaldAccess = true;

     

       41
       41
       +
       

     

       42
       42
       +
                   settings = {

     

       43
       43
       +
                     sources = {

     

       44
       44
       +
                       journald = {

     

       45
       45
       +
                         type = "journald";

     

       46
       46
       +
                       };

     

       47
       47
       +
       

     

       48
       48
       +
                       vector_source = {

     

       49
       49
       +
                         type = "vector";

     

       50
       50
       +
                         address = "[::]:6000";

     

       51
       51
       +
                       };

     

       52
       52
       +
                     };

     

       53
       53
       +
       

     

       54
       54
       +
                     transforms = journalVrlRemapTransform;

     

       55
       55
       +
       

     

       56
       56
       +
                     sinks = {

     

       57
       57
       +
                       clickhouse = {

     

       58
       58
       +
                         type = "clickhouse";

     

       59
       59
       +
                         inputs = [

     

       60
       60
       +
                           "journald_remap"

     

       61
       61
       +
                           "vector_source"

     

       62
       62
       +
                         ];

     

       63
       63
       +
                         endpoint = "http://localhost:8123";

     

       64
       64
       +
                         database = "journald";

     

       65
       65
       +
                         table = "logs";

     

       66
       66
       +
                         date_time_best_effort = true;

     

       67
       67
       +
                       };

     

       68
       68
       +
                     };

     

       69
       69
       +
                   };

     

       70
       70
       +
       

     

       71
       71
       +
                 };

     

       72
       72
       +
       

     

       73
       73
       +
                 services.clickhouse = {

     

       74
       74
       +
                   enable = true;

     

       75
       75
       +
                 };

     

       76
       76
       +
               };

     

       77
       77
       +
       

     

       78
       78
       +
             vector =

     

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

     

       80
       80
       +
               {

     

       81
       81
       +
                 services.vector = {

     

       82
       82
       +
                   enable = true;

     

       83
       83
       +
                   journaldAccess = true;

     

       84
       84
       +
       

     

       85
       85
       +
                   settings = {

     

       86
       86
       +
                     sources = {

     

       87
       87
       +
                       journald = {

     

       88
       88
       +
                         type = "journald";

     

       89
       89
       +
                       };

     

       90
       90
       +
                     };

     

       91
       91
       +
       

     

       92
       92
       +
                     transforms = journalVrlRemapTransform;

     

       93
       93
       +
       

     

       94
       94
       +
                     sinks = {

     

       95
       95
       +
                       vector_sink = {

     

       96
       96
       +
                         type = "vector";

     

       97
       97
       +
                         inputs = [ "journald_remap" ];

     

       98
       98
       +
                         address = "clickhouse:6000";

     

       99
       99
       +
                       };

     

       100
       100
       +
                     };

     

       101
       101
       +
                   };

     

       102
       102
       +
                 };

     

       103
       103
       +
               };

     

       104
       104
       +
           };

     

       105
       105
       +
       

     

       106
       106
       +
           testScript =

     

       107
       107
       +
             let

     

       108
       108
       +
               # work around quote/substitution complexity by Nix, Perl, bash and SQL.

     

       109
       109
       +
               databaseDDL = pkgs.writeText "database.sql" "CREATE DATABASE IF NOT EXISTS journald";

     

       110
       110
       +
       

     

       111
       111
       +
               # https://clickhouse.com/blog/storing-log-data-in-clickhouse-fluent-bit-vector-open-telemetry

     

       112
       112
       +
               tableDDL = pkgs.writeText "table.sql" ''

     

       113
       113
       +
                 CREATE TABLE IF NOT EXISTS journald.logs (

     

       114
       114
       +
                   timestamp DateTime64(6),

     

       115
       115
       +
                   app LowCardinality(String),

     

       116
       116
       +
                   host LowCardinality(String),

     

       117
       117
       +
                   level LowCardinality(String),

     

       118
       118
       +
                   severity UInt8,

     

       119
       119
       +
                   message String,

     

       120
       120
       +
                   uid UInt16,

     

       121
       121
       +
                   pid UInt32,

     

       122
       122
       +
                 )

     

       123
       123
       +
                 ENGINE = MergeTree()

     

       124
       124
       +
                 ORDER BY (host, app, timestamp)

     

       125
       125
       +
                 PARTITION BY toYYYYMM(timestamp)

     

       126
       126
       +
               '';

     

       127
       127
       +
       

     

       128
       128
       +
               selectQuery = pkgs.writeText "select.sql" ''

     

       129
       129
       +
                 SELECT COUNT(host) FROM journald.logs

     

       130
       130
       +
                 WHERE message LIKE '%Vector has started%'

     

       131
       131
       +
               '';

     

       132
       132
       +
             in

     

       133
       133
       +
             ''

     

       134
       134
       +
               clickhouse.wait_for_unit("clickhouse")

     

       135
       135
       +
               clickhouse.wait_for_open_port(6000)

     

       136
       136
       +
               clickhouse.wait_for_open_port(8123)

     

       137
       137
       +
       

     

       138
       138
       +
               clickhouse.succeed(

     

       139
       139
       +
                 "cat ${databaseDDL} | clickhouse-client"

     

       140
       140
       +
               )

     

       141
       141
       +
       

     

       142
       142
       +
               clickhouse.succeed(

     

       143
       143
       +
                 "cat ${tableDDL} | clickhouse-client"

     

       144
       144
       +
               )

     

       145
       145
       +
       

     

       146
       146
       +
               for machine in clickhouse, vector:

     

       147
       147
       +
                 machine.wait_for_unit("vector")

     

       148
       148
       +
                 machine.wait_until_succeeds(

     

       149
       149
       +
                   "journalctl -o cat -u vector.service | grep 'Vector has started'"

     

       150
       150
       +
                 )

     

       151
       151
       +
       

     

       152
       152
       +
               clickhouse.wait_until_succeeds(

     

       153
       153
       +
                 "cat ${selectQuery} | clickhouse-client | grep 2"

     

       154
       154
       +
               )

     

       155
       155
       +
             '';

     

       156
       156
       +
         }

     

       157
       157
       +
       )

+12 -20

pkgs/applications/audio/zynaddsubfx/default.nix

···

       45
       45
        
         # Test dependencies

     

       46
       46
        
         cxxtest,

     

       47
       47
        
         ruby,

     

       48
       48
       +
         ctestCheckHook,

     

       48
       49
        
       }:

     

       49
       50
        
       

     

       50
       51
        
       assert builtins.any (g: guiModule == g) [

     
···

       151
       152
        
         nativeCheckInputs = [

     

       152
       153
        
           cxxtest

     

       153
       154
        
           ruby

     

       155
       155
       +
           ctestCheckHook

     

       154
       156
        
         ];

     

       155
       157
        
       

     

       156
       156
       -
         # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829

     

       157
       157
       -
         checkPhase =

     

       158
       158
       -
           let

     

       159
       159
       -
             disabledTests =

     

       160
       160
       -
               # PortChecker is non-deterministic. It's fixed in the master

     

       161
       161
       -
               # branch, but backporting would require an update to rtosc, so

     

       162
       162
       -
               # we'll just disable it until the next release.

     

       163
       163
       -
               [ "PortChecker" ]

     

       164
       164
       -
       

     

       165
       165
       -
               # Tests fail on aarch64

     

       166
       166
       -
               ++ lib.optionals stdenv.hostPlatform.isAarch64 [

     

       167
       167
       -
                 "MessageTest"

     

       168
       168
       -
                 "UnisonTest"

     

       169
       169
       -
               ];

     

       170
       170
       -
           in

     

       171
       171
       -
           ''

     

       172
       172
       -
             runHook preCheck

     

       173
       173
       -
             ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$'

     

       174
       174
       -
             runHook postCheck

     

       175
       175
       -
           '';

     

       158
       158
       +
         disabledTests =

     

       159
       159
       +
           # PortChecker is non-deterministic. It's fixed in the master

     

       160
       160
       +
           # branch, but backporting would require an update to rtosc, so

     

       161
       161
       +
           # we'll just disable it until the next release.

     

       162
       162
       +
           [ "PortChecker" ]

     

       163
       163
       +
           # Tests fail on aarch64

     

       164
       164
       +
           ++ lib.optionals stdenv.hostPlatform.isAarch64 [

     

       165
       165
       +
             "MessageTest"

     

       166
       166
       +
             "UnisonTest"

     

       167
       167
       +
           ];

     

       176
       168
        
       

     

       177
       169
        
         # Use Zyn-Fusion logo for zest build

     

       178
       170
        
         # An SVG version of the logo isn't hosted anywhere we can fetch, I

+3 -3

pkgs/applications/emulators/libretro/cores/mame2003-plus.nix

···

       5
       5
        
       }:

     

       6
       6
        
       mkLibretroCore {

     

       7
       7
        
         core = "mame2003-plus";

     

       8
       8
       -
         version = "0-unstable-2025-04-16";

     

       8
       8
       +
         version = "0-unstable-2025-05-08";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "libretro";

     

       12
       12
        
           repo = "mame2003-plus-libretro";

     

       13
       13
       -
           rev = "c2128c3e82d884f39d824b5ef2716ac35dfa406b";

     

       14
       14
       -
           hash = "sha256-acicfUJlDT2Tm3aGTs9tAGaAGCC22ebRXnVLAxgcRI8=";

     

       13
       13
       +
           rev = "d3e54870080f9389b4b3e6c6f717bfa29a2fd7fe";

     

       14
       14
       +
           hash = "sha256-k3YLCP9FNBu5rD+T5bM+hJr1XNbUlXm8a96VRcj7PFw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         makefile = "Makefile";

+2 -2

pkgs/applications/misc/gpxsee/default.nix

···

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
        
         pname = "gpxsee";

     

       21
       21
       -
         version = "13.40";

     

       21
       21
       +
         version = "13.42";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "tumic0";

     

       25
       25
        
           repo = "GPXSee";

     

       26
       26
        
           tag = finalAttrs.version;

     

       27
       27
       -
           hash = "sha256-xxMnqUsYfmTD1ZNAm+lFMLvXvo6qRrq88m234ZtYiuA=";

     

       27
       27
       +
           hash = "sha256-94zCDtja1b85Wgz4slG17ETT/TMPPCyXld3WdtGjBzA=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         buildInputs =

+6 -31

pkgs/by-name/bt/btcpayserver/deps.json

···

       46
       46
        
         },

     

       47
       47
        
         {

     

       48
       48
        
           "pname": "BTCPayServer.Hwi",

     

       49
       49
       -
           "version": "2.0.2",

     

       50
       50
       -
           "hash": "sha256-CUq68FosFJyUtjjpnONhqQEXjtC9mF7zmkRjZnGwA1I="

     

       49
       49
       +
           "version": "2.0.6",

     

       50
       50
       +
           "hash": "sha256-LEj2R9hFQVCBol91l1ICn13z8rxT9iVkKT4krFskzLM="

     

       51
       51
        
         },

     

       52
       52
        
         {

     

       53
       53
        
           "pname": "BTCPayServer.Lightning.All",

     
···

       701
       701
        
         },

     

       702
       702
        
         {

     

       703
       703
        
           "pname": "NBitcoin",

     

       704
       704
       -
           "version": "5.0.40",

     

       705
       705
       -
           "hash": "sha256-cEu9luoct9YiL80z16THezZcaHgSPf6UU4Rz5QmyH+c="

     

       706
       706
       -
         },

     

       707
       707
       -
         {

     

       708
       708
       -
           "pname": "NBitcoin",

     

       709
       709
       -
           "version": "6.0.8",

     

       710
       710
       -
           "hash": "sha256-pfJRCSVAdh87SmEKeAYg7TNoGpQDtf026N+V0bL/ILk="

     

       711
       711
       -
         },

     

       712
       712
       -
         {

     

       713
       713
       -
           "pname": "NBitcoin",

     

       714
       714
       -
           "version": "7.0.31",

     

       715
       715
       -
           "hash": "sha256-sybd3AOGVlN7U6rLuWSi1kVxtBeaXb8iy786gc0CIh4="

     

       716
       716
       -
         },

     

       717
       717
       -
         {

     

       718
       718
       -
           "pname": "NBitcoin",

     

       719
       704
        
           "version": "7.0.45",

     

       720
       705
        
           "hash": "sha256-hWgtvAJvONk6jg1WiytE6M+ExkQJUCwO6cyVA6JE+8w="

     

       721
       706
        
         },

     

       722
       707
        
         {

     

       723
       708
        
           "pname": "NBitcoin",

     

       724
       724
       -
           "version": "7.0.46",

     

       725
       725
       -
           "hash": "sha256-c5KHQ/TYGBTMoKKKo7XYR8r7VTJlaU0ZW6KqWRMjh2Y="

     

       709
       709
       +
           "version": "7.0.50",

     

       710
       710
       +
           "hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk="

     

       726
       711
        
         },

     

       727
       712
        
         {

     

       728
       713
        
           "pname": "NBitcoin",

     

       729
       729
       -
           "version": "7.0.48",

     

       730
       730
       -
           "hash": "sha256-IbiCGHu1cug4kDzwS+vpTqX4jYifxWegFpIctjb/bOA="

     

       731
       731
       -
         },

     

       732
       732
       -
         {

     

       733
       733
       -
           "pname": "NBitcoin",

     

       734
       734
       -
           "version": "7.0.49",

     

       735
       735
       -
           "hash": "sha256-0MQSBeQahSX9s1PPFWengy5J8pWiKR48Vx7dsh3I2p4="

     

       736
       736
       -
         },

     

       737
       737
       -
         {

     

       738
       738
       -
           "pname": "NBitcoin",

     

       739
       739
       -
           "version": "7.0.50",

     

       740
       740
       -
           "hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk="

     

       714
       714
       +
           "version": "8.0.8",

     

       715
       715
       +
           "hash": "sha256-gpbxlfE7TN7mUOcWF9+r8htQTc19KqAuzsVaG5RYa3A="

     

       741
       716
        
         },

     

       742
       717
        
         {

     

       743
       718
        
           "pname": "NBitcoin.Altcoins",

+2 -2

pkgs/by-name/bt/btcpayserver/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildDotnetModule rec {

     

       10
       10
        
         pname = "btcpayserver";

     

       11
       11
       -
         version = "2.1.0";

     

       11
       11
       +
         version = "2.1.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "btcpayserver";

     

       15
       15
        
           repo = "btcpayserver";

     

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

     

       17
       17
       -
           sha256 = "sha256-vojRe64STkCKNn/es5+TyBAXvSBXkjjGLbykuKTEa5k=";

     

       17
       17
       +
           hash = "sha256-5zvxLEQbKTcslcpq1JRgY/L0XWnQ4UyFWww6SGcTtcs=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         projectFile = "BTCPayServer/BTCPayServer.csproj";

+21 -3

pkgs/by-name/co/conkeyscan/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
       +
       let

     

       8
       8
       +
         python = python3.override {

     

       9
       9
       +
           self = python3;

     

       10
       10
       +
           packageOverrides = self: super: {

     

       11
       11
       +
             pyrate-limiter = super.pyrate-limiter.overridePythonAttrs (oldAttrs: rec {

     

       12
       12
       +
               version = "2.10.0";

     

       13
       13
       +
               src = fetchFromGitHub {

     

       14
       14
       +
                 inherit (oldAttrs.src) owner repo;

     

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

     

       16
       16
       +
                 hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";

     

       17
       17
       +
               };

     

       18
       18
       +
               doCheck = false;

     

       19
       19
       +
             });

     

       20
       20
       +
           };

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
       in

     

       24
       24
       +
       

     

       25
       25
       +
       python.pkgs.buildPythonApplication rec {

     

       8
       26
        
         pname = "conkeyscan";

     

       9
       27
        
         version = "1.1.0";

     

       10
       28
        
         pyproject = true;

     
···

       21
       39
        
             --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}"

     

       22
       40
        
         '';

     

       23
       41
        
       

     

       24
       24
       -
         build-system = with python3.pkgs; [ setuptools ];

     

       42
       42
       +
         build-system = with python.pkgs; [ setuptools ];

     

       25
       43
        
       

     

       26
       26
       -
         dependencies = with python3.pkgs; [

     

       44
       44
       +
         dependencies = with python.pkgs; [

     

       27
       45
        
           atlassian-python-api

     

       28
       46
        
           beautifulsoup4

     

       29
       47
        
           clize

+44

pkgs/by-name/ct/ctestCheckHook/ctest-check-hook.sh

···

       1
       1
       +
       # shellcheck shell=bash disable=SC2154

     

       2
       2
       +
       

     

       3
       3
       +
       ctestCheckHook() {

     

       4
       4
       +
           echo "Executing ctestCheckHook"

     

       5
       5
       +
       

     

       6
       6
       +
           runHook preCheck

     

       7
       7
       +
       

     

       8
       8
       +
           local buildCores=1

     

       9
       9
       +
       

     

       10
       10
       +
           if [ "${enableParallelChecking-1}" ]; then

     

       11
       11
       +
               buildCores="$NIX_BUILD_CORES"

     

       12
       12
       +
           fi

     

       13
       13
       +
       

     

       14
       14
       +
           local flagsArray=(

     

       15
       15
       +
               "-j$buildCores"

     

       16
       16
       +
               # This is enabled by the cmakeConfigurePhase by exporting

     

       17
       17
       +
               # CTEST_OUTPUT_ON_FAILURE, but it makes sense it enable it globally here

     

       18
       18
       +
               # as well.

     

       19
       19
       +
               "--output-on-failure"

     

       20
       20
       +
           )

     

       21
       21
       +
       

     

       22
       22
       +
           local disabledTestsArray=()

     

       23
       23
       +
           concatTo disabledTestsArray disabledTests

     

       24
       24
       +
       

     

       25
       25
       +
           if [ ${#disabledTestsArray[@]} -ne 0 ]; then

     

       26
       26
       +
               local ctestExcludedTestsFile=$NIX_BUILD_TOP/.ctest-excluded-tests

     

       27
       27
       +
               disabledTestsString="$(concatStringsSep "\n" disabledTestsArray)"

     

       28
       28
       +
               echo -e "$disabledTestsString" >"$ctestExcludedTestsFile"

     

       29
       29
       +
               flagsArray+=("--exclude-from-file" "$ctestExcludedTestsFile")

     

       30
       30
       +
           fi

     

       31
       31
       +
       

     

       32
       32
       +
           concatTo flagsArray ctestFlags checkFlags checkFlagsArray

     

       33
       33
       +
       

     

       34
       34
       +
           echoCmd 'ctest flags' "${flagsArray[@]}"

     

       35
       35
       +
           ctest "${flagsArray[@]}"

     

       36
       36
       +
       

     

       37
       37
       +
           echo "Finished ctestCheckHook"

     

       38
       38
       +
       

     

       39
       39
       +
           runHook postCheck

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       if [ -z "${dontUseCTestCheck-}" ] && [ -z "${checkPhase-}" ]; then

     

       43
       43
       +
           checkPhase=ctestCheckHook

     

       44
       44
       +
       fi

pkgs/by-name/ct/ctestCheckHook/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         makeSetupHook,

     

       3
       3
       +
         cmake,

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       makeSetupHook {

     

       7
       7
       +
         name = "ctestCheckHook";

     

       8
       8
       +
         propagatedBuildInputs = [ cmake ];

     

       9
       9
       +
       } ./ctest-check-hook.sh

+3 -3

pkgs/by-name/do/docker-language-server/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "docker-language-server";

     

       11
       11
       -
         version = "0.3.8";

     

       11
       11
       +
         version = "0.6.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "docker";

     

       15
       15
        
           repo = "docker-language-server";

     

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

     

       17
       17
       -
           hash = "sha256-irjIa+GC/4tEMoC8ZY/8n9J/Z5G/VesSj4xWqnOj6uY=";

     

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

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-O1SQVKfnOkxWqJWamRkb8RMRsWriBZqH3oYSzIHX7Ug=";

     

       20
       20
       +
         vendorHash = "sha256-YDBNJzTyPEM/Zvv1Ieo3GG+NlvDOrghxdOqkKsF04AE=";

     

       21
       21
        
       

     

       22
       22
        
         nativeCheckInputs = [

     

       23
       23
        
           docker

+2 -2

pkgs/by-name/do/doomrunner/package.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
        
         pname = "doomrunner";

     

       10
       10
       -
         version = "1.9.0";

     

       10
       10
       +
         version = "1.9.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "Youda008";

     

       14
       14
        
           repo = "DoomRunner";

     

       15
       15
        
           tag = "v${finalAttrs.version}";

     

       16
       16
       -
           hash = "sha256-rCoMTPGjIFAcNncBGg1IMdUahzjH0WlFZBZS0UmNI/g=";

     

       16
       16
       +
           hash = "sha256-N5kj2Z3QW29kOw2khET6Z4E9nFBBjNTgKw2xbCQrWKY=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ kdePackages.qtbase ];

+3 -3

pkgs/by-name/er/erigon/package.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         pname = "erigon";

     

       10
       10
       -
         version = "3.0.2";

     

       10
       10
       +
         version = "3.0.3";

     

       11
       11
        
       in

     

       12
       12
        
       buildGoModule {

     

       13
       13
        
         inherit pname version;

     
···

       16
       16
        
           owner = "ledgerwatch";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           hash = "sha256-1rMlRlEUheW6g3kigh+DjQxtNJOrqrADPkjQn7TQr1g=";

     

       19
       19
       +
           hash = "sha256-gSgkdg7677OBOkAbsEjxX1QttuIbfve2A3luUZoZ5Ik=";

     

       20
       20
        
           fetchSubmodules = true;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-tCohubwCk5HERoAaGWgEsl5kpI8w8dn0oZCZ2AxkKXk=";

     

       23
       23
       +
         vendorHash = "sha256-8eyC3JkRcRlFw8CyTK5w1XySur2jAeFGXkEaY/3Oq0k=";

     

       24
       24
        
         proxyVendor = true;

     

       25
       25
        
       

     

       26
       26
        
         # Build errors in mdbx when format hardening is enabled:

+3 -3

pkgs/by-name/fi/filen-cli/package.nix

···

       14
       14
        
       

     

       15
       15
        
       buildNpmPackage (finalAttrs: {

     

       16
       16
        
         pname = "filen-cli";

     

       17
       17
       -
         version = "0.0.33";

     

       17
       17
       +
         version = "0.0.34";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "FilenCloudDienste";

     

       21
       21
        
           repo = "filen-cli";

     

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

     

       23
       23
       -
           hash = "sha256-piGXcPUwJDOg8EAYML0BiSPRM+1LogU8s2BXtBud5ww=";

     

       23
       23
       +
           hash = "sha256-iISW9EAk8haWUCh9I8qHhrBKLqHeBUC8sWA0MnXqQSA=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         npmDepsHash = "sha256-4GdipHnaqv3LrejMXF73duNyZKgD/0ApzUjiI/QQ30g=";

     

       26
       26
       +
         npmDepsHash = "sha256-0DpiUjUFc0ThzP6/qrSEebKDq2fnr/CpcmtPFaIVHhU=";

     

       27
       27
        
       

     

       28
       28
        
         inherit nodejs;

     

       29
       29

+6 -5

pkgs/by-name/gi/gifticlib/package.nix

···

       6
       6
        
         expat,

     

       7
       7
        
         nifticlib,

     

       8
       8
        
         zlib,

     

       9
       9
       +
         ctestCheckHook,

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       stdenv.mkDerivation {

     
···

       33
       34
        
       

     

       34
       35
        
         # without the test data, this is only a few basic tests

     

       35
       36
        
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       36
       36
       -
         checkPhase = ''

     

       37
       37
       -
           runHook preCheck

     

       38
       38
       -
           ctest -LE 'NEEDS_DATA'

     

       39
       39
       -
           runHook postCheck

     

       40
       40
       -
         '';

     

       37
       37
       +
         nativeCheckInputs = [ ctestCheckHook ];

     

       38
       38
       +
         checkFlags = [

     

       39
       39
       +
           "-LE"

     

       40
       40
       +
           "NEEDS_DATA"

     

       41
       41
       +
         ];

     

       41
       42
        
       

     

       42
       43
        
         meta = with lib; {

     

       43
       44
        
           homepage = "https://www.nitrc.org/projects/gifti";

pkgs/by-name/gi/git-run/package.nix

···

       20
       20
        
         makeCacheWritable = true;

     

       21
       21
        
         dontBuild = true;

     

       22
       22
        
       

     

       23
       23
       +
         postInstall = ''

     

       24
       24
       +
           echo "Removing broken symlinks in node_modules/.bin"

     

       25
       25
       +
           rm -f $out/lib/node_modules/${pname}/node_modules/.bin/_mocha

     

       26
       26
       +
           rm -f $out/lib/node_modules/${pname}/node_modules/.bin/he

     

       27
       27
       +
           rm -f $out/lib/node_modules/${pname}/node_modules/.bin/mkdirp

     

       28
       28
       +
           rm -f $out/lib/node_modules/${pname}/node_modules/.bin/mocha

     

       29
       29
       +
           rm -f $out/lib/node_modules/${pname}/node_modules/.bin/rimraf

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       23
       32
        
         meta = {

     

       24
       33
        
           description = "Multiple git repository management tool";

     

       25
       34
        
           homepage = "https://mixu.net/gr/";

+2 -2

pkgs/by-name/gl/globalarrays/package.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "globalarrays";

     

       14
       14
       -
         version = "5.9.1";

     

       14
       14
       +
         version = "5.9.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "GlobalArrays";

     

       18
       18
        
           repo = "ga";

     

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

     

       20
       20
       -
           sha256 = "sha256-bMX538yen9cINPCtgf7SUGGsNRJugMrveqXtChHzPkk=";

     

       20
       20
       +
           sha256 = "sha256-leCvbWteOp7z7ORwtljA+KslHUptY2vdupZTmAjsArg=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/im/imsprog/package.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "imsprog";

     

       17
       17
       -
         version = "1.5.2";

     

       17
       17
       +
         version = "1.5.3";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "bigbigmdm";

     

       21
       21
        
           repo = "IMSProg";

     

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

     

       23
       23
       -
           hash = "sha256-G2hD9h9hcuUO35z/k46+24KTgqGiufa3dwa4LQVA1yY=";

     

       23
       23
       +
           hash = "sha256-vT2SAhHfgs4HR0V0Tu0MLCL9nizf9u4z/H70PJKhA9k=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         strictDeps = true;

pkgs/by-name/ka/kanidm/1_6.nix

···

       1
       1
       +
       import ./generic.nix {

     

       2
       2
       +
         version = "1.6.2";

     

       3
       3
       +
         hash = "sha256-rfQNx6yAj1mDW7UL8mz01TqMAET9D5fL02JhHeN5zV4=";

     

       4
       4
       +
         cargoHash = "sha256-3XUAwuRKtdnMNhH92lgwgeN2rMmzgqir1+OZNaTGmks=";

     

       5
       5
       +
         patchDir = ./patches/1_6;

     

       6
       6
       +
       }

+1 -1

pkgs/by-name/ka/kanidm/package.nix

···

       1
       1
       -
       import ./1_5.nix

     

       1
       1
       +
       import ./1_6.nix

+159

pkgs/by-name/ka/kanidm/patches/1_6/oauth2-basic-secret-modify.patch

···

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

     

       2
       2
       +
       From: oddlama <oddlama@oddlama.org>

     

       3
       3
       +
       Date: Fri, 21 Mar 2025 16:07:54 +0100

     

       4
       4
       +
       Subject: [PATCH 1/2] oauth2 basic secret modify

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        server/core/src/actors/v1_write.rs  | 42 +++++++++++++++++++++++++++++

     

       8
       8
       +
        server/core/src/https/v1.rs         |  6 ++++-

     

       9
       9
       +
        server/core/src/https/v1_oauth2.rs  | 29 ++++++++++++++++++++

     

       10
       10
       +
        server/lib/src/server/migrations.rs | 16 +++++++++++

     

       11
       11
       +
        4 files changed, 92 insertions(+), 1 deletion(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs

     

       14
       14
       +
       index 732e826c8..a2b8e503f 100644

     

       15
       15
       +
       --- a/server/core/src/actors/v1_write.rs

     

       16
       16
       +
       +++ b/server/core/src/actors/v1_write.rs

     

       17
       17
       +
       @@ -324,6 +324,48 @@ impl QueryServerWriteV1 {

     

       18
       18
       +
                    .and_then(|_| idms_prox_write.commit().map(|_| ()))

     

       19
       19
       +
            }

     

       20
       20
       +
        

     

       21
       21
       +
       +    #[instrument(

     

       22
       22
       +
       +        level = "info",

     

       23
       23
       +
       +        skip_all,

     

       24
       24
       +
       +        fields(uuid = ?eventid)

     

       25
       25
       +
       +    )]

     

       26
       26
       +
       +    pub async fn handle_oauth2_basic_secret_write(

     

       27
       27
       +
       +        &self,

     

       28
       28
       +
       +        client_auth_info: ClientAuthInfo,

     

       29
       29
       +
       +        filter: Filter<FilterInvalid>,

     

       30
       30
       +
       +        new_secret: String,

     

       31
       31
       +
       +        eventid: Uuid,

     

       32
       32
       +
       +    ) -> Result<(), OperationError> {

     

       33
       33
       +
       +        // Given a protoEntry, turn this into a modification set.

     

       34
       34
       +
       +        let ct = duration_from_epoch_now();

     

       35
       35
       +
       +        let mut idms_prox_write = self.idms.proxy_write(ct).await?;

     

       36
       36
       +
       +        let ident = idms_prox_write

     

       37
       37
       +
       +            .validate_client_auth_info_to_ident(client_auth_info, ct)

     

       38
       38
       +
       +            .map_err(|e| {

     

       39
       39
       +
       +                admin_error!(err = ?e, "Invalid identity");

     

       40
       40
       +
       +                e

     

       41
       41
       +
       +            })?;

     

       42
       42
       +
       +

     

       43
       43
       +
       +        let modlist = ModifyList::new_purge_and_set(

     

       44
       44
       +
       +            Attribute::OAuth2RsBasicSecret,

     

       45
       45
       +
       +            Value::SecretValue(new_secret),

     

       46
       46
       +
       +        );

     

       47
       47
       +
       +

     

       48
       48
       +
       +        let mdf =

     

       49
       49
       +
       +            ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write)

     

       50
       50
       +
       +                .map_err(|e| {

     

       51
       51
       +
       +                admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write");

     

       52
       52
       +
       +                e

     

       53
       53
       +
       +            })?;

     

       54
       54
       +
       +

     

       55
       55
       +
       +        trace!(?mdf, "Begin modify event");

     

       56
       56
       +
       +

     

       57
       57
       +
       +        idms_prox_write

     

       58
       58
       +
       +            .qs_write

     

       59
       59
       +
       +            .modify(&mdf)

     

       60
       60
       +
       +            .and_then(|_| idms_prox_write.commit())

     

       61
       61
       +
       +    }

     

       62
       62
       +
       +

     

       63
       63
       +
            #[instrument(

     

       64
       64
       +
                level = "info",

     

       65
       65
       +
                skip_all,

     

       66
       66
       +
       diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs

     

       67
       67
       +
       index 30de387b8..a11aa8ecd 100644

     

       68
       68
       +
       --- a/server/core/src/https/v1.rs

     

       69
       69
       +
       +++ b/server/core/src/https/v1.rs

     

       70
       70
       +
       @@ -4,7 +4,7 @@ use axum::extract::{Path, State};

     

       71
       71
       +
        use axum::http::{HeaderMap, HeaderValue};

     

       72
       72
       +
        use axum::middleware::from_fn;

     

       73
       73
       +
        use axum::response::{IntoResponse, Response};

     

       74
       74
       +
       -use axum::routing::{delete, get, post, put};

     

       75
       75
       +
       +use axum::routing::{delete, get, post, put, patch};

     

       76
       76
       +
        use axum::{Extension, Json, Router};

     

       77
       77
       +
        use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};

     

       78
       78
       +
        use compact_jwt::{Jwk, Jws, JwsSigner};

     

       79
       79
       +
       @@ -3129,6 +3129,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router<ServerState> {

     

       80
       80
       +
                    "/v1/oauth2/:rs_name/_basic_secret",

     

       81
       81
       +
                    get(super::v1_oauth2::oauth2_id_get_basic_secret),

     

       82
       82
       +
                )

     

       83
       83
       +
       +        .route(

     

       84
       84
       +
       +            "/v1/oauth2/:rs_name/_basic_secret",

     

       85
       85
       +
       +            patch(super::v1_oauth2::oauth2_id_patch_basic_secret),

     

       86
       86
       +
       +        )

     

       87
       87
       +
                .route(

     

       88
       88
       +
                    "/v1/oauth2/:rs_name/_scopemap/:group",

     

       89
       89
       +
                    post(super::v1_oauth2::oauth2_id_scopemap_post)

     

       90
       90
       +
       diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs

     

       91
       91
       +
       index f399539bc..ffad9921e 100644

     

       92
       92
       +
       --- a/server/core/src/https/v1_oauth2.rs

     

       93
       93
       +
       +++ b/server/core/src/https/v1_oauth2.rs

     

       94
       94
       +
       @@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret(

     

       95
       95
       +
                .map_err(WebError::from)

     

       96
       96
       +
        }

     

       97
       97
       +
        

     

       98
       98
       +
       +#[utoipa::path(

     

       99
       99
       +
       +    patch,

     

       100
       100
       +
       +    path = "/v1/oauth2/{rs_name}/_basic_secret",

     

       101
       101
       +
       +    request_body=ProtoEntry,

     

       102
       102
       +
       +    responses(

     

       103
       103
       +
       +        DefaultApiResponse,

     

       104
       104
       +
       +    ),

     

       105
       105
       +
       +    security(("token_jwt" = [])),

     

       106
       106
       +
       +    tag = "v1/oauth2",

     

       107
       107
       +
       +    operation_id = "oauth2_id_patch_basic_secret"

     

       108
       108
       +
       +)]

     

       109
       109
       +
       +/// Overwrite the basic secret for a given OAuth2 Resource Server.

     

       110
       110
       +
       +#[instrument(level = "info", skip(state, new_secret))]

     

       111
       111
       +
       +pub(crate) async fn oauth2_id_patch_basic_secret(

     

       112
       112
       +
       +    State(state): State<ServerState>,

     

       113
       113
       +
       +    Extension(kopid): Extension<KOpId>,

     

       114
       114
       +
       +    VerifiedClientInformation(client_auth_info): VerifiedClientInformation,

     

       115
       115
       +
       +    Path(rs_name): Path<String>,

     

       116
       116
       +
       +    Json(new_secret): Json<String>,

     

       117
       117
       +
       +) -> Result<Json<()>, WebError> {

     

       118
       118
       +
       +    let filter = oauth2_id(&rs_name);

     

       119
       119
       +
       +    state

     

       120
       120
       +
       +        .qe_w_ref

     

       121
       121
       +
       +        .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid)

     

       122
       122
       +
       +        .await

     

       123
       123
       +
       +        .map(Json::from)

     

       124
       124
       +
       +        .map_err(WebError::from)

     

       125
       125
       +
       +}

     

       126
       126
       +
       +

     

       127
       127
       +
        #[utoipa::path(

     

       128
       128
       +
            patch,

     

       129
       129
       +
            path = "/v1/oauth2/{rs_name}",

     

       130
       130
       +
       diff --git a/server/lib/src/server/migrations.rs b/server/lib/src/server/migrations.rs

     

       131
       131
       +
       index fd0bca8db..8621714f2 100644

     

       132
       132
       +
       --- a/server/lib/src/server/migrations.rs

     

       133
       133
       +
       +++ b/server/lib/src/server/migrations.rs

     

       134
       134
       +
       @@ -171,6 +171,22 @@ impl QueryServer {

     

       135
       135
       +
                    reload_required = true;

     

       136
       136
       +
                };

     

       137
       137
       +
        

     

       138
       138
       +
       +        // secret provisioning: allow idm_admin to modify OAuth2RsBasicSecret.

     

       139
       139
       +
       +        write_txn.internal_modify_uuid(

     

       140
       140
       +
       +            UUID_IDM_ACP_OAUTH2_MANAGE_V1,

     

       141
       141
       +
       +            &ModifyList::new_append(

     

       142
       142
       +
       +                Attribute::AcpCreateAttr,

     

       143
       143
       +
       +                Attribute::OAuth2RsBasicSecret.into(),

     

       144
       144
       +
       +            ),

     

       145
       145
       +
       +        )?;

     

       146
       146
       +
       +        write_txn.internal_modify_uuid(

     

       147
       147
       +
       +            UUID_IDM_ACP_OAUTH2_MANAGE_V1,

     

       148
       148
       +
       +            &ModifyList::new_append(

     

       149
       149
       +
       +                Attribute::AcpModifyPresentAttr,

     

       150
       150
       +
       +                Attribute::OAuth2RsBasicSecret.into(),

     

       151
       151
       +
       +            ),

     

       152
       152
       +
       +        )?;

     

       153
       153
       +
       +

     

       154
       154
       +
                // Execute whatever operations we have batched up and ready to go. This is needed

     

       155
       155
       +
                // to preserve ordering of the operations - if we reloaded after a remigrate then

     

       156
       156
       +
                // we would have skipped the patch level fix which needs to have occurred *first*.

     

       157
       157
       +
       -- 

     

       158
       158
       +
       2.49.0

     

       159
       159
       +

+122

pkgs/by-name/ka/kanidm/patches/1_6/recover-account.patch

···

       1
       1
       +
       From 229165abe5be596fc2be8e285884813a1b5a38c8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: oddlama <oddlama@oddlama.org>

     

       3
       3
       +
       Date: Fri, 21 Mar 2025 16:08:15 +0100

     

       4
       4
       +
       Subject: [PATCH 2/2] recover account

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        server/core/src/actors/internal.rs |  5 +++--

     

       8
       8
       +
        server/core/src/admin.rs           |  6 +++---

     

       9
       9
       +
        server/daemon/src/main.rs          | 23 ++++++++++++++++++++++-

     

       10
       10
       +
        server/daemon/src/opt.rs           |  7 +++++++

     

       11
       11
       +
        4 files changed, 35 insertions(+), 6 deletions(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs

     

       14
       14
       +
       index 420e72c6c..e252bca51 100644

     

       15
       15
       +
       --- a/server/core/src/actors/internal.rs

     

       16
       16
       +
       +++ b/server/core/src/actors/internal.rs

     

       17
       17
       +
       @@ -172,17 +172,18 @@ impl QueryServerWriteV1 {

     

       18
       18
       +
        

     

       19
       19
       +
            #[instrument(

     

       20
       20
       +
                level = "info",

     

       21
       21
       +
       -        skip(self, eventid),

     

       22
       22
       +
       +        skip(self, password, eventid),

     

       23
       23
       +
                fields(uuid = ?eventid)

     

       24
       24
       +
            )]

     

       25
       25
       +
            pub(crate) async fn handle_admin_recover_account(

     

       26
       26
       +
                &self,

     

       27
       27
       +
                name: String,

     

       28
       28
       +
       +        password: Option<String>,

     

       29
       29
       +
                eventid: Uuid,

     

       30
       30
       +
            ) -> Result<String, OperationError> {

     

       31
       31
       +
                let ct = duration_from_epoch_now();

     

       32
       32
       +
                let mut idms_prox_write = self.idms.proxy_write(ct).await?;

     

       33
       33
       +
       -        let pw = idms_prox_write.recover_account(name.as_str(), None)?;

     

       34
       34
       +
       +        let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?;

     

       35
       35
       +
        

     

       36
       36
       +
                idms_prox_write.commit().map(|()| pw)

     

       37
       37
       +
            }

     

       38
       38
       +
       diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs

     

       39
       39
       +
       index 90ccb1927..85e31ddef 100644

     

       40
       40
       +
       --- a/server/core/src/admin.rs

     

       41
       41
       +
       +++ b/server/core/src/admin.rs

     

       42
       42
       +
       @@ -24,7 +24,7 @@ pub use kanidm_proto::internal::{

     

       43
       43
       +
        

     

       44
       44
       +
        #[derive(Serialize, Deserialize, Debug)]

     

       45
       45
       +
        pub enum AdminTaskRequest {

     

       46
       46
       +
       -    RecoverAccount { name: String },

     

       47
       47
       +
       +    RecoverAccount { name: String, password: Option<String> },

     

       48
       48
       +
            ShowReplicationCertificate,

     

       49
       49
       +
            RenewReplicationCertificate,

     

       50
       50
       +
            RefreshReplicationConsumer,

     

       51
       51
       +
       @@ -309,8 +309,8 @@ async fn handle_client(

     

       52
       52
       +
        

     

       53
       53
       +
                let resp = async {

     

       54
       54
       +
                    match req {

     

       55
       55
       +
       -                AdminTaskRequest::RecoverAccount { name } => {

     

       56
       56
       +
       -                    match server_rw.handle_admin_recover_account(name, eventid).await {

     

       57
       57
       +
       +                AdminTaskRequest::RecoverAccount { name, password } => {

     

       58
       58
       +
       +                    match server_rw.handle_admin_recover_account(name, password, eventid).await {

     

       59
       59
       +
                                Ok(password) => AdminTaskResponse::RecoverAccount { password },

     

       60
       60
       +
                                Err(e) => {

     

       61
       61
       +
                                    error!(err = ?e, "error during recover-account");

     

       62
       62
       +
       diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs

     

       63
       63
       +
       index c3b40faa0..2a57a307c 100644

     

       64
       64
       +
       --- a/server/daemon/src/main.rs

     

       65
       65
       +
       +++ b/server/daemon/src/main.rs

     

       66
       66
       +
       @@ -923,13 +923,34 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode {

     

       67
       67
       +
                        .await;

     

       68
       68
       +
                    }

     

       69
       69
       +
                }

     

       70
       70
       +
       -        KanidmdOpt::RecoverAccount { name, commonopts } => {

     

       71
       71
       +
       +        KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => {

     

       72
       72
       +
                    info!("Running account recovery ...");

     

       73
       73
       +
                    let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into();

     

       74
       74
       +
       +            let password = if *from_environment {

     

       75
       75
       +
       +                match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE") {

     

       76
       76
       +
       +                    Ok(path) => match tokio::fs::read_to_string(&path).await {

     

       77
       77
       +
       +                        Ok(contents) => Some(contents),

     

       78
       78
       +
       +                        Err(e) => {

     

       79
       79
       +
       +                            error!("Failed to read password file '{}': {}", path, e);

     

       80
       80
       +
       +                            return ExitCode::FAILURE;

     

       81
       81
       +
       +                        }

     

       82
       82
       +
       +                    },

     

       83
       83
       +
       +                    Err(_) => match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") {

     

       84
       84
       +
       +                        Ok(val) => Some(val),

     

       85
       85
       +
       +                        Err(_) => {

     

       86
       86
       +
       +                            error!("Neither KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE nor KANIDM_RECOVER_ACCOUNT_PASSWORD was set");

     

       87
       87
       +
       +                            return ExitCode::FAILURE;

     

       88
       88
       +
       +                        }

     

       89
       89
       +
       +                    }

     

       90
       90
       +
       +                }

     

       91
       91
       +
       +            } else {

     

       92
       92
       +
       +                None

     

       93
       93
       +
       +            };

     

       94
       94
       +
                    submit_admin_req(

     

       95
       95
       +
                        config.adminbindpath.as_str(),

     

       96
       96
       +
                        AdminTaskRequest::RecoverAccount {

     

       97
       97
       +
                            name: name.to_owned(),

     

       98
       98
       +
       +                    password,

     

       99
       99
       +
                        },

     

       100
       100
       +
                        output_mode,

     

       101
       101
       +
                    )

     

       102
       102
       +
       diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs

     

       103
       103
       +
       index f1b45a5b3..ca19fb6a5 100644

     

       104
       104
       +
       --- a/server/daemon/src/opt.rs

     

       105
       105
       +
       +++ b/server/daemon/src/opt.rs

     

       106
       106
       +
       @@ -236,6 +236,13 @@ enum KanidmdOpt {

     

       107
       107
       +
                #[clap(value_parser)]

     

       108
       108
       +
                /// The account name to recover credentials for.

     

       109
       109
       +
                name: String,

     

       110
       110
       +
       +        /// Use a password given via an environment variable.

     

       111
       111
       +
       +        /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE` takes precedence and reads the desired

     

       112
       112
       +
       +        ///    password from the given file

     

       113
       113
       +
       +        /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD` directly takes a

     

       114
       114
       +
       +        ///    password - beware that this will leave the password in the environment

     

       115
       115
       +
       +        #[clap(long = "from-environment")]

     

       116
       116
       +
       +        from_environment: bool,

     

       117
       117
       +
                #[clap(flatten)]

     

       118
       118
       +
                commonopts: CommonOpt,

     

       119
       119
       +
            },

     

       120
       120
       +
       -- 

     

       121
       121
       +
       2.49.0

     

       122
       122
       +

+3 -3

pkgs/by-name/ku/kubernetes-controller-tools/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "controller-tools";

     

       9
       9
       -
         version = "0.17.3";

     

       9
       9
       +
         version = "0.18.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "kubernetes-sigs";

     

       13
       13
        
           repo = "controller-tools";

     

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

     

       15
       15
       -
           sha256 = "sha256-YBg6sf7G9xsSkLarA9wRlCg1Knu/c8Y9kpscRKNpVmk=";

     

       15
       15
       +
           sha256 = "sha256-zrh6GWFivs1fqkvaN6MSiYoCuPbiTQ6mJz4d69Wb7lo=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-YRY/gILgJyLoMUG0v5HiAWN7lEzjCc7TJSZgRiN2tZs=";

     

       18
       18
       +
         vendorHash = "sha256-criu2UyNkGaVQnIxrjzIU4D389DbCcjG/kn3kfoD5yE=";

     

       19
       19
        
       

     

       20
       20
        
         ldflags = [

     

       21
       21
        
           "-s"

+2 -2

pkgs/by-name/li/linux-firmware/package.nix

···

       22
       22
        
       in

     

       23
       23
        
       stdenvNoCC.mkDerivation rec {

     

       24
       24
        
         pname = "linux-firmware";

     

       25
       25
       -
         version = "20250410";

     

       25
       25
       +
         version = "20250509";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchzip {

     

       28
       28
        
           url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz ";

     

       29
       29
       -
           hash = "sha256-aQdEl9+7zbNqWSII9hjRuPePvSfWVql5u5TIrGsa+Ao=";

     

       29
       29
       +
           hash = "sha256-0FrhgJQyCeRCa3s0vu8UOoN0ZgVCahTQsSH0o6G6hhY=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postUnpack = ''

+20 -18

pkgs/by-name/mi/mirrorbits/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         versionCheckHook,

     

       3
       4
        
         buildGoModule,

     

       4
       5
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         zlib,

     

       8
       8
        
         geoip,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       buildGoModule rec {

     

       11
       11
       +
       buildGoModule (finalAttrs: {

     

       12
       12
        
         pname = "mirrorbits";

     

       13
       13
       -
         version = "0.5.1";

     

       13
       13
       +
         version = "0.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "etix";

     

       17
       17
        
           repo = "mirrorbits";

     

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

     

       19
       19
       -
           hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM=";

     

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

     

       19
       19
       +
           hash = "sha256-99eOfVSlGIEzNm+0gI/y0+UPd+dnZiGzaHlkqUNtO1U=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = null;

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           rm -rf vendor

     

       24
       24
       +
         '';

     

       23
       25
        
       

     

       24
       24
       -
         patches = [

     

       25
       25
       -
           # Add Go Modules support

     

       26
       26
       -
           (fetchpatch {

     

       27
       27
       -
             url = "https://github.com/etix/mirrorbits/commit/955a8b2e1aacea1cae06396a64afbb531ceb36d4.patch";

     

       28
       28
       -
             hash = "sha256-KJgj3ynnjjiXG5qsUmzBiMjGEwfvM/9Ap+ZgUdhclik=";

     

       29
       29
       -
           })

     

       30
       30
       -
         ];

     

       26
       26
       +
         vendorHash = "sha256-cdD9RvOtgN/SHtgrtrucnUI+nnO/FabUyPRdvgoL44o=";

     

       31
       27
        
       

     

       32
       28
        
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
       +
       

     

       33
       30
        
         buildInputs = [

     

       34
       31
        
           zlib

     

       35
       32
        
           geoip

     
···

       40
       37
        
         ldflags = [

     

       41
       38
        
           "-s"

     

       42
       39
        
           "-w"

     

       40
       40
       +
           "-X github.com/etix/mirrorbits/core.VERSION=${finalAttrs.version}"

     

       43
       41
        
         ];

     

       44
       42
        
       

     

       45
       45
       -
         meta = with lib; {

     

       46
       46
       -
           description = "geographical download redirector for distributing files efficiently across a set of mirrors";

     

       43
       43
       +
         doInstallCheck = true;

     

       44
       44
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       45
       45
       +
         versionCheckProgramArg = "version";

     

       46
       46
       +
       

     

       47
       47
       +
         meta = {

     

       48
       48
       +
           description = "Geographical download redirector for distributing files efficiently across a set of mirrors";

     

       47
       49
        
           homepage = "https://github.com/etix/mirrorbits";

     

       48
       50
        
           longDescription = ''

     

       49
       51
        
             Mirrorbits is a geographical download redirector written in Go for

     
···

       53
       55
        
             the distribution of large-scale Open-Source projects with a lot

     

       54
       56
        
             of traffic.

     

       55
       57
        
           '';

     

       56
       56
       -
           license = licenses.mit;

     

       57
       57
       -
           maintainers = with maintainers; [ fpletz ];

     

       58
       58
       +
           license = lib.licenses.mit;

     

       59
       59
       +
           maintainers = with lib.maintainers; [ fpletz ];

     

       58
       60
        
           mainProgram = "mirrorbits";

     

       59
       61
        
         };

     

       60
       60
       -
       }

     

       62
       62
       +
       })

+3 -3

pkgs/by-name/mo/moon/package.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       15
       15
        
         pname = "moon";

     

       16
       16
       -
         version = "1.35.1";

     

       16
       16
       +
         version = "1.35.5";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "moonrepo";

     

       20
       20
        
           repo = "moon";

     

       21
       21
        
           tag = "v${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-/MKv+k6GZHpqnwheLYAbIAtIT8cZoiNg1EFUNQLbiQk=";

     

       22
       22
       +
           hash = "sha256-cqa8s38c6wREqFzWD61t1vc0eLbrYRb8FuElKr+MdD0=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-CyvcC46FUeEPcDvHiIBunnM4H4Esp2Q6GRhJZgXhlJk=";

     

       25
       25
       +
         cargoHash = "sha256-9UOGDsq93mayuoxyhO7hjss3OYRf97EUwNY23VYnP1E=";

     

       26
       26
        
       

     

       27
       27
        
         env = {

     

       28
       28
        
           RUSTFLAGS = "-C strip=symbols";

+2 -2

pkgs/by-name/nb/nbxplorer/package.nix

···

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "dgarage";

     

       14
       14
        
           repo = "NBXplorer";

     

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

     

       16
       16
       -
           sha256 = "sha256-RTkKyckdAv6+wJSlDlR+Q8fw0aZEbi4AwB+OPHI7TR4=";

     

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

     

       16
       16
       +
           hash = "sha256-RTkKyckdAv6+wJSlDlR+Q8fw0aZEbi4AwB+OPHI7TR4=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         projectFile = "NBXplorer/NBXplorer.csproj";

+9 -2

pkgs/by-name/nm/nmap/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         versionCheckHook,

     

       5
       6
        
         libpcap,

     

       6
       7
        
         pkg-config,

     

       7
       8
        
         openssl,

     
···

       15
       16
        
       

     

       16
       17
        
       stdenv.mkDerivation rec {

     

       17
       18
        
         pname = "nmap";

     

       18
       18
       -
         version = "7.95";

     

       19
       19
       +
         version = "7.96";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchurl {

     

       21
       22
        
           url = "https://nmap.org/dist/nmap-${version}.tar.bz2";

     

       22
       22
       -
           hash = "sha256-4Uq1MOR7Wv2I8ciiusf4nNj+a0eOItJVxbm923ocV3g=";

     

       23
       23
       +
           hash = "sha256-mK56Ty+2bBo9SCr48AE3KDuRciNEa0bnogsG6r7fjIo=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

     
···

       62
       63
        
         enableParallelBuilding = true;

     

       63
       64
        
       

     

       64
       65
        
         doCheck = false; # fails 3 tests, probably needs the net

     

       66
       66
       +
       

     

       67
       67
       +
         nativeInstallCheckInputs = [

     

       68
       68
       +
           versionCheckHook

     

       69
       69
       +
         ];

     

       70
       70
       +
         versionCheckProgramArg = "-V";

     

       71
       71
       +
         doInstallCheck = true;

     

       65
       72
        
       

     

       66
       73
        
         meta = {

     

       67
       74
        
           description = "Free and open source utility for network discovery and security auditing";

+9 -3

pkgs/by-name/np/npins/package.nix

···

       19
       19
        
       in

     

       20
       20
        
       rustPlatform.buildRustPackage rec {

     

       21
       21
        
         pname = "npins";

     

       22
       22
       -
         version = "0.3.0";

     

       22
       22
       +
         version = "0.3.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "andir";

     

       26
       26
        
           repo = "npins";

     

       27
       27
        
           tag = version;

     

       28
       28
       -
           sha256 = "sha256-nTm6IqCHNFQLU7WR7dJRP7ktBctpE/O2LHbUV25roJA=";

     

       28
       28
       +
           sha256 = "sha256-PPk9Ve1pM3X7NfGeGb8Jiq4YDEwAjErP4xzGwLaakTU=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         useFetchCargoVendor = true;

     

       32
       32
       -
         cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0=";

     

       32
       32
       +
         cargoHash = "sha256-YRW2TqbctuGC2M6euR4bb0m9a19m8WQVvWucRMpzkQE=";

     

       33
       33
       +
         buildNoDefaultFeatures = true;

     

       34
       34
       +
         buildFeatures = [

     

       35
       35
       +
           "clap"

     

       36
       36
       +
           "crossterm"

     

       37
       37
       +
           "env_logger"

     

       38
       38
       +
         ];

     

       33
       39
        
       

     

       34
       40
        
         nativeBuildInputs = [ makeWrapper ];

     

       35
       41

+1 -7

pkgs/by-name/ol/ollama/package.nix

···

       14
       14
        
         clblast,

     

       15
       15
        
         libdrm,

     

       16
       16
        
         rocmPackages,

     

       17
       17
       -
         rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ],

     

       17
       17
       +
         rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]),

     

       18
       18
        
         cudaPackages,

     

       19
       19
        
         cudaArches ? cudaPackages.cudaFlags.realArches or [ ],

     

       20
       20
        
         autoAddDriverRunpath,

     
···

       136
       136
        
             HIP_PATH = rocmPath;

     

       137
       137
        
             CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include";

     

       138
       138
        
             CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include";

     

       139
       139
       -
           }

     

       140
       140
       -
           // lib.optionalAttrs (enableRocm && (rocmPackages.clr.localGpuTargets or false)) {

     

       141
       141
       -
       

     

       142
       142
       -
             # If rocm CLR is set to build for an exact set of targets reuse that target list,

     

       143
       143
       -
             # otherwise let ollama use its builtin defaults

     

       144
       144
       -
             HIP_ARCHS = lib.concatStringsSep ";" rocmPackages.clr.localGpuTargets;

     

       145
       139
        
           }

     

       146
       140
        
           // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; };

     

       147
       141

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
       10
        
         pname = "panoply";

     

       11
       11
       -
         version = "5.6.0";

     

       11
       11
       +
         version = "5.6.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";

     

       15
       15
       -
           hash = "sha256-DEcD8ol1DaGMej5/TGHz7Otj/V2bXkP8uqK992FeqqY=";

     

       15
       15
       +
           hash = "sha256-r3hKlBRpZe9HJws24cqoiiQmFlH6Abn++w5yEudgKfI=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ makeWrapper ];

+5 -8

pkgs/by-name/pd/pdal/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
       +
         ctestCheckHook,

     

       5
       6
        
         fetchFromGitHub,

     

       6
       7
        
         testers,

     

       7
       8
        
       

     
···

       92
       93
        
         ];

     

       93
       94
        
       

     

       94
       95
        
         doCheck = true;

     

       96
       96
       +
         # tests are flaky and they seem to fail less often when they don't run in

     

       97
       97
       +
         # parallel

     

       98
       98
       +
         enableParallelChecking = false;

     

       95
       99
        
       

     

       96
       100
        
         disabledTests = [

     

       97
       101
        
           # Tests failing due to TileDB library implementation, disabled also

     
···

       116
       120
        
       

     

       117
       121
        
         nativeCheckInputs = [

     

       118
       122
        
           gdal # gdalinfo

     

       123
       123
       +
           ctestCheckHook

     

       119
       124
        
         ];

     

       120
       120
       -
       

     

       121
       121
       -
         checkPhase = ''

     

       122
       122
       -
           runHook preCheck

     

       123
       123
       -
           # tests are flaky and they seem to fail less often when they don't run in

     

       124
       124
       -
           # parallel

     

       125
       125
       -
           ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'

     

       126
       126
       -
           runHook postCheck

     

       127
       127
       -
         '';

     

       128
       125
        
       

     

       129
       126
        
         postInstall = ''

     

       130
       127
        
           patchShebangs --update --build $out/bin/pdal-config

+3 -3

pkgs/by-name/pr/pr-tracker/package.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "pr-tracker";

     

       12
       12
       -
         version = "1.6.0";

     

       12
       12
       +
         version = "1.7.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchzip {

     

       15
       15
        
           url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";

     

       16
       16
       -
           hash = "sha256-O+dtGxVhn3hW+vFQzEt7kQRTnZgc1R938BJ6pAkIW4E=";

     

       16
       16
       +
           hash = "sha256-l+bji9uJp8n4//wbbbu8vd3rDICr/XEpDs1ukHxQMcA=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         useFetchCargoVendor = true;

     

       20
       20
       -
         cargoHash = "sha256-4RCgu6t8qbOfTpl3rX35f/fqyMWGBbsnw1TYhhLnxZ4=";

     

       20
       20
       +
         cargoHash = "sha256-D8O1lFoTJOQmFsjql4qIZqA5+iCnESydDDBJiDpBnzs=";

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ pkg-config ];

     

       23
       23
        
         buildInputs = [

+3 -3

pkgs/by-name/su/surrealdb-migrations/package.nix

···

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
        
         pname = "surrealdb-migrations";

     

       12
       12
       -
         version = "2.2.1";

     

       12
       12
       +
         version = "2.2.2";

     

       13
       13
        
       in

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         inherit pname version;

     
···

       18
       18
        
           owner = "Odonno";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           hash = "sha256-MeHNBtzl2bNJFGKtM1o9mGnX0vbmnpUPc18ecqG6J+8=";

     

       21
       21
       +
           hash = "sha256-PLCnfkjmmp7Xx6sF9u15X52JB3x8135xjBr8yYkqYhQ=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         useFetchCargoVendor = true;

     

       25
       25
       -
         cargoHash = "sha256-l59RbKohfPsAp/70UaT/bhy5Z4orVf7fuJgU+0fuyk4=";

     

       25
       25
       +
         cargoHash = "sha256-x0S9hHvHlQNelX2QR/4ApwZxgdzjGWnyDxNUrQvyTH0=";

     

       26
       26
        
       

     

       27
       27
        
         # Error: No such file or directory (os error 2)

     

       28
       28
        
         # failures:

+2 -2

pkgs/by-name/sw/swiftformat/package.nix

···

       12
       12
        
       

     

       13
       13
        
       swift.stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "swiftformat";

     

       15
       15
       -
         version = "0.55.5";

     

       15
       15
       +
         version = "0.55.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "nicklockwood";

     

       19
       19
        
           repo = "SwiftFormat";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-AZAQSwmGNHN6ykh9ufeQLC1dEXvTt32X24MPTDh6bI8=";

     

       21
       21
       +
           sha256 = "sha256-zp7wx2PL0WSgjfWu5GSLfYb8BaTmCoF+Or6prZ4TSC4=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+5 -5

pkgs/by-name/ta/tailwindcss_4/package.nix

···

       7
       7
        
         makeWrapper,

     

       8
       8
        
       }:

     

       9
       9
        
       let

     

       10
       10
       -
         version = "4.1.5";

     

       10
       10
       +
         version = "4.1.6";

     

       11
       11
        
         inherit (stdenv.hostPlatform) system;

     

       12
       12
        
         throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";

     

       13
       13
        
       

     
···

       22
       22
        
       

     

       23
       23
        
         hash =

     

       24
       24
        
           {

     

       25
       25
       -
             aarch64-darwin = "sha256-j9ogIXTCFNcg6v5J7bra+u18udASidJEYtktLCYDeH4=";

     

       26
       26
       -
             aarch64-linux = "sha256-lVXGQUYXwVzIIGeexlQEr5JQfnt3GP0DXSbfBVVh3sk=";

     

       27
       27
       -
             x86_64-darwin = "sha256-W7BvnlCSuLx9r0mcdrDOx1GgP+xS4BEdI1wTHNnFyQU=";

     

       28
       28
       -
             x86_64-linux = "sha256-nSWKd4bCL4VyrqIO01hI+MvvHQYnfk5rl62FYf/CHgc=";

     

       25
       25
       +
             aarch64-darwin = "sha256-vy5DrFSVROGpP4uvS32PtfSBWJbF/vpzE9L0/drOxLc=";

     

       26
       26
       +
             aarch64-linux = "sha256-BPkJ72DfdGdV9ajPO61hoNkhzCfmzZRt1A/sSKcbAok=";

     

       27
       27
       +
             x86_64-darwin = "sha256-PteOE9PWEtn7BNoVT/nw6tz4H5jBFyzOZmZGDxfaGVE=";

     

       28
       28
       +
             x86_64-linux = "sha256-BuaYnp+lBuNbzl3MMVo9xm2n+WJzQ3tb8UsPhgAhRlM=";

     

       29
       29
        
           }

     

       30
       30
        
           .${system} or throwSystem;

     

       31
       31
        
       in

+21 -14

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

···

       4
       4
        
         fetchurl,

     

       5
       5
        
         perl,

     

       6
       6
        
         gettext,

     

       7
       7
       +
         versionCheckHook,

     

       7
       8
        
         buildPackages,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       11
       12
        
         pname = "texi2html";

     

       12
       13
        
         version = "5.0";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchurl {

     

       15
       15
       -
           url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2";

     

       16
       16
       -
           sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8";

     

       16
       16
       +
           url = "mirror://savannah/texi2html/texi2html-${finalAttrs.version}.tar.bz2";

     

       17
       17
       +
           hash = "sha256-6KmLDuIMSVpquJQ5igZe9YAnLb1aFbGxnovRvInZ+fo=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         strictDeps = true;

     

       20
       21
        
       

     

       21
       22
        
         nativeBuildInputs = [

     

       23
       23
       +
           perl

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildInputs = [

     

       22
       27
        
           gettext

     

       23
       28
        
           perl

     

       24
       29
        
         ];

     

       25
       25
       -
         buildInputs = [ perl ];

     

       26
       30
        
       

     

       27
       31
        
         postPatch = ''

     

       28
       28
       -
           patchShebangs separated_to_hash.pl

     

       32
       32
       +
           patchShebangs --build separated_to_hash.pl

     

       29
       33
        
         '';

     

       30
       34
        
       

     

       31
       31
       -
         postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''

     

       32
       32
       -
           for f in $out/bin/*; do

     

       33
       33
       -
             substituteInPlace $f --replace "${buildPackages.perl}" "${perl}"

     

       34
       34
       -
           done

     

       35
       35
       +
         postInstall = ''

     

       36
       36
       +
           patchShebangs --host --update $out/bin/*

     

       35
       37
        
         '';

     

       36
       38
        
       

     

       37
       37
       -
         meta = with lib; {

     

       39
       39
       +
         doInstallCheck = true;

     

       40
       40
       +
         nativeInstallCheckInputs = [

     

       41
       41
       +
           versionCheckHook

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = {

     

       38
       45
        
           description = "Perl script which converts Texinfo source files to HTML output";

     

       39
       46
        
           mainProgram = "texi2html";

     

       40
       47
        
           homepage = "https://www.nongnu.org/texi2html/";

     

       41
       41
       -
           license = licenses.gpl2;

     

       42
       42
       -
           maintainers = [ maintainers.marcweber ];

     

       43
       43
       -
           platforms = platforms.unix;

     

       48
       48
       +
           license = lib.licenses.gpl3Plus;

     

       49
       49
       +
           maintainers = [ lib.maintainers.marcweber ];

     

       50
       50
       +
           platforms = lib.platforms.unix;

     

       44
       51
        
         };

     

       45
       45
       -
       }

     

       52
       52
       +
       })

+38

pkgs/by-name/tu/tusd/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         nixosTests,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildGoModule rec {

     

       9
       9
       +
         pname = "tusd";

     

       10
       10
       +
         version = "2.8.0";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "tus";

     

       14
       14
       +
           repo = "tusd";

     

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

     

       16
       16
       +
           hash = "sha256-OzXBeLDjaJk4NVgsauR/NUATh7qHbuEfWNdhytZmd0A=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         vendorHash = "sha256-YununGyB72zE0tmqO3BREJeMTjCuy/1fhPHC5r8OLjg=";

     

       20
       20
       +
       

     

       21
       21
       +
         # Tests need the path to the binary:

     

       22
       22
       +
         # https://github.com/tus/tusd/blob/0e52ad650abed02ec961353bb0c3c8bc36650d2c/internal/e2e/e2e_test.go#L37

     

       23
       23
       +
         preCheck = ''

     

       24
       24
       +
           export TUSD_BINARY=$PWD/../go/bin/tusd

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         passthru.tests.tusd = nixosTests.tusd;

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       30
       30
       +
           description = "Reference server implementation in Go of tus: the open protocol for resumable file uploads";

     

       31
       31
       +
           license = lib.licenses.mit;

     

       32
       32
       +
           homepage = "https://tus.io/";

     

       33
       33
       +
           maintainers = with lib.maintainers; [

     

       34
       34
       +
             nh2

     

       35
       35
       +
             kalbasit

     

       36
       36
       +
           ];

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+2 -2

pkgs/by-name/wa/wakatime-cli/package.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "wakatime-cli";

     

       13
       13
       -
         version = "1.115.1";

     

       13
       13
       +
         version = "1.115.2";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "wakatime";

     

       17
       17
        
           repo = "wakatime-cli";

     

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

     

       19
       19
       -
           hash = "sha256-vvJzYUL9lGPxe2XzeooDJ09jT3/Zv5x8rf6T7Byb7TY=";

     

       19
       19
       +
           hash = "sha256-8Vgbm7yOb33hVwPNyl1x8egAJKiWvBo4ldp8bkUbd9A=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         vendorHash = "sha256-1yqpz3DqWHXw3ihh7YAKtl5Co91VAbBMRu68S/igrMc=";

+3 -3

pkgs/by-name/wl/wlinhibit/package.nix

···

       11
       11
        
       }:

     

       12
       12
        
       stdenv.mkDerivation {

     

       13
       13
        
         pname = "wlinhibit";

     

       14
       14
       -
         version = "0.1.1";

     

       14
       14
       +
         version = "0.1.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "0x5a4";

     

       18
       18
        
           repo = "wlinhibit";

     

       19
       19
       -
           rev = "v0.1.1";

     

       20
       20
       -
           hash = "sha256-YQHJ9sLHSV8GJP7IpRzmtDbeB86y/a48mLcYy4iDciw=";

     

       19
       19
       +
           rev = "v0.1.2";

     

       20
       20
       +
           hash = "sha256-mAEBnlIfW1R5+3CMH4ZumQ39Ss2K7PfW28I4/O9saWE=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

+2 -2

pkgs/development/interpreters/erlang/26.nix

···

       1
       1
        
       { mkDerivation }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation {

     

       4
       4
       -
         version = "26.2.5.11";

     

       5
       5
       -
         sha256 = "sha256-tAoI2LyipYLDvXKbn9pZd5RBaePHuF/ymppV4//ejLQ=";

     

       4
       4
       +
         version = "26.2.5.12";

     

       5
       5
       +
         sha256 = "sha256-q7rG83ioR0/bnAEzJZx5S17pQ91nE8R5+odHPVXngAI=";

     

       6
       6
        
       }

+2 -2

pkgs/development/interpreters/erlang/27.nix

···

       1
       1
        
       { mkDerivation }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation {

     

       4
       4
       -
         version = "27.3.3";

     

       5
       5
       -
         sha256 = "sha256-OTCCfVeJADxKlmgk8rRE3uzY8Y9qYwY/ubiopWG/0ao=";

     

       4
       4
       +
         version = "27.3.4";

     

       5
       5
       +
         sha256 = "sha256-RZiN17k5fSIQUYxOoAts5iy/obgoPM0RFB5YXAfkTSk=";

     

       6
       6
        
       }

+2 -2

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

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "aioautomower";

     

       23
       23
       -
         version = "2025.3.2";

     

       23
       23
       +
         version = "2025.5.1";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.11";

     
···

       29
       29
        
           owner = "Thomas55555";

     

       30
       30
        
           repo = "aioautomower";

     

       31
       31
        
           tag = version;

     

       32
       32
       -
           hash = "sha256-Gza71hJelomKVnBFxhN6WCppwmzcgUAnROYKn/znoEs=";

     

       32
       32
       +
           hash = "sha256-Fia08yBmixR47WZMuNbBg+u8CyHG8lumfWJeB/EKd78=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         postPatch = ''

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "aiocomelit";

     

       16
       16
       -
         version = "0.11.3";

     

       16
       16
       +
         version = "0.12.0";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.12";

     
···

       22
       22
        
           owner = "chemelli74";

     

       23
       23
        
           repo = "aiocomelit";

     

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

     

       25
       25
       -
           hash = "sha256-Hl5yUEtBFfx+p2WQssI7M+TgEiO5VvgIdWoFZMCjCUY=";

     

       25
       25
       +
           hash = "sha256-zowXj2Aq2BK/UPJ8xT6eS0/V2vSKp+v6xRLSRMyDPvE=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];

+2 -2

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

···

       26
       26
        
       

     

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         pname = "aioesphomeapi";

     

       29
       29
       -
         version = "30.0.1";

     

       29
       29
       +
         version = "30.2.0";

     

       30
       30
        
         pyproject = true;

     

       31
       31
        
       

     

       32
       32
        
         disabled = pythonOlder "3.9";

     
···

       35
       35
        
           owner = "esphome";

     

       36
       36
        
           repo = "aioesphomeapi";

     

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

     

       38
       38
       -
           hash = "sha256-15PIjqglLu4vARbUUL/OVdRcSJWfOFIKqIa2ugpNbUw=";

     

       38
       38
       +
           hash = "sha256-2mH1+/58DSWYWl/mTBsCp6r77OUNWV5rR+4mnbKV9PE=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [

+4 -9

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "aiohasupervisor";

     

       20
       20
       -
         version = "0.3.0";

     

       20
       20
       +
         version = "0.3.1";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.12";

     
···

       26
       26
        
           owner = "home-assistant-libs";

     

       27
       27
        
           repo = "python-supervisor-client";

     

       28
       28
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-72YRaTlgRJ8liQ1q+Hx1iCG8Av7wWk61t306fYT9gss=";

     

       29
       29
       +
           hash = "sha256-CrcLyG8fpThYHFHH2w+UAlGxuqwpUCWsYUx2gaW9RLw=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

     

       33
       33
        
           substituteInPlace pyproject.toml \

     

       34
       34
       -
             --replace-fail 'version = "0.0.0"' 'version = "${version}"' \

     

       35
       35
       -
             --replace-fail "setuptools~=68.0.0" "setuptools>=68.0.0" \

     

       36
       36
       -
             --replace-fail "wheel~=0.40.0" "wheel>=0.40.0"

     

       34
       34
       +
             --replace-fail 'version = "0.0.0"' 'version = "${version}"'

     

       37
       35
        
         '';

     

       38
       36
        
       

     

       39
       37
        
         build-system = [ setuptools ];

     
···

       53
       51
        
           pytestCheckHook

     

       54
       52
        
         ];

     

       55
       53
        
       

     

       56
       56
       -
         # Import issue, check with next release

     

       57
       57
       -
         doCheck = false;

     

       58
       58
       -
       

     

       59
       54
        
         pythonImportsCheck = [ "aiohasupervisor" ];

     

       60
       55
        
       

     

       61
       56
        
         meta = {

     

       62
       62
       -
           changelog = "https://github.com/home-assistant-libs/python-supervisor-client/releases/tag/${src.tag}";

     

       63
       57
        
           description = "Client for Home Assistant Supervisor";

     

       64
       58
        
           homepage = "https://github.com/home-assistant-libs/python-supervisor-client";

     

       59
       59
       +
           changelog = "https://github.com/home-assistant-libs/python-supervisor-client/releases/tag/${src.tag}";

     

       65
       60
        
           license = lib.licenses.asl20;

     

       66
       61
        
           maintainers = with lib.maintainers; [ fab ];

     

       67
       62
        
         };

+52

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

···

       1
       1
       +
       {

     

       2
       2
       +
         aiohttp,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         lib,

     

       6
       6
       +
         pyjwt,

     

       7
       7
       +
         pytest-asyncio,

     

       8
       8
       +
         pytest-cov-stub,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         pythonOlder,

     

       11
       11
       +
         setuptools,

     

       12
       12
       +
         syrupy,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "aiokem";

     

       17
       17
       +
         version = "0.5.10";

     

       18
       18
       +
         pyproject = true;

     

       19
       19
       +
       

     

       20
       20
       +
         disabled = pythonOlder "3.12";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "kohlerlibs";

     

       24
       24
       +
           repo = "aiokem";

     

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

     

       26
       26
       +
           hash = "sha256-C9px2Gooh6Ob3rGGhKtRdScuA+PCU93xDvOjk7+q3e8=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         build-system = [ setuptools ];

     

       30
       30
       +
       

     

       31
       31
       +
         dependencies = [

     

       32
       32
       +
           aiohttp

     

       33
       33
       +
           pyjwt

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         pythonImportsCheck = [ "aiokem" ];

     

       37
       37
       +
       

     

       38
       38
       +
         nativeCheckInputs = [

     

       39
       39
       +
           pytest-asyncio

     

       40
       40
       +
           pytest-cov-stub

     

       41
       41
       +
           pytestCheckHook

     

       42
       42
       +
           syrupy

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           changelog = "https://github.com/kohlerlibs/aiokem/blob/${src.tag}/CHANGELOG.md";

     

       47
       47
       +
           description = "Async API for Kohler Energy Management";

     

       48
       48
       +
           homepage = "https://github.com/kohlerlibs/aiokem";

     

       49
       49
       +
           license = lib.licenses.mit;

     

       50
       50
       +
           maintainers = with lib.maintainers; [ dotlambda ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "aioshelly";

     

       19
       19
       -
         version = "13.5.0";

     

       19
       19
       +
         version = "13.6.0";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.11";

     
···

       25
       25
        
           owner = "home-assistant-libs";

     

       26
       26
        
           repo = "aioshelly";

     

       27
       27
        
           tag = version;

     

       28
       28
       -
           hash = "sha256-oqmX7x6GNZRMTnmUXG1ptDoXT+A4tB+wDM2pds/kRcY=";

     

       28
       28
       +
           hash = "sha256-cJKo/UITcvpGbrtOqXLReWghEXL0AKFve1s6Ncde0gc=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ setuptools ];

+4 -4

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "aiovodafone";

     

       15
       15
       -
         version = "0.9.0";

     

       15
       15
       +
         version = "0.11.0";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
       -
         disabled = pythonOlder "3.11";

     

       18
       18
       +
         disabled = pythonOlder "3.12";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "chemelli74";

     

       22
       22
        
           repo = "aiovodafone";

     

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

     

       24
       24
       -
           hash = "sha256-3WafrcJH9pD1u0FEJzYaVWLWb2Ur1sCHYHFON4DXLpo=";

     

       24
       24
       +
           hash = "sha256-/H3v5ZRAaWWouow82nr/+TOuL+IX6Ez+Mjk/C120MWM=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         build-system = [ poetry-core ];

     
···

       41
       41
        
         meta = with lib; {

     

       42
       42
        
           description = "Library to control Vodafon Station";

     

       43
       43
        
           homepage = "https://github.com/chemelli74/aiovodafone";

     

       44
       44
       -
           changelog = "https://github.com/chemelli74/aiovodafone/blob/v${version}/CHANGELOG.md";

     

       44
       44
       +
           changelog = "https://github.com/chemelli74/aiovodafone/blob/${src.tag}/CHANGELOG.md";

     

       45
       45
        
           license = licenses.asl20;

     

       46
       46
        
           maintainers = with maintainers; [ fab ];

     

       47
       47
        
         };

+3 -3

pkgs/development/python-modules/apsystems-ez1/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "apsystems-ez1";

     

       13
       13
       -
         version = "2.4.0";

     

       13
       13
       +
         version = "2.6.0";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "SonnenladenGmbH";

     

       18
       18
        
           repo = "APsystems-EZ1-API";

     

       19
       19
        
           tag = version;

     

       20
       20
       -
           hash = "sha256-H4vhF4CgZmKmBF+v6SpnpIOlPBkFLL50W+Ua+gDr/7I=";

     

       20
       20
       +
           hash = "sha256-/dseMzi92qlual+L6v6Cl5Xd4U9c7SPdclmTSQTVor0=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         build-system = [ poetry-core ];

     
···

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         meta = {

     

       35
       35
       -
           changelog = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/${version}";

     

       35
       35
       +
           changelog = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/${src.tag}";

     

       36
       36
        
           description = "Streamlined interface for interacting with the local API of APsystems EZ1 Microinverters.";

     

       37
       37
        
           homepage = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API";

     

       38
       38
        
           license = lib.licenses.mit;

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "bellows";

     

       19
       19
       -
         version = "0.44.1";

     

       19
       19
       +
         version = "0.45.0";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "zigpy";

     

       24
       24
        
           repo = "bellows";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-LxwKS4jh/ehYGxhU4lpmzXBWGacLtjq6c/lhBybLaRE=";

     

       26
       26
       +
           hash = "sha256-wIi6LXfo1ykNT9DMmlRORspiWnBzJUAn6kA/t4rdTpY=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/bleak-esphome/default.nix

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "bleak-esphome";

     

       22
       22
       -
         version = "2.13.1";

     

       22
       22
       +
         version = "2.15.1";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "bluetooth-devices";

     

       27
       27
        
           repo = "bleak-esphome";

     

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

     

       29
       29
       -
           hash = "sha256-ziUSqIox5tWp64EJ+Hacy1Wbh8NMpH/GUY9TUaN7Y3M=";

     

       29
       29
       +
           hash = "sha256-Q+W7i0+Qsm1wfVNC+ub9J9DOcP7D4gZkjw3j37aHhYc=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

+3 -3

pkgs/development/python-modules/bluemaestro-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "bluemaestro-ble";

     

       16
       16
       -
         version = "0.2.3";

     

       16
       16
       +
         version = "0.4.1";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
       -
         disabled = pythonOlder "3.9";

     

       19
       19
       +
         disabled = pythonOlder "3.11";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "Bluetooth-Devices";

     

       23
       23
        
           repo = "bluemaestro-ble";

     

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

     

       25
       25
       -
           hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY=";

     

       25
       25
       +
           hash = "sha256-44HUcp8CKQMcaIMKsi3AXdCJlIUGvRrVd2JxGeh1498=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/bluetooth-auto-recovery/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "bluetooth-auto-recovery";

     

       19
       19
       -
         version = "1.4.5";

     

       19
       19
       +
         version = "1.5.1";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.9";

     
···

       25
       25
        
           owner = "Bluetooth-Devices";

     

       26
       26
        
           repo = "bluetooth-auto-recovery";

     

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

     

       28
       28
       -
           hash = "sha256-yh0Gf8veT5VCk05Y7QyxoCz0NHnVRj8HJLTbnvi+9C8=";

     

       28
       28
       +
           hash = "sha256-p8xuYmU0gXQYnPdTzzJTyQTYuShzPa/twD8r5HNEsN4=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/bluetooth-data-tools/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "bluetooth-data-tools";

     

       18
       18
       -
         version = "1.26.5";

     

       18
       18
       +
         version = "1.28.1";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.10";

     
···

       24
       24
        
           owner = "Bluetooth-Devices";

     

       25
       25
        
           repo = "bluetooth-data-tools";

     

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

     

       27
       27
       -
           hash = "sha256-uuPr/Dfpd4PAU8ub16uocSH9hqWWAz7RUDRp4jWTctE=";

     

       27
       27
       +
           hash = "sha256-citrK/PkWrFB62+xTZFPwr/se5Kiz30qzAMVYROYnS8=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         # The project can build both an optimized cython version and an unoptimized

+3 -3

pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "bluetooth-sensor-state-data";

     

       15
       15
       -
         version = "1.7.5";

     

       15
       15
       +
         version = "1.8.0";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
       -
         disabled = pythonOlder "3.9";

     

       18
       18
       +
         disabled = pythonOlder "3.11";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "Bluetooth-Devices";

     

       22
       22
        
           repo = "bluetooth-sensor-state-data";

     

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

     

       24
       24
       -
           hash = "sha256-W+gU9YlxoCh5zRht44Ovq3Doms8UtCvUNLlSUpzsQwA=";

     

       24
       24
       +
           hash = "sha256-XWSdPFhoCuIkQR/tXDhEFUsxpoDoiebI73MqRjtAvFo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         build-system = [ poetry-core ];

+3 -3

pkgs/development/python-modules/deebot-client/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "deebot-client";

     

       23
       23
       -
         version = "12.5.0";

     

       23
       23
       +
         version = "13.1.0";

     

       24
       24
        
         pyproject = true;

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.13";

     
···

       29
       29
        
           owner = "DeebotUniverse";

     

       30
       30
        
           repo = "client.py";

     

       31
       31
        
           tag = version;

     

       32
       32
       -
           hash = "sha256-+Tc4YZucd1P7g2jD2iQzYurQ7hjcUQyst8SUgXTtUsg=";

     

       32
       32
       +
           hash = "sha256-EIhefThzHC9hpI4bGkTu+TskdzajI7cc90DhrfDlbcs=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       36
       36
        
           inherit pname version src;

     

       37
       37
       -
           hash = "sha256-dxq/3TYqMm4ckE0En3iskt0OL71XN0bc9VsFUuaefp8=";

     

       37
       37
       +
           hash = "sha256-WYWrfNigmu18yEa2QstJ5RfjLWS/Tckem48j8JK2NHk=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         pythonRelaxDeps = [

+28 -10

pkgs/development/python-modules/devolo-home-control-api/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         pytest-freezer,

     

       5
       6
        
         pytest-mock,

     

       6
       7
        
         pytestCheckHook,

     

       8
       8
       +
         python-dateutil,

     

       7
       9
        
         pythonOlder,

     

       8
       10
        
         requests,

     

       11
       11
       +
         requests-mock,

     

       9
       12
        
         setuptools-scm,

     

       13
       13
       +
         setuptools,

     

       14
       14
       +
         syrupy,

     

       10
       15
        
         websocket-client,

     

       11
       16
        
         zeroconf,

     

       12
       17
        
       }:

     

       13
       18
        
       

     

       14
       19
        
       buildPythonPackage rec {

     

       15
       20
        
         pname = "devolo-home-control-api";

     

       16
       16
       -
         version = "0.18.3";

     

       17
       17
       -
         format = "setuptools";

     

       18
       18
       -
         disabled = pythonOlder "3.6";

     

       21
       21
       +
         version = "0.19.0";

     

       22
       22
       +
         pyproject = true;

     

       23
       23
       +
       

     

       24
       24
       +
         disabled = pythonOlder "3.12";

     

       19
       25
        
       

     

       20
       26
        
         src = fetchFromGitHub {

     

       21
       27
        
           owner = "2Fake";

     

       22
       28
        
           repo = "devolo_home_control_api";

     

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

     

       24
       24
       -
           hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM=";

     

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

     

       30
       30
       +
           hash = "sha256-eBJ6hdxUplc1poh7WFACWkyfReSdRSyCEoq2A6Sudgg=";

     

       25
       31
        
         };

     

       26
       32
        
       

     

       27
       27
       -
         nativeBuildInputs = [ setuptools-scm ];

     

       33
       33
       +
         build-system = [

     

       34
       34
       +
           setuptools

     

       35
       35
       +
           setuptools-scm

     

       36
       36
       +
         ];

     

       28
       37
        
       

     

       29
       29
       -
         propagatedBuildInputs = [

     

       38
       38
       +
         dependencies = [

     

       39
       39
       +
           python-dateutil

     

       30
       40
        
           requests

     

       31
       41
        
           zeroconf

     

       32
       42
        
           websocket-client

     

       33
       43
        
         ];

     

       34
       44
        
       

     

       35
       45
        
         nativeCheckInputs = [

     

       46
       46
       +
           pytest-freezer

     

       47
       47
       +
           pytest-mock

     

       36
       48
        
           pytestCheckHook

     

       37
       37
       -
           pytest-mock

     

       49
       49
       +
           requests-mock

     

       50
       50
       +
           syrupy

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         pytestFlags = [

     

       54
       54
       +
           "--snapshot-update"

     

       38
       55
        
         ];

     

       39
       56
        
       

     

       40
       40
       -
         # Disable test that requires network access

     

       41
       57
        
         disabledTests = [

     

       58
       58
       +
           # Disable test that requires network access

     

       42
       59
        
           "test__on_pong"

     

       43
       60
        
           "TestMprm"

     

       44
       61
        
         ];

     
···

       48
       65
        
         meta = with lib; {

     

       49
       66
        
           description = "Python library to work with devolo Home Control";

     

       50
       67
        
           homepage = "https://github.com/2Fake/devolo_home_control_api";

     

       51
       51
       -
           license = with licenses; [ gpl3Only ];

     

       68
       68
       +
           changelog = "https://github.com/2Fake/devolo_home_control_api/blob/${src.tag}/docs/CHANGELOG.md";

     

       69
       69
       +
           license = licenses.gpl3Only;

     

       52
       70
        
           maintainers = with maintainers; [ fab ];

     

       53
       71
        
         };

     

       54
       72
        
       }

pkgs/development/python-modules/firebase-messaging/default.nix

···

       51
       51
        
       

     

       52
       52
        
         pythonRelaxDeps = [

     

       53
       53
        
           "http-ece"

     

       54
       54
       +
           "protobuf"

     

       54
       55
        
         ];

     

       55
       56
        
       

     

       56
       57
        
         dependencies = [

+5 -1

pkgs/development/python-modules/ghome-foyer-api/default.nix

···

       25
       25
        
           hatch-vcs

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         propagatedBuildInputs = [

     

       28
       28
       +
         dependencies = [

     

       29
       29
        
           grpcio

     

       30
       30
        
           protobuf

     

       31
       31
        
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         doCheck = false; # no tests

     

       34
       34
       +
       

     

       35
       35
       +
         pythonRelaxDeps = [ "protobuf" ];

     

       32
       36
        
       

     

       33
       37
        
         meta = {

     

       34
       38
        
           description = "Generated Python protobuf stubs for Google Home internal API";

+49

pkgs/development/python-modules/google-geo-type/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildPythonPackage,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         google-api-core,

     

       5
       5
       +
         google-auth,

     

       6
       6
       +
         lib,

     

       7
       7
       +
         proto-plus,

     

       8
       8
       +
         protobuf,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         setuptools,

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "google-geo-type";

     

       15
       15
       +
         version = "0.3.12";

     

       16
       16
       +
         pyproject = true;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "googleapis";

     

       20
       20
       +
           repo = "google-cloud-python";

     

       21
       21
       +
           tag = "google-geo-type-v${version}";

     

       22
       22
       +
           hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         sourceRoot = "${src.name}/packages/google-geo-type";

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [ setuptools ];

     

       28
       28
       +
       

     

       29
       29
       +
         dependencies = [

     

       30
       30
       +
           google-api-core

     

       31
       31
       +
           google-auth

     

       32
       32
       +
           proto-plus

     

       33
       33
       +
           protobuf

     

       34
       34
       +
         ] ++ google-api-core.optional-dependencies.grpc;

     

       35
       35
       +
       

     

       36
       36
       +
         pythonImportsCheck = [ "google.geo.type" ];

     

       37
       37
       +
       

     

       38
       38
       +
         nativeCheckInputs = [

     

       39
       39
       +
           pytestCheckHook

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         meta = {

     

       43
       43
       +
           changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-geo-type/CHANGELOG.md";

     

       44
       44
       +
           description = "Google Geo Type API client library";

     

       45
       45
       +
           homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-geo-type";

     

       46
       46
       +
           license = lib.licenses.asl20;

     

       47
       47
       +
           maintainers = with lib.maintainers; [ dotlambda ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+53

pkgs/development/python-modules/google-maps-routing/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildPythonPackage,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         google-api-core,

     

       5
       5
       +
         google-auth,

     

       6
       6
       +
         google-geo-type,

     

       7
       7
       +
         lib,

     

       8
       8
       +
         proto-plus,

     

       9
       9
       +
         protobuf,

     

       10
       10
       +
         pytest-asyncio,

     

       11
       11
       +
         pytestCheckHook,

     

       12
       12
       +
         setuptools,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "google-maps-routing";

     

       17
       17
       +
         version = "0.6.15";

     

       18
       18
       +
         pyproject = true;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "googleapis";

     

       22
       22
       +
           repo = "google-cloud-python";

     

       23
       23
       +
           tag = "google-maps-routing-v${version}";

     

       24
       24
       +
           hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         sourceRoot = "${src.name}/packages/google-maps-routing";

     

       28
       28
       +
       

     

       29
       29
       +
         build-system = [ setuptools ];

     

       30
       30
       +
       

     

       31
       31
       +
         dependencies = [

     

       32
       32
       +
           google-api-core

     

       33
       33
       +
           google-auth

     

       34
       34
       +
           proto-plus

     

       35
       35
       +
           protobuf

     

       36
       36
       +
           google-geo-type

     

       37
       37
       +
         ] ++ google-api-core.optional-dependencies.grpc;

     

       38
       38
       +
       

     

       39
       39
       +
         pythonImportsCheck = [ "google.maps.routing_v2" ];

     

       40
       40
       +
       

     

       41
       41
       +
         nativeCheckInputs = [

     

       42
       42
       +
           pytest-asyncio

     

       43
       43
       +
           pytestCheckHook

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         meta = {

     

       47
       47
       +
           changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-maps-routing/CHANGELOG.md";

     

       48
       48
       +
           description = "Google Maps Routing API client library";

     

       49
       49
       +
           homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-routing";

     

       50
       50
       +
           license = lib.licenses.asl20;

     

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

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+2 -2

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "habluetooth";

     

       24
       24
       -
         version = "3.38.0";

     

       24
       24
       +
         version = "3.48.2";

     

       25
       25
        
         pyproject = true;

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.11";

     
···

       30
       30
        
           owner = "Bluetooth-Devices";

     

       31
       31
        
           repo = "habluetooth";

     

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

     

       33
       33
       -
           hash = "sha256-eqsWm5g/D94NgoBbfh3uudcUOs4aekg4nHw2fODtTOA=";

     

       33
       33
       +
           hash = "sha256-zhvsw8b4IkD0hB0Mhn/AKEYhFyPbOMbouEbpHbwNTo8=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         build-system = [

+2 -2

pkgs/development/python-modules/hass-nabucasa/default.nix

···

       23
       23
        
       

     

       24
       24
        
       buildPythonPackage rec {

     

       25
       25
        
         pname = "hass-nabucasa";

     

       26
       26
       -
         version = "0.95.0";

     

       26
       26
       +
         version = "0.96.0";

     

       27
       27
        
         pyproject = true;

     

       28
       28
        
       

     

       29
       29
        
         disabled = pythonOlder "3.13";

     
···

       32
       32
        
           owner = "nabucasa";

     

       33
       33
        
           repo = "hass-nabucasa";

     

       34
       34
        
           tag = version;

     

       35
       35
       -
           hash = "sha256-KSGEgMgZ0fHot7hfT0sDl/4aZOsWT8CE+R5ebCqhLAA=";

     

       35
       35
       +
           hash = "sha256-U6rxX1VgSpOkmd/kyf2thYF/0TtsguWbVxXaeuq/wvs=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         pythonRelaxDeps = [ "acme" ];

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "hdate";

     

       17
       17
       -
         version = "1.0.3";

     

       17
       17
       +
         version = "1.1.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "py-libhdate";

     

       22
       22
        
           repo = "py-libhdate";

     

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

     

       24
       24
       -
           hash = "sha256-J2ZbfzQdQSlnwcygwapDKkvZIx2VrlaaRe244V8Zt5c=";

     

       24
       24
       +
           hash = "sha256-NNaspGNfrtZqo9sUOJVyYlJT7dhr/nzueuaqewUMlpM=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         pythonRelaxDeps = [

+10

pkgs/development/python-modules/home-assistant-bluetooth/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         pythonOlder,

     

       6
       7
        
       

     

       7
       8
        
         # build-system

     
···

       30
       31
        
           tag = "v${version}";

     

       31
       32
        
           hash = "sha256-piX812Uzd2F8A8+IF/17N+xy6ENpfRVJ1BxsAxL5aj0=";

     

       32
       33
        
         };

     

       34
       34
       +
       

     

       35
       35
       +
         patches = [

     

       36
       36
       +
           (fetchpatch {

     

       37
       37
       +
             name = "fix-tests-with-habluetooth-3.42.0.patch";

     

       38
       38
       +
             url = "https://github.com/home-assistant-libs/home-assistant-bluetooth/commit/515516bf9b2577c5d4af25cd2f052023ccb8b108.patch";

     

       39
       39
       +
             includes = [ "tests/test_models.py" ];

     

       40
       40
       +
             hash = "sha256-9t8VRKQSDxSYiy7bFII62B4O5w5Hx9AbRgvzcT6z1BQ=";

     

       41
       41
       +
           })

     

       42
       42
       +
         ];

     

       33
       43
        
       

     

       34
       44
        
         build-system = [

     

       35
       45
        
           poetry-core

+38 -54

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         aenum,

     

       4
       3
        
         aiohttp,

     

       5
       5
       -
         aiohttp-wsgi,

     

       6
       6
       -
         async-timeout,

     

       7
       4
        
         buildPythonPackage,

     

       8
       5
        
         fetchFromGitHub,

     

       9
       9
       -
         pytest7CheckHook,

     

       10
       10
       -
         pythonAtLeast,

     

       11
       11
       -
         pythonOlder,

     

       6
       6
       +
         httpx,

     

       12
       7
        
         pytest-aiohttp,

     

       13
       13
       -
         pytest-asyncio_0_21,

     

       8
       8
       +
         pytest-mock,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         pythonOlder,

     

       14
       11
        
         requests,

     

       12
       12
       +
         setuptools-scm,

     

       15
       13
        
         setuptools,

     

       16
       16
       -
         setuptools-scm,

     

       17
       17
       -
         websocket-client,

     

       18
       14
        
         websockets,

     

       19
       15
        
       }:

     

       20
       16
        
       

     

       21
       17
        
       buildPythonPackage rec {

     

       22
       18
        
         pname = "homematicip";

     

       23
       23
       -
         version = "1.1.7";

     

       19
       19
       +
         version = "2.0.1.1";

     

       24
       20
        
         pyproject = true;

     

       25
       21
        
       

     

       26
       26
       -
         disabled = pythonOlder "3.10";

     

       22
       22
       +
         disabled = pythonOlder "3.12";

     

       27
       23
        
       

     

       28
       24
        
         src = fetchFromGitHub {

     

       29
       25
        
           owner = "hahn-th";

     

       30
       26
        
           repo = "homematicip-rest-api";

     

       31
       27
        
           tag = version;

     

       32
       32
       -
           hash = "sha256-zhpGsmzJrtWgHlVdzIrFGQAt4EBWSWCTLIKyuuhDlPA=";

     

       28
       28
       +
           hash = "sha256-klDyrbIJeAm3C7sCo4Z4OKDvm5+V8mfwYbyS22CKVQU=";

     

       33
       29
        
         };

     

       34
       30
        
       

     

       35
       31
        
         build-system = [

     
···

       38
       34
        
         ];

     

       39
       35
        
       

     

       40
       36
        
         dependencies = [

     

       41
       41
       -
           aenum

     

       42
       37
        
           aiohttp

     

       43
       43
       -
           async-timeout

     

       38
       38
       +
           httpx

     

       44
       39
        
           requests

     

       45
       45
       -
           websocket-client

     

       46
       40
        
           websockets

     

       47
       41
        
         ];

     

       48
       42
        
       

     

       49
       43
        
         nativeCheckInputs = [

     

       50
       50
       -
           aiohttp-wsgi

     

       51
       51
       -
           (pytest-aiohttp.override {

     

       52
       52
       -
             pytest-asyncio = pytest-asyncio_0_21;

     

       53
       53
       -
           })

     

       54
       54
       -
           pytest-asyncio_0_21

     

       55
       55
       -
           pytest7CheckHook

     

       44
       44
       +
           pytest-aiohttp

     

       45
       45
       +
           pytest-mock

     

       46
       46
       +
           pytestCheckHook

     

       56
       47
        
         ];

     

       57
       48
        
       

     

       58
       49
        
         pytestFlagsArray = [ "--asyncio-mode=auto" ];

     

       59
       50
        
       

     

       60
       60
       -
         disabledTests =

     

       61
       61
       -
           [

     

       62
       62
       -
             # Assert issues with datetime

     

       63
       63
       -
             "test_contact_interface_device"

     

       64
       64
       -
             "test_dimmer"

     

       65
       65
       -
             "test_external_device"

     

       66
       66
       -
             "test_heating_failure_alert_group"

     

       67
       67
       -
             "test_heating"

     

       68
       68
       -
             "test_humidity_warning_rule_group"

     

       69
       69
       -
             "test_meta_group"

     

       70
       70
       -
             "test_pluggable_switch_measuring"

     

       71
       71
       -
             "test_rotary_handle_sensor"

     

       72
       72
       -
             "test_security_group"

     

       73
       73
       -
             "test_security_zone"

     

       74
       74
       -
             "test_shutter_device"

     

       75
       75
       -
             "test_smoke_detector"

     

       76
       76
       -
             "test_switching_group"

     

       77
       77
       -
             "test_temperature_humidity_sensor_outdoor"

     

       78
       78
       -
             "test_wall_mounted_thermostat_pro"

     

       79
       79
       -
             "test_weather_sensor"

     

       80
       80
       -
             # Random failures

     

       81
       81
       -
             "test_home_getSecurityJournal"

     

       82
       82
       -
             "test_home_unknown_types"

     

       83
       83
       -
             # Requires network access

     

       84
       84
       -
             "test_websocket"

     

       85
       85
       -
           ]

     

       86
       86
       -
           ++ lib.optionals (pythonAtLeast "3.10") [

     

       87
       87
       -
             "test_connection_lost"

     

       88
       88
       -
             "test_user_disconnect_and_reconnect"

     

       89
       89
       -
             "test_ws_message"

     

       90
       90
       -
             "test_ws_no_pong"

     

       91
       91
       -
           ];

     

       51
       51
       +
         disabledTests = [

     

       52
       52
       +
           # Assert issues with datetime

     

       53
       53
       +
           "test_contact_interface_device"

     

       54
       54
       +
           "test_dimmer"

     

       55
       55
       +
           "test_external_device"

     

       56
       56
       +
           "test_heating_failure_alert_group"

     

       57
       57
       +
           "test_heating"

     

       58
       58
       +
           "test_humidity_warning_rule_group"

     

       59
       59
       +
           "test_meta_group"

     

       60
       60
       +
           "test_pluggable_switch_measuring"

     

       61
       61
       +
           "test_rotary_handle_sensor"

     

       62
       62
       +
           "test_security_group"

     

       63
       63
       +
           "test_security_zone"

     

       64
       64
       +
           "test_shutter_device"

     

       65
       65
       +
           "test_smoke_detector"

     

       66
       66
       +
           "test_switching_group"

     

       67
       67
       +
           "test_temperature_humidity_sensor_outdoor"

     

       68
       68
       +
           "test_wall_mounted_thermostat_pro"

     

       69
       69
       +
           "test_weather_sensor"

     

       70
       70
       +
           # Random failures

     

       71
       71
       +
           "test_home_getSecurityJournal"

     

       72
       72
       +
           "test_home_unknown_types"

     

       73
       73
       +
           # Requires network access

     

       74
       74
       +
           "test_websocket"

     

       75
       75
       +
         ];

     

       92
       76
        
       

     

       93
       77
        
         pythonImportsCheck = [ "homematicip" ];

     

       94
       78
        
       

     

       95
       79
        
         meta = with lib; {

     

       96
       80
        
           description = "Module for the homematicIP REST API";

     

       97
       81
        
           homepage = "https://github.com/hahn-th/homematicip-rest-api";

     

       98
       98
       -
           changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${version}";

     

       82
       82
       +
           changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${src.tag}";

     

       99
       83
        
           license = licenses.gpl3Plus;

     

       100
       84
        
           maintainers = with maintainers; [ fab ];

     

       101
       85
        
         };

+41

pkgs/development/python-modules/imeon-inverter-api/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pdm-pep517,

     

       6
       6
       +
         aiohttp,

     

       7
       7
       +
         async-timeout,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "imeon-inverter-api";

     

       12
       12
       +
         version = "0.3.12";

     

       13
       13
       +
         pyproject = true;

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "Imeon-Inverters-for-Home-Assistant";

     

       17
       17
       +
           repo = "inverter-api";

     

       18
       18
       +
           tag = version;

     

       19
       19
       +
           hash = "sha256-creGva8ZC20yfgjO4XhvXerGuhVnXbshUvoexxjSHFU=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         build-system = [ pdm-pep517 ];

     

       23
       23
       +
       

     

       24
       24
       +
         dependencies = [

     

       25
       25
       +
           aiohttp

     

       26
       26
       +
           async-timeout

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "imeon_inverter_api" ];

     

       30
       30
       +
       

     

       31
       31
       +
         # upstream has no tests

     

       32
       32
       +
         doCheck = false;

     

       33
       33
       +
       

     

       34
       34
       +
         meta = {

     

       35
       35
       +
           changelog = "https://github.com/Imeon-Inverters-for-Home-Assistant/inverter-api/releases/tag/${src.tag}";

     

       36
       36
       +
           description = "Standalone API to collect data from the Imeon Energy Inverters that uses HTTP POST/GET";

     

       37
       37
       +
           homepage = "https://github.com/Imeon-Inverters-for-Home-Assistant/inverter-api";

     

       38
       38
       +
           license = lib.licenses.asl20;

     

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

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+3 -3

pkgs/development/python-modules/inkbird-ble/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "inkbird-ble";

     

       17
       17
       -
         version = "0.10.1";

     

       17
       17
       +
         version = "0.16.1";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
       -
         disabled = pythonOlder "3.9";

     

       20
       20
       +
         disabled = pythonOlder "3.11";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "Bluetooth-Devices";

     

       24
       24
        
           repo = "inkbird-ble";

     

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

     

       26
       26
       -
           hash = "sha256-i6Vr8dl0svMew7uJrWp11EkVFU01uAHkGvUUr1ecfRw=";

     

       26
       26
       +
           hash = "sha256-mSXDSMzBFF2WS+G4VxTzZtKXradxEQyoYR9G/ys+z/M=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/leaone-ble/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "leaone-ble";

     

       17
       17
       -
         version = "0.1.0";

     

       17
       17
       +
         version = "0.3.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.11";

     
···

       23
       23
        
           owner = "bluetooth-devices";

     

       24
       24
        
           repo = "leaone-ble";

     

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

     

       26
       26
       -
           hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg=";

     

       26
       26
       +
           hash = "sha256-96TOjjz4EkHAnzL53BIR+PifkyrEig/0r+mIfnwc0hE=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/midea-local/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "midea-local";

     

       19
       19
       -
         version = "6.1.0";

     

       19
       19
       +
         version = "6.2.0";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "midea-lan";

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           hash = "sha256-N6e6aVjsAOMbUPFAGbVWuQIqXOX/XC9tlvx1P6ZqB8w=";

     

       26
       26
       +
           hash = "sha256-zXOxgPFX6TRdFnQ0OqqEu1sy9MmlfxEg7KedQWxYv48=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ setuptools ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "moddb";

     

       13
       13
       -
         version = "0.9.0";

     

       13
       13
       +
         version = "0.12.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "ClementJ18";

     

       18
       18
        
           repo = "moddb";

     

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

     

       20
       20
       -
           hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8=";

     

       20
       20
       +
           hash = "sha256-idBja/W9r8iX69Af+x2TZcLpSLy45fC9pmrMKJZ0RsA=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

-38

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         paho-mqtt,

     

       6
       6
       -
         pythonOlder,

     

       7
       7
       -
         requests,

     

       8
       8
       -
       }:

     

       9
       9
       -
       

     

       10
       10
       -
       buildPythonPackage rec {

     

       11
       11
       -
         pname = "pyephember";

     

       12
       12
       -
         version = "0.4.1";

     

       13
       13
       -
         format = "setuptools";

     

       14
       14
       -
       

     

       15
       15
       -
         disabled = pythonOlder "3.8";

     

       16
       16
       -
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-/uMpaqgy6YbqBBFuMxAM8PukCD3/TUNN6wcBiihRi3Y=";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         propagatedBuildInputs = [

     

       23
       23
       -
           paho-mqtt

     

       24
       24
       -
           requests

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       27
       -
         # Project has no tests

     

       28
       28
       -
         doCheck = false;

     

       29
       29
       -
       

     

       30
       30
       -
         pythonImportsCheck = [ "pyephember" ];

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       33
       33
       -
           description = "Python client to the EPH Control Systems Ember API";

     

       34
       34
       -
           homepage = "https://github.com/ttroy50/pyephember";

     

       35
       35
       -
           license = licenses.mit;

     

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

     

       37
       37
       -
         };

     

       38
       38
       -
       }

+41

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

···

       1
       1
       +
       {

     

       2
       2
       +
         buildPythonPackage,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         paho-mqtt,

     

       6
       6
       +
         requests,

     

       7
       7
       +
         setuptools,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "pyephember2";

     

       12
       12
       +
         version = "0.4.12";

     

       13
       13
       +
         pyproject = true;

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "roberty99";

     

       17
       17
       +
           repo = "pyephember2";

     

       18
       18
       +
           tag = version;

     

       19
       19
       +
           hash = "sha256-R63Ts+1620QQOFF8o2/6CFNZi5jAeWTQkElgqZhNA7c=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         build-system = [ setuptools ];

     

       23
       23
       +
       

     

       24
       24
       +
         dependencies = [

     

       25
       25
       +
           paho-mqtt

     

       26
       26
       +
           requests

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "pyephember2" ];

     

       30
       30
       +
       

     

       31
       31
       +
         # upstream has no tests

     

       32
       32
       +
         doCheck = false;

     

       33
       33
       +
       

     

       34
       34
       +
         meta = {

     

       35
       35
       +
           changelog = "https://github.com/roberty99/pyephember2/releases/tag/${src.tag}";

     

       36
       36
       +
           description = "Python library to work with ember from EPH Controls";

     

       37
       37
       +
           homepage = "https://github.com/ttroy50/pyephember";

     

       38
       38
       +
           license = lib.licenses.mit;

     

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

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+5 -3

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

···

       5
       5
        
         bleak,

     

       6
       6
        
         buildPythonPackage,

     

       7
       7
        
         fetchFromGitHub,

     

       8
       8
       +
         mashumaro,

     

       8
       9
        
         pytest-asyncio,

     

       9
       10
        
         pytestCheckHook,

     

       10
       11
        
         pythonOlder,

     
···

       14
       15
        
       

     

       15
       16
        
       buildPythonPackage rec {

     

       16
       17
        
         pname = "pylamarzocco";

     

       17
       17
       -
         version = "1.4.9";

     

       18
       18
       +
         version = "2.0.0";

     

       18
       19
        
         pyproject = true;

     

       19
       20
        
       

     

       20
       20
       -
         disabled = pythonOlder "3.11";

     

       21
       21
       +
         disabled = pythonOlder "3.12";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "zweckj";

     

       24
       25
        
           repo = "pylamarzocco";

     

       25
       26
        
           tag = "v${version}";

     

       26
       26
       -
           hash = "sha256-rEN1z+gkQjWjDkISdnn0KsxVzzPSKGPI/+VeYclIvkI=";

     

       27
       27
       +
           hash = "sha256-iOqYCX7cwAePGepJ0nAG3iApz1A/9Cn6hy3mo4uPl7w=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       30
        
         build-system = [ setuptools ];

     
···

       31
       32
        
         dependencies = [

     

       32
       33
        
           aiohttp

     

       33
       34
        
           bleak

     

       35
       35
       +
           mashumaro

     

       34
       36
        
         ];

     

       35
       37
        
       

     

       36
       38
        
         nativeCheckInputs = [

-44

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         aiohttp,

     

       4
       4
       -
         asynctest,

     

       5
       5
       -
         buildPythonPackage,

     

       6
       6
       -
         fetchFromGitHub,

     

       7
       7
       -
         pytest-asyncio,

     

       8
       8
       -
         pytestCheckHook,

     

       9
       9
       -
         pythonOlder,

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       buildPythonPackage rec {

     

       13
       13
       -
         pname = "pymelcloud";

     

       14
       14
       -
         version = "2.11.0";

     

       15
       15
       -
         format = "setuptools";

     

       16
       16
       -
       

     

       17
       17
       -
         disabled = pythonOlder "3.8";

     

       18
       18
       -
       

     

       19
       19
       -
         src = fetchFromGitHub {

     

       20
       20
       -
           owner = "vilppuvuorinen";

     

       21
       21
       -
           repo = pname;

     

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

     

       23
       23
       -
           sha256 = "1q6ny58cn9qy86blxbk6l2iklab7y11b734l7yb1bp35dmy27w26";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         propagatedBuildInputs = [ aiohttp ];

     

       27
       27
       -
       

     

       28
       28
       -
         doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11

     

       29
       29
       -
       

     

       30
       30
       -
         nativeCheckInputs = [

     

       31
       31
       -
           asynctest

     

       32
       32
       -
           pytest-asyncio

     

       33
       33
       -
           pytestCheckHook

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         pythonImportsCheck = [ "pymelcloud" ];

     

       37
       37
       -
       

     

       38
       38
       -
         meta = with lib; {

     

       39
       39
       -
           description = "Python module for interacting with MELCloud";

     

       40
       40
       -
           homepage = "https://github.com/vilppuvuorinen/pymelcloud";

     

       41
       41
       -
           license = with licenses; [ mit ];

     

       42
       42
       -
           maintainers = with maintainers; [ fab ];

     

       43
       43
       -
         };

     

       44
       44
       -
       }

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pymiele";

     

       12
       12
       -
         version = "0.2.0";

     

       12
       12
       +
         version = "0.4.3";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
       -
         disabled = pythonOlder "3.11";

     

       15
       15
       +
         disabled = pythonOlder "3.13";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-/iUpbvD77MURTltnStm47PEqXnfVuHf4m3+h9V2cn68=";

     

       19
       19
       +
           hash = "sha256-o3G8+TdjPzctlq/CHYsac7aEx0hVLo1M1JLos3S9ek0=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         build-system = [ setuptools ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pypglab";

     

       12
       12
       -
         version = "0.0.3";

     

       12
       12
       +
         version = "0.0.5";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "pglab-electronics";

     

       17
       17
        
           repo = "pypglab";

     

       18
       18
        
           tag = version;

     

       19
       19
       -
           hash = "sha256-b+o98DrTK1HBKvRfTjdJ1MkdUHEg/TaQZhoLR7URZ0c=";

     

       19
       19
       +
           hash = "sha256-nnLGFVV+aWkaE7RnAzLHji/tKxIiA9qJS/BUTv3KNeo=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         build-system = [ hatchling ];

+36 -10

pkgs/development/python-modules/pyrate-limiter/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         filelock,

     

       5
       6
        
         poetry-core,

     

       7
       7
       +
         postgresql,

     

       8
       8
       +
         postgresqlTestHook,

     

       9
       9
       +
         psycopg,

     

       10
       10
       +
         psycopg-pool,

     

       11
       11
       +
         pytestCheckHook,

     

       12
       12
       +
         pytest-asyncio,

     

       13
       13
       +
         pytest-xdist,

     

       14
       14
       +
         redis,

     

       15
       15
       +
         redisTestHook,

     

       6
       16
        
       }:

     

       7
       17
        
       

     

       8
       18
        
       buildPythonPackage rec {

     

       9
       19
        
         pname = "pyrate-limiter";

     

       10
       10
       -
         version = "2.10.0";

     

       11
       11
       -
         format = "pyproject";

     

       20
       20
       +
         version = "3.7.0";

     

       21
       21
       +
         pyproject = true;

     

       12
       22
        
       

     

       13
       23
        
         src = fetchFromGitHub {

     

       14
       24
        
           owner = "vutran1710";

     

       15
       25
        
           repo = "PyrateLimiter";

     

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

     

       17
       17
       -
           hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";

     

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

     

       27
       27
       +
           hash = "sha256-oNwFxH75TJm0iJSbLIO8SlIih72ImlHIhUW7GjOEorw=";

     

       18
       28
        
         };

     

       19
       29
        
       

     

       20
       20
       -
         nativeBuildInputs = [ poetry-core ];

     

       30
       30
       +
         postPatch = ''

     

       31
       31
       +
           # tests cause too many connections to the postgres server and crash/timeout

     

       32
       32
       +
           sed -i "/create_postgres_bucket,/d" tests/conftest.py

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         build-system = [ poetry-core ];

     

       36
       36
       +
       

     

       37
       37
       +
         optional-dependencies = {

     

       38
       38
       +
           all = [

     

       39
       39
       +
             filelock

     

       40
       40
       +
             redis

     

       41
       41
       +
             psycopg

     

       42
       42
       +
             psycopg-pool

     

       43
       43
       +
           ];

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         nativeCheckInputs = [

     

       47
       47
       +
           pytestCheckHook

     

       48
       48
       +
           pytest-asyncio

     

       49
       49
       +
           pytest-xdist

     

       50
       50
       +
           redisTestHook

     

       51
       51
       +
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       21
       52
        
       

     

       22
       53
        
         pythonImportsCheck = [ "pyrate_limiter" ];

     

       23
       23
       -
       

     

       24
       24
       -
         # The only consumer of this is Lutris (via python-moddb), and it requires 2.x,

     

       25
       25
       -
         # so don't auto-update it and break Lutris every python-updates.

     

       26
       26
       -
         # FIXME: remove when python-moddb updates.

     

       27
       27
       -
         passthru.skipBulkUpdate = true;

     

       28
       54
        
       

     

       29
       55
        
         meta = with lib; {

     

       30
       56
        
           description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "pysmartthings";

     

       21
       21
       -
         version = "3.2.0";

     

       21
       21
       +
         version = "3.2.1";

     

       22
       22
        
         pyproject = true;

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.12";

     
···

       27
       27
        
           owner = "andrewsayre";

     

       28
       28
        
           repo = "pysmartthings";

     

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

     

       30
       30
       -
           hash = "sha256-b8DUptzmXGGjuQrNRHp9KC4aQnoVj+Wu7ixyiNjuvqk=";

     

       30
       30
       +
           hash = "sha256-KgwNXIzQWae91R0qmInlm6m+NwrSJgP9SY80WSneTY4=";

     

       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.60.1";

     

       19
       19
       +
         version = "0.61.0";

     

       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-ZOs/vWN0cfcx99kmAZixxFn9GpPZYvHkVJSkluBRwgk=";

     

       28
       28
       +
           hash = "sha256-yHP5BoLuP2dvR2SSFgc68g1wENkDXZN1M9Nr8WticCw=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ setuptools ];

+56

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

···

       1
       1
       +
       {

     

       2
       2
       +
         aiohttp,

     

       3
       3
       +
         aioresponses,

     

       4
       4
       +
         buildPythonPackage,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         lib,

     

       7
       7
       +
         mashumaro,

     

       8
       8
       +
         orjson,

     

       9
       9
       +
         poetry-core,

     

       10
       10
       +
         pytest-asyncio,

     

       11
       11
       +
         pytest-cov-stub,

     

       12
       12
       +
         pytestCheckHook,

     

       13
       13
       +
         yarl,

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "python-melcloud";

     

       18
       18
       +
         version = "0.1.0";

     

       19
       19
       +
         pyproject = true;

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "erwindouna";

     

       23
       23
       +
           repo = "python-melcloud";

     

       24
       24
       +
           tag = version;

     

       25
       25
       +
           hash = "sha256-1WFE8k16aDIp1S/WDHXVdUtQmISEoE8yQAn9nndmQWs=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         build-system = [ poetry-core ];

     

       29
       29
       +
       

     

       30
       30
       +
         pythonRemoveDeps = [

     

       31
       31
       +
           "aioresponses"

     

       32
       32
       +
           "mashumaro"

     

       33
       33
       +
           "orjson"

     

       34
       34
       +
           "yarl"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         dependencies = [

     

       38
       38
       +
           aiohttp

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         pythonImportsCheck = [ "pymelcloud" ];

     

       42
       42
       +
       

     

       43
       43
       +
         nativeCheckInputs = [

     

       44
       44
       +
           pytest-asyncio

     

       45
       45
       +
           pytest-cov-stub

     

       46
       46
       +
           pytestCheckHook

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         meta = {

     

       50
       50
       +
           changelog = "https://github.com/erwindouna/python-melcloud/blob/${src.tag}/CHANGELOG.md";

     

       51
       51
       +
           description = "Asynchronous Python client for controlling Melcloud devices";

     

       52
       52
       +
           homepage = "https://github.com/erwindouna/python-melcloud";

     

       53
       53
       +
           license = lib.licenses.mit;

     

       54
       54
       +
           maintainers = with lib.maintainers; [ dotlambda ];

     

       55
       55
       +
         };

     

       56
       56
       +
       }

+6 -2

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

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         aiohttp,

     

       5
       5
       +
         aiomqtt,

     

       5
       6
        
         aioresponses,

     

       6
       7
        
         async-timeout,

     

       7
       8
        
         buildPythonPackage,

     
···

       14
       15
        
         poetry-core,

     

       15
       16
        
         pycryptodome,

     

       16
       17
        
         pycryptodomex,

     

       18
       18
       +
         pyrate-limiter,

     

       17
       19
        
         pytest-asyncio,

     

       18
       20
        
         pytestCheckHook,

     

       19
       21
        
         pythonOlder,

     
···

       22
       24
        
       

     

       23
       25
        
       buildPythonPackage rec {

     

       24
       26
        
         pname = "python-roborock";

     

       25
       25
       -
         version = "2.16.1";

     

       27
       27
       +
         version = "2.18.2";

     

       26
       28
        
         pyproject = true;

     

       27
       29
        
       

     

       28
       30
        
         disabled = pythonOlder "3.11";

     
···

       31
       33
        
           owner = "humbertogontijo";

     

       32
       34
        
           repo = "python-roborock";

     

       33
       35
        
           tag = "v${version}";

     

       34
       34
       -
           hash = "sha256-zQlNBQm+dBmw+kydNlqJU1D0KKuywyuNCqm0/BslWi0=";

     

       36
       36
       +
           hash = "sha256-7xcw1jNCDapHjH1YVB5NW7jxMyb8Raf8HuTnWf2vdFo=";

     

       35
       37
        
         };

     

       36
       38
        
       

     

       37
       39
        
         postPatch = ''

     
···

       45
       47
        
       

     

       46
       48
        
         dependencies = [

     

       47
       49
        
           aiohttp

     

       50
       50
       +
           aiomqtt

     

       48
       51
        
           async-timeout

     

       49
       52
        
           click

     

       50
       53
        
           construct

     

       51
       54
        
           dacite

     

       52
       55
        
           paho-mqtt

     

       53
       56
        
           pycryptodome

     

       57
       57
       +
           pyrate-limiter

     

       54
       58
        
           vacuum-map-parser-roborock

     

       55
       59
        
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];

     

       56
       60

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "python-tado";

     

       15
       15
       -
         version = "0.18.11";

     

       15
       15
       +
         version = "0.18.14";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "wmalgadey";

     

       20
       20
        
           repo = "PyTado";

     

       21
       21
        
           tag = version;

     

       22
       22
       -
           hash = "sha256-99qUwTcDWkiP4vqiCHI5ukY/KoEtuefietOyvJdowaE=";

     

       22
       22
       +
           hash = "sha256-ubaYa/TC0hctqjuv7QBi/dlIJjWrvo4i9AjAtOIqviU=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ setuptools ];

+4 -2

pkgs/development/python-modules/renault-api/default.nix

···

       13
       13
        
         pythonOlder,

     

       14
       14
        
         pytest-asyncio,

     

       15
       15
        
         pytestCheckHook,

     

       16
       16
       +
         syrupy,

     

       16
       17
        
         tabulate,

     

       17
       18
        
         typeguard,

     

       18
       19
        
       }:

     

       19
       20
        
       

     

       20
       21
        
       buildPythonPackage rec {

     

       21
       22
        
         pname = "renault-api";

     

       22
       22
       -
         version = "0.2.10";

     

       23
       23
       +
         version = "0.3.1";

     

       23
       24
        
         pyproject = true;

     

       24
       25
        
       

     

       25
       26
        
         disabled = pythonOlder "3.8";

     
···

       28
       29
        
           owner = "hacf-fr";

     

       29
       30
        
           repo = "renault-api";

     

       30
       31
        
           tag = "v${version}";

     

       31
       31
       -
           hash = "sha256-d+1H4hu8Mqj2oKrS5C1QnoIJePlQdBKLCHTfcNcZBWI=";

     

       32
       32
       +
           hash = "sha256-xnlFt6K7SOpeT4yXxLnep5NvNaP6REteUhBpcT7ipN0=";

     

       32
       33
        
         };

     

       33
       34
        
       

     

       34
       35
        
         build-system = [ poetry-core ];

     
···

       52
       53
        
           aioresponses

     

       53
       54
        
           pytest-asyncio

     

       54
       55
        
           pytestCheckHook

     

       56
       56
       +
           syrupy

     

       55
       57
        
           typeguard

     

       56
       58
        
         ] ++ lib.flatten (lib.attrValues optional-dependencies);

     

       57
       59

pkgs/development/python-modules/requests-ratelimiter/default.nix

···

       41
       41
        
         pythonImportsCheck = [ "requests_ratelimiter" ];

     

       42
       42
        
       

     

       43
       43
        
         meta = with lib; {

     

       44
       44
       +
           # https://github.com/JWCook/requests-ratelimiter/issues/78

     

       45
       45
       +
           broken = lib.versionAtLeast pyrate-limiter.version "3";

     

       44
       46
        
           description = "Module for rate-limiting for requests";

     

       45
       47
        
           homepage = "https://github.com/JWCook/requests-ratelimiter";

     

       46
       48
        
           changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.rev}/HISTORY.md";

+2 -2

pkgs/development/python-modules/sensorpro-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "sensorpro-ble";

     

       16
       16
       -
         version = "0.5.3";

     

       16
       16
       +
         version = "0.7.0";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "Bluetooth-Devices";

     

       23
       23
        
           repo = "sensorpro-ble";

     

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

     

       25
       25
       -
           hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY=";

     

       25
       25
       +
           hash = "sha256-YMcpe4daM4X23nOMubYNcmqlW8PttwDGC4WL9g4P+4I=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/sensorpush-ble/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "sensorpush-ble";

     

       17
       17
       -
         version = "1.7.1";

     

       17
       17
       +
         version = "1.9.0";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.10";

     
···

       23
       23
        
           owner = "Bluetooth-Devices";

     

       24
       24
        
           repo = "sensorpush-ble";

     

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

     

       26
       26
       -
           hash = "sha256-T2sjzQoWWRGAKiMDN29jZ7jZ5/i75qpNCiuVB7VEhJw=";

     

       26
       26
       +
           hash = "sha256-Jsf/NTVwEHoH989yQqWEdG43H74JHlKpUvMWuH4paOw=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         build-system = [ poetry-core ];

+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.1372";

     

       13
       13
       +
         version = "3.0.1373";

     

       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-XV1qBhTY6NVLM+wKVUzQ3DnNbOLnB+Z5fDEprfSdkIQ=";

     

       22
       22
       +
           hash = "sha256-VaQLJWhfzo39LyC0XB7iL7YReOXqsaIeKFFdqqhfD+4=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/teslemetry-stream/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "teslemetry-stream";

     

       11
       11
       -
         version = "0.6.12";

     

       11
       11
       +
         version = "0.7.7";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Teslemetry";

     

       16
       16
        
           repo = "python-teslemetry-stream";

     

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

     

       18
       18
       -
           hash = "sha256-0Ca8p5xuzpSfZhtTYZUgbdNHXmnn9RLOGMTSYKfnUZg=";

     

       18
       18
       +
           hash = "sha256-0gFX6tNBqqA7vh4d5zi38F2C1NqKjblc/8lz3DEBEJ8=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/thermobeacon-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "thermobeacon-ble";

     

       16
       16
       -
         version = "0.8.1";

     

       16
       16
       +
         version = "0.10.0";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "bluetooth-devices";

     

       23
       23
        
           repo = "thermobeacon-ble";

     

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

     

       25
       25
       -
           hash = "sha256-UnTJ1uvEnZ5//2arwMsJUSosCK8w26lpAcC1XGO9srw=";

     

       25
       25
       +
           hash = "sha256-+WQWb1D1Rw5KE4fvu55WYF2YsQY48MWtPA26G5MB6aY=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/thermopro-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "thermopro-ble";

     

       16
       16
       -
         version = "0.11.0";

     

       16
       16
       +
         version = "0.13.0";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "bluetooth-devices";

     

       23
       23
        
           repo = "thermopro-ble";

     

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

     

       25
       25
       -
           hash = "sha256-3GgFRY36KMcMWxwjLgzuJB++DZ2TMdQQruen1gLHAbk=";

     

       25
       25
       +
           hash = "sha256-gikNjQYE/GROUR0atBUcwrRdjH+HVL37EOKZYdvRUzo=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];

+2 -2

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

···

       40
       40
        
       

     

       41
       41
        
       buildPythonPackage rec {

     

       42
       42
        
         pname = "uiprotect";

     

       43
       43
       -
         version = "7.5.5";

     

       43
       43
       +
         version = "7.6.0";

     

       44
       44
        
         pyproject = true;

     

       45
       45
        
       

     

       46
       46
        
         disabled = pythonOlder "3.10";

     
···

       49
       49
        
           owner = "uilibs";

     

       50
       50
        
           repo = "uiprotect";

     

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

     

       52
       52
       -
           hash = "sha256-+acG6vNBOLSIoM8wFQjWOh3PhwUI+/wcjMf7InDt8IA=";

     

       52
       52
       +
           hash = "sha256-jFRBupuP0T/6e07qdJmzcz7P/IAYbY1+QxF6ErsFox0=";

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         build-system = [ poetry-core ];

+3 -3

pkgs/development/python-modules/vacuum-map-parser-base/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "vacuum-map-parser-base";

     

       12
       12
       -
         version = "0.1.3";

     

       12
       12
       +
         version = "0.1.5";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.11";

     
···

       18
       18
        
           owner = "PiotrMachowski";

     

       19
       19
        
           repo = "Python-package-${pname}";

     

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

     

       21
       21
       -
           hash = "sha256-wX7RsJKSNZmi6uIDqsKxWe8VaYJPg4I3pwHHckMUOw4=";

     

       21
       21
       +
           hash = "sha256-jB3/m2qlaDnc9fVTlM0wR2ROZmJQ1h6a+awauOa312g=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

     
···

       39
       39
        
         meta = with lib; {

     

       40
       40
        
           homepage = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-base";

     

       41
       41
        
           description = "Common code for vacuum map parsers";

     

       42
       42
       -
           changelog = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-base/releases/tag/v${version}";

     

       42
       42
       +
           changelog = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-base/releases/tag/${src.tag}";

     

       43
       43
        
           maintainers = with maintainers; [ jamiemagee ];

     

       44
       44
        
           license = licenses.asl20;

     

       45
       45
        
         };

+3 -3

pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "vacuum-map-parser-roborock";

     

       13
       13
       -
         version = "0.1.2";

     

       13
       13
       +
         version = "0.1.4";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.11";

     
···

       19
       19
        
           owner = "PiotrMachowski";

     

       20
       20
        
           repo = "Python-package-${pname}";

     

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

     

       22
       22
       -
           hash = "sha256-y7Q8C7ZvOn/KSUMJ7A/oH+HZMVBpuPitsXqsqHvvYHE=";

     

       22
       22
       +
           hash = "sha256-MqsLvAs4PU/K2yBxEhVJucstZg9QFPYgOTCbgT2Uq/A=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

     
···

       43
       43
        
         meta = with lib; {

     

       44
       44
        
           description = "Functionalities for Roborock vacuum map parsing";

     

       45
       45
        
           homepage = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock";

     

       46
       46
       -
           changelog = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock/releases/tag/v${version}";

     

       46
       46
       +
           changelog = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock/releases/tag/${src.tag}";

     

       47
       47
        
           maintainers = with maintainers; [ jamiemagee ];

     

       48
       48
        
           license = licenses.asl20;

     

       49
       49
        
         };

+2 -2

pkgs/development/python-modules/velbus-aio/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "velbus-aio";

     

       17
       17
       -
         version = "2025.3.1";

     

       17
       17
       +
         version = "2025.4.2";

     

       18
       18
        
         pyproject = true;

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
           owner = "Cereal2nd";

     

       24
       24
        
           repo = "velbus-aio";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-4lfxY8+EUtTAyRB40p+nShzmC3Qbxu6MJn9Zo7bImyk=";

     

       26
       26
       +
           hash = "sha256-3H5lFIMLHyucX0h7JagGPsqGyO1RMVPJ1L91iDbdEww=";

     

       27
       27
        
           fetchSubmodules = true;

     

       28
       28
        
         };

     

       29
       29

+2 -2

pkgs/development/python-modules/voip-utils/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "voip-utils";

     

       12
       12
       -
         version = "0.3.1";

     

       12
       12
       +
         version = "0.3.2";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "home-assistant-libs";

     

       17
       17
        
           repo = "voip-utils";

     

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

     

       19
       19
       -
           hash = "sha256-43g7ArhIZVyZ+VnzenldrQfr6kjpAxPNrK/vazYED+w=";

     

       19
       19
       +
           hash = "sha256-CI6YCT88ay4tDWHwaTL0Wr4b07mCn7440HdWE9+nxAw=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "weheat";

     

       16
       16
       -
         version = "2025.3.7";

     

       16
       16
       +
         version = "2025.4.29";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "wefabricate";

     

       21
       21
        
           repo = "wh-python";

     

       22
       22
        
           tag = version;

     

       23
       23
       -
           hash = "sha256-PGGlgzcx/pUyTcsFj73x5LqfcPRCh2VMXNsIJjcpEZE=";

     

       23
       23
       +
           hash = "sha256-z+tRxx+wtEj5cBXBVG1B5SNyvkQk2UwjH7lPgNQQ+ng=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         pythonRelaxDeps = [

+2 -2

pkgs/development/python-modules/yoto-api/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "yoto-api";

     

       13
       13
       -
         version = "1.24.5";

     

       13
       13
       +
         version = "1.26.1";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "cdnninja";

     

       18
       18
        
           repo = "yoto_api";

     

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

     

       20
       20
       -
           hash = "sha256-zgyZpya67cmJb2tz7Ht8G4y78UejVF00kssasZ8F+58=";

     

       20
       20
       +
           hash = "sha256-Erq6whZX8pfQSoszyCMrnRj24nZN3QD52SRs+G24O7k=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         build-system = [ setuptools ];

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "zeroconf";

     

       20
       20
       -
         version = "0.146.1";

     

       20
       20
       +
         version = "0.147.0";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.9";

     
···

       26
       26
        
           owner = "jstasiak";

     

       27
       27
        
           repo = "python-zeroconf";

     

       28
       28
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-p+8TunZvxVtK+kwGu396td7io5/4d3taJk5NTgSPb3Q=";

     

       29
       29
       +
           hash = "sha256-WAixAOjGbO3J4Tsp81p5+uUGld2y5wU7M4mmQ4t8sBw=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [

+2 -2

pkgs/development/python-modules/zha-quirks/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "zha-quirks";

     

       15
       15
       -
         version = "0.0.136";

     

       15
       15
       +
         version = "0.0.137";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.12";

     
···

       21
       21
        
           owner = "zigpy";

     

       22
       22
        
           repo = "zha-device-handlers";

     

       23
       23
        
           tag = version;

     

       24
       24
       -
           hash = "sha256-WoLs8/IqKt0rxALmObim+NnaTRq/VAecrkrbirktm+A=";

     

       24
       24
       +
           hash = "sha256-LieMWqUp4bOWMmFyQ04O2SyxxsBzKxWqatQUnh6Wx9M=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         postPatch = ''

+2 -2

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

···

       27
       27
        
       

     

       28
       28
        
       buildPythonPackage rec {

     

       29
       29
        
         pname = "zha";

     

       30
       30
       -
         version = "0.0.56";

     

       30
       30
       +
         version = "0.0.57";

     

       31
       31
        
         pyproject = true;

     

       32
       32
        
       

     

       33
       33
        
         disabled = pythonOlder "3.12";

     
···

       36
       36
        
           owner = "zigpy";

     

       37
       37
        
           repo = "zha";

     

       38
       38
        
           tag = version;

     

       39
       39
       -
           hash = "sha256-k6Zegn7YUw5Wueb/8Z1RJ7teRMQ6Owdm8obM6XHI/aY=";

     

       39
       39
       +
           hash = "sha256-eaOVQQ5GbWjJuK+30r3bcBMAFdVY9K9bwn+rd/qQ+Ow=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

+3 -3

pkgs/development/python-modules/zigpy-deconz/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "zigpy-deconz";

     

       16
       16
       -
         version = "0.24.1";

     

       16
       16
       +
         version = "0.24.2";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.7";

     
···

       22
       22
        
           owner = "zigpy";

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           tag = version;

     

       25
       25
       -
           hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4=";

     

       25
       25
       +
           hash = "sha256-el29EqCK9p3AII9LsMw+ikplHfDKNUIhaU3HJI0gfu8=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

     
···

       49
       49
        
         meta = with lib; {

     

       50
       50
        
           description = "Library which communicates with Deconz radios for zigpy";

     

       51
       51
        
           homepage = "https://github.com/zigpy/zigpy-deconz";

     

       52
       52
       -
           changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}";

     

       52
       52
       +
           changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${src.tag}";

     

       53
       53
        
           license = licenses.gpl3Plus;

     

       54
       54
        
           maintainers = with maintainers; [ mvnetbiz ];

     

       55
       55
        
           platforms = platforms.linux;

+2 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "zigpy";

     

       28
       28
       -
         version = "0.78.1";

     

       28
       28
       +
         version = "0.79.0";

     

       29
       29
        
         pyproject = true;

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           owner = "zigpy";

     

       33
       33
        
           repo = "zigpy";

     

       34
       34
        
           tag = version;

     

       35
       35
       -
           hash = "sha256-b+4KqcswAKUNJb4e450VwmAR0mca9ApW4n+kif7BR7o=";

     

       35
       35
       +
           hash = "sha256-4bvVn9Pv37zngsiwy54g+z05uej5Bfwpt3mC9cxF2hk=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         postPatch = ''

-776

pkgs/development/web/nodejs/nodejs-release-keys.asc

···

       1
       1
       -
       -----BEGIN PGP PUBLIC KEY BLOCK-----

     

       2
       2
       -
       

     

       3
       3
       -
       mQENBFKKodABCADiE7Ex8GXnQNgipqbTADO5+BfufYFeq9YLEKkuOUfnjAZ8Wzle

     

       4
       4
       -
       4eLL4rdfFSuwuUO0rkSFOpNjkjKqxfRo0RkmlMxdHwT2auf/yrfX4EyhyKDn1Vh8

     

       5
       5
       -
       MP2JecXQN3FVa1yR8AMGfT0zOP138MNp21tNp3Dy9r/ds6ZhttrnR+mrKnhKMmTj

     

       6
       6
       -
       1J+MX/LKw3o9ERIz0O8dxw75pA27npX1EcSCM1Vcq1bam7xD6d3cfQtfQsidXkQ/

     

       7
       7
       -
       nFpD7BQFU+nemYaa6Vkuy4VJ11AMLNvzoWc2iHofD0kO60am3z6x8t63m+BUSU5I

     

       8
       8
       -
       r7B5GNbatekJqu/Qn1qrCjyuXcExEsGnCJl/ABEBAAG0ElJvZCBWYWdnIDxyQHZh

     

       9
       9
       -
       LmdnPokBOAQTAQIAIgUCUoqh0AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA

     

       10
       10
       -
       CgkQwnN5L32DVF2cywf/Vws0J68vxn+ngUzq/wcWlQANfwMFUcD/8eM0N1B3OMXQ

     

       11
       11
       -
       9+GSlsuEUvh6/oxYxn4EPIgdqsV25SB/fAUz4uN50qvc0ft+wTgh20pnMP0qLf7/

     

       12
       12
       -
       adb/dBf/NTV4TWzHaUDAkwPXqPd4He7AI5/PZeaMGmJPJmeR8ZM0ZrvLsNTmYV6N

     

       13
       13
       -
       byWcqYvbbRSNSn4ypb/QbYjFQZB2QKrC1LAW9jpdNnfQViYeZDmoSRaCTOv7SeSy

     

       14
       14
       -
       TkzOhMFRZDP9NmUvnl3chWNdmBoLls3/lO1Kpuc8h+nXkgU1hUyvsPjs8zBaqUDI

     

       15
       15
       -
       oMudExnECyEUHlZvVLlfpocznOPqlBhxjR0Q9VRYYokCHAQQAQIABgUCWL7qpAAK

     

       16
       16
       -
       CRCVUaCxpuKXzorJEACb96lsYyavUJOsFd6w8pgOENJjxZF64JR0Dx1rSsC4VgUa

     

       17
       17
       -
       m5zVVasJ29oAnzpeCQzt0sazTgLYrzxA4RY/guI7FBmI3p1nwhUCprG5QMuE1iZ+

     

       18
       18
       -
       PXVvkTNnNWDlpGGSkDyiC0ER3kWVlECaJhDmSDHxVNl+IwXgd6Jmx47RHYv64rON

     

       19
       19
       -
       FERHfMjzCUi5uLs+zoIU2V8sy3j7Hv10+/zUGBSy3wSaUlmNK+7wkI9WS3BkcQ/1

     

       20
       20
       -
       6Afet+De5XSVdDJu2TwhESEyXHFgXv9UQAbj5e8/fG8S/kPalQKnzQxp4eYtgC7a

     

       21
       21
       -
       cq1LGOX5BS0eFdwCnyNkZUhuHkjSYqg6GjEhmgEhUmow9FzaAD2JO8lXMYXtiXTX

     

       22
       22
       -
       U3VeY92b7gEt76HdefuAhPFRo2DppSQB2Qh1d6+WRWjxfIcVZcMjby3cDzBYZvfj

     

       23
       23
       -
       Jhzxv+3qSlzeYeDSLZUkyARRshLcd1LvlZiHntveiMuvehemVLcQ2XtCJh6mCfFJ

     

       24
       24
       -
       HwkRloAswSW1XiDEaybcc/Cok5aPjk/sozVCH1g9lyeQTIQ7QCYQzA2TrfCLOvL0

     

       25
       25
       -
       9pguTGRFC22ikZzgPD9dC5vo1MvjRczT2g3gDxqrjvt35v3+ZlQ4ZJ+U2G9Ew+XF

     

       26
       26
       -
       Jn9bo4ZXxffj6jPnFiELZfSwIGP9EUaPXMXh/lov8IMfr37cQsE360A82RRAd4kC

     

       27
       27
       -
       IgQTAQgADAUCVw1LygWDB4YfgAAKCRDnO8ZBzBH0yHMND/46YV031EzwZL67h+ZC

     

       28
       28
       -
       SWka9SR+o1XHVWvjLGOcSOeBnD+8C170Q30NYVMEgSwtF8kY0M5k6GlEpIKNuOYq

     

       29
       29
       -
       NphXkNfn00ysqJ1G8WIGmGnsA/g/4LYSGt4ttL8roW582Ps3ITAYR/OVgHBccssL

     

       30
       30
       -
       6QdylghWW6wKYs5yoOn51pr0Ff0WyARfQxiaFNtwrZseSRrFlgCgX0+Hrfin1iHz

     

       31
       31
       -
       l8m/I8BIywM+fW+kk6ixitkFPszvT+9sgLj5viUl7+pJzLIs3GwODkLVCWCetLfO

     

       32
       32
       -
       XP7XDrcBQpU6OExpaC4ua4tVhfiaTJkYFB43Za0rP8egx8u7tBs9WC6rU3wygsLJ

     

       33
       33
       -
       uD9sdahFHY4c52eBRdIvAQow1oEj3WW3JIN72TiSOFbCMiFNR1t1nezaokef89pN

     

       34
       34
       -
       LMlJnzJ6BeKWmiSMsmOcT3Uq8cmmQpmbF3N0cZyOy2MMrnBtm0iIwY4NJ/YlLbAj

     

       35
       35
       -
       1f4urrAWkFInzWCdE/L6VO93WwD7sHLOcq8fKWv/2/QY7kGP8Cbut59ie6wUr53S

     

       36
       36
       -
       IEM7B21/zdcrI2ND7R9Bdo0h867NgIuve6EN/W08QbCsTAu8ukdtKOISprqBXQ7y

     

       37
       37
       -
       7CEUGRFlHbiLfhyaNs1IHtSDVpt6Rq/U5X35Zk3MSsL44ZuTqS7HE/QMjQy8oQ2U

     

       38
       38
       -
       tJyhZrnOkqHjT+g/kz1bKZ+JPbQXUm9kIFZhZ2cgPHJvZEB2YWdnLm9yZz6JATgE

     

       39
       39
       -
       EwECACIFAlKKo5ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMJzeS99

     

       40
       40
       -
       g1RdocEIAJCkX71Kddk6B1HD9V80dpTVvm+YMup2qca6LqLtsiYE/O/XZHRZZ1WJ

     

       41
       41
       -
       RdxTGqGLKLkHgea0PUaxrcUxSzibDFJqEcRBz90ojaVu2jXb8Wbr9PkNcV0ABivy

     

       42
       42
       -
       PCpx0IFUxKj3+94akK9DOzwLpAf2QMSm0JlQhdql8K0JCRyk9ehkBCxcssVKocgZ

     

       43
       43
       -
       TCRur475lYNDU4SiQoJJ7iFirf1SvNAoeXwXiqDAR2q/k5VrANmfzKvmQ4UMciEx

     

       44
       44
       -
       vQaxc+q7LsBI0/EzFtWCnhPabEzhY8lzqsxlfdEbFXWFO1V6206FBYuymTE6IDxg

     

       45
       45
       -
       trhVg6FZgmWSrxnWWasJSZxv2iWhwgKJAhwEEAECAAYFAli+6qQACgkQlVGgsabi

     

       46
       46
       -
       l843ZRAAsPXN0qd5njBzcSMOTSwYVOX5/1NNWI4ac0kbtdgh9bvcWxL1OtR0nkiA

     

       47
       47
       -
       6evmTtC7HuMSKtviMtpHwIHp1TVu4nuosFUJaLRkxv43U7ReQSk8nxFWBcucLIaL

     

       48
       48
       -
       8/V89YmLH6LAWEr6zaP2KoRwDLJr5mfpU8GLaBVittGzxN9llkmPRA12uS7HHgRq

     

       49
       49
       -
       i1D8bcZVj4EHoB4Lj5U0L/GpqgU/UitUR32fmmfvzQFMWVRMfJHP389Y2lRbcqC/

     

       50
       50
       -
       rZXa2USH5WC+oDejhRq50S3B/v1jB8jtYtWZXmYQCk98KCUB+4ck8uSLYZGtZpt4

     

       51
       51
       -
       lb2ZSFb3IhGAzJR5DBgZI6YrfwnBfOxdt0VWv/pU0PzNGbl/iLRWFI1aIOcIsWkV

     

       52
       52
       -
       0+XDegde8kTdhvrlbE+Dst8sBdIKN+4BJxkGVlugKFnlLcTPiMAsz1W3b0wT3PgA

     

       53
       53
       -
       zSYgf32KUCtxSgJO7rkKOf1vzcuH8L/MYH6X3CV9Zm4ZXXbTSyMp04LCJZMO3K/L

     

       54
       54
       -
       4lc+sYs/KFJCl5mt7zCXs56ta522TFgg+4JV7ZyI+74ZPA+MJB647cdHiNYMIh3r

     

       55
       55
       -
       FUiz4PJRQCu3NdeyCktChASFKag2AMIKEKeow5z+e3EE6zRy7ErBBLb9T/14BBPn

     

       56
       56
       -
       5FRSv0A3iiQVw77i30Ds1YuROX7sWsN74sgJfytLiy9vdT3Jiz+JAiIEEwEIAAwF

     

       57
       57
       -
       AlcNS7sFgweGH4AACgkQ5zvGQcwR9MiizBAA5IaFWe3L1TckdaIu+z/OlxEsL8jF

     

       58
       58
       -
       NJVCXdjUoOUk4PKf2BpMbWXM9N+JrZw3kjyWX//S6Dl5Do/tO9JTMX0btwIfhZUk

     

       59
       59
       -
       uvx7H4Oh38UKwkDl207DF9JMDeU6/h/rsWjAmzVLxMhdbEGIDQlhjYgsZbJjC5be

     

       60
       60
       -
       ZDuYfDKOye65HUa++O6h5EOBd2qLRl/pGJHLlAiGPLtwY3jewEZlCrlO958aTkPl

     

       61
       61
       -
       AHxh+ltRWLd2zYF0xnBaWvpFOVArjDNkTSuyYYNtBa6OmKPZ4BkPQb5Av9b9GCwJ

     

       62
       62
       -
       2dxdlUf7GexBHlANRbAcw0kXmCJOYLxxOx8jQRnQ8TLiL9Rds4c+XlloJfYsD/Rx

     

       63
       63
       -
       vIvUAKMqFEXmMlBnO9VJeiw4r0F7pNH6VYp7bnz1NiW3Mimk0Kjz2TTOVpfR+kht

     

       64
       64
       -
       hMFO+oCpJShsfqq9WWX2+MM/dC11oIGfr/kGqK6DSkIbflkqFnBEVuM+uUe0OeDV

     

       65
       65
       -
       IWrEF5O22+pGeC0Yezrzp4x+3lL8ObsFKGWwxTdmbpIcR4zT+Er3dPAdLBFcm/Le

     

       66
       66
       -
       0Odjv1sj/LLOC6FKg7qKG7raglkQSMEF8DAtWkE2H1P2ywvky8HArk5OM0LXcxub

     

       67
       67
       -
       Mo849kZrLhGblt8+zp32fafsQEIsNAzoqCR50XSHJhMb0zmPmvXCAfsk1wWKlgFg

     

       68
       68
       -
       M7vo0zXSYLg8ifa5AQ0EUoqh0AEIANGUbt///24seQv1o9hgAWJ6i7sjC79jCH1m

     

       69
       69
       -
       tPlLjAsUcGg+16fTwAlII1Z2ffXYKs9MvcGBNVdxkR8S1g+aYM/ds3hY2CglHe7z

     

       70
       70
       -
       N+/pkYr5I1jchmCE6LQDbGA/yIfiufMkUFB1Pry34P+G3mcnENfeETns/26yCSJ9

     

       71
       71
       -
       plysIggJiPKS3ihrPnp8qjCEByzBn70HRkliS4nnjws1aSG67aWUn0RdELrK7Mgm

     

       72
       72
       -
       EWRacrMu308pgdn7XQ/hUUPcsOAqiI9tc0xeG2FXEg2WS7aklqAw7yjEpJK7qid0

     

       73
       73
       -
       ntEbKy3Erlu29ZxzH/kphNJH5eQFgXJ0guhG/Sm4ljt45nn7H+8AEQEAAYkBHwQY

     

       74
       74
       -
       AQIACQUCUoqh0AIbDAAKCRDCc3kvfYNUXVfxCAC1ajXnKPFswIU2RgJETuY1GgUH

     

       75
       75
       -
       NL8oU3bp5oGhocKPcDPQL8rLZkAhTfKYkRoc6hLS5wcgz8FSEEz5oMesBWCXSZBS

     

       76
       76
       -
       8xTW0vgncbrTUVnVmCAz88qeQ7SA9RVmgnpgKnVAv46azZQkB+x1FR2scSEf7uoo

     

       77
       77
       -
       Go5zxB7LvSwRX+bgyct5TRcs37lLLaaGlgsy7yrcZYqqUXjEOGrZ78KMNDifK+X0

     

       78
       78
       -
       XYoGY+p4sCfl4Uf46qANa4shQMZjKaWGZpiqs673aIg0MoZPCyTTO6Atfsv2Li8E

     

       79
       79
       -
       ossDZpvJuroJFZw5zvIEy7AiDAcCZjMj8FLoLzom0A1FNxCvgzOraMITOobsmQIN

     

       80
       80
       -
       BFM7JpoBEACmf7uB5P5QJ8X38ARQn+dr+/O+6/wzkKzUcoFvRArwZTcpdEO/0C12

     

       81
       81
       -
       kNSpK2UkVMh4sorYwA8W0yv3spZJWU3TiIfCVryxqZaAWEIU+dwsQ0P6EAUythjd

     

       82
       82
       -
       QEs81bG6aN0dUqE26fWjGL/mU7BPtAwfzg6lty2cwZJP5zaNCl/PjRUeTKC2oNas

     

       83
       83
       -
       3M5dWoOqWq6HLPqnTEPHPlZ/mhkOfLOnJA6r669sQcml5R+Lhwd8wdJp+ANiDLW6

     

       84
       84
       -
       61MmaiA4VqjEXwsXKK0KISWftEgd9WGBsHH8rn4KdKj9u6EtnDlA3vaPmADZmf7R

     

       85
       85
       -
       VSMRoMkdiswFqEIMQuhTVbqS69vyhtByQs1fhriYrPy3OMeSMjJ/zNDCnHTBuKxo

     

       86
       86
       -
       NHgMcznVu1tjz+ggso7Whd0IiXEaHXhF5ASWnJJa+xLxXQRQV2X1RXEK0bAySX5B

     

       87
       87
       -
       +NmxJRVY+ixpO5TVhQhzzzL9Ivz4z0odlvt5VJJIHHFIAWkgXRNAo0wgDzfe+jHO

     

       88
       88
       -
       E7nz9uzYsqDBV25Zo22oMZURTBN87WZ1TFpDiORvvjR8QXJIBIUvMHAhG/ZlEkVo

     

       89
       89
       -
       poNaznUOplnr/ToDpA1RDrdxeUAQ1i99EeBtXRREFgByFvETnVCkX/pvQA1yFrhG

     

       90
       90
       -
       FgqCYBpN4IK0UcUx1MuwPBrfZxbL/cy+FhmJqutB6ufaJzatMQHu5QARAQABtClr

     

       91
       91
       -
       ZXliYXNlLmlvL2Zpc2hyb2NrIDxmaXNocm9ja0BrZXliYXNlLmlvPokBHAQQAQIA

     

       92
       92
       -
       BgUCVu4HLwAKCRDCc3kvfYNUXW4MB/9dLmaZaaPUPrEaUQfN6UngTKRNLOJj22FW

     

       93
       93
       -
       2S+e7ALUcA808o80BaK/9dk6mmQCD8L8INRzsNOyBGfN3KL/hV0Zg7BtX2R5ed5p

     

       94
       94
       -
       0S1CmJzsutV6AAsXJvu73bOCy0QosnpsJDRx51k/4+1jUt6PkTMy4YxbVDDBRQTG

     

       95
       95
       -
       DApi2EeX5kwaw1jNiubsfOPtBbyuZbXS0IBKQREFwXtbwUmEc9amw2QopNj8N8Oh

     

       96
       96
       -
       eXbmc6AjiZUdDjOj3tZ9oflc3t6lDVH5EypuKZbcR6fOf4AlrXnuE3uHYMW57D/h

     

       97
       97
       -
       QL5/BMIe1fmK0HYEwg4BaLqCu9lgsYTYJtcTHHfisRDMs7F9Wxw7iQIcBBABAgAG

     

       98
       98
       -
       BQJYvupKAAoJEJVRoLGm4pfOzKsQAMVG0EblgGmcLA+VKZkuHtOgasrBBJXkxDnG

     

       99
       99
       -
       B5Xepg+1hOduxkO1rR5tGvejlWhcX8S17o1hdnl2LFdyzHwBU+i3BYYDkUFOWkO/

     

       100
       100
       -
       mkUvB3SPyHuNMRxZtNne3aZ08Sl/3yxIJFiEvg9ZPS3NDS9G/jxcGzP4b9FHE170

     

       101
       101
       -
       34BxSorHQxER7upkow1eO7dhjTCRVeDggMqWPYUjPGLDypiZHfkeItHvjTYaueQ9

     

       102
       102
       -
       oUzFzRPLOBaGVl+aIlojkIWWv010Dk54/uisEBbFuVoX9b76dBx1INEVLEb66MvC

     

       103
       103
       -
       BLhqsDH16fyj0tQEaTjSSdkJNul6n9DH2idjEkIf/+sZ11B7rW3FxuodtCB+se3Z

     

       104
       104
       -
       c4xWWtuvahTV+UwNiPC10pOUZbEnqeo69VpETSVK5h3jQ7HsLiTIgAVgwEUjPpLD

     

       105
       105
       -
       GsFbJ9VB9m/OYNmN8gtk67OVTu5IjHY06eifrHzBNXNf7A+udJgs+PSxfFd3jOuP

     

       106
       106
       -
       uaR80cU3gbhbzu5LzDWo37Zj9o1MPmSENKEGnW576RKZ6lJYWkpD7XJlwYs9mPse

     

       107
       107
       -
       LScqT2z09G4N0R/cgxGo1UCSuzWxc7eTFG8Q4kEBul7KjA2t3jxyzALbbcGDbnqS

     

       108
       108
       -
       Ufvsr5jQQdwh0LU/xDL2sAm8Z+4yrU4mqQFicWHDCOQPUF/C0GCMbKfbqqCC56Vs

     

       109
       109
       -
       sToI7UaTiQIiBBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTIBaUP/jguidAV

     

       110
       110
       -
       f1iW4N/Hk059nISZM0RbjxXJh6PbEgroTzyEEJljV4c8Yv21/wMXiCklNmVhVgcc

     

       111
       111
       -
       OoEqZMwDAz2vu4uDwDk/z41rM6lkFNVdMvBx92de+WjYYsdIBQYfklRY3LeImrkV

     

       112
       112
       -
       vHW9YW/yyqjh/wqVKpfMTuUUufaXgr+hbB9u5UMGY2dgq+3bTj/MqgDHa6sazam2

     

       113
       113
       -
       uU0C95CCW/rY0GzX6azVEJkEacSlue5sX2/y2UCpCI2oCc5w1NUASSYpiBrTajnE

     

       114
       114
       -
       loDYpgt00deEonGrhTZ4zCRdHSBaaAZbzZ5KQ7AYfRnk6C8Iawlhhm4TirQb2bXq

     

       115
       115
       -
       Oj20E2ly7tpzeo1F0ZdOQQXuolfp7Gf5UQOitMqdUeTQQ0HelWqfOoGPBkbXcOwJ

     

       116
       116
       -
       Kz7ptfESnBD1JjNVXtBIxyG9rCeqwJxNcTt+bWrXaqfybJFUldYwKmdITnsbjlj4

     

       117
       117
       -
       3ArxOUm/wfxgg3uVcshZ1g6etU3t+57rTQHT32VdPSKKW2AfzZS7um6+LypnIch2

     

       118
       118
       -
       ve16PzM22HUWpounMmKc43BNa729+3R64EJ1/0qftiFuYoF+IAIkePcLc8qxJxJ/

     

       119
       119
       -
       TJbsmSpThLz65645wbGD/b7Bnbb80ewBFMwivtwc58WSi+0oWhbuGUSAzCZfN/7I

     

       120
       120
       -
       hcPbWtQjN0W4Fc6KCmAiIyTML8Z1CJs83k+LiQI9BBMBCgAnAhsvBQkSzAMABQsJ

     

       121
       121
       -
       CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCGnAAoJEAn+RHNOt5kOLQEP+QHDbHiZ

     

       122
       122
       -
       FTkJNwmx+3+WV9VeJanGXSjccM/yA/lS14PcD5ic3rm0ttI3xa8FmzePZyH17hQB

     

       123
       123
       -
       R7eawYSrWNErJr3ODd+P8rgXy2PVr3nUdQP+jIgCcbLiGgcFaTtYnAiBXNVzZHrS

     

       124
       124
       -
       xVKyzxECHQAtnkarIzMmVTpm985nwcSEUdj87cqFRwS4LIBDme8q+0lI+WMR0QaG

     

       125
       125
       -
       18wO/70/7jnw1vP8J4Qn6W9dt1GTTBpTnIw+PF552YRQy4V+WSPVcijOp5/8+sdI

     

       126
       126
       -
       DD+g11TtJLpoMsJtqNJS8XCal0LONqN7noXGc15BU9Y8LnhEvs7aG/7R1CEOeR75

     

       127
       127
       -
       ifWnuUIrKj75xg96TPHhwzKKyuhoc2UYf4hhMgDaZhY6YrZ2LAie7CQneh9uWZn9

     

       128
       128
       -
       Ku93UMWB01f/LyVnDrr0scvZG5g0T70h6woYuf3hIoUokma/cck4svcrv19gQ+UA

     

       129
       129
       -
       gw7PbxbL32oaX5TShLh6j13O6UNqwYZbDslnuyp2TJy72TM0m1ESCZqF5BKZXvrB

     

       130
       130
       -
       vvRwIkD5Oi+Y7EJBuT9ZCu3rPyTNoRfxKKAcNV3lSkQx32tucu3IYwYS3twi9y7/

     

       131
       131
       -
       uC0fU8UQw4wDATi91vq6t8+nFMBfuZC4ZklG8ztSbF/G259WpsSuQsprFge3KKBU

     

       132
       132
       -
       oIEde3zdEC5i7U/Tv84ON1iEoTyalDnfPDjoiQI9BBMBCgAnBQJTOyaaAhsvBQkS

     

       133
       133
       -
       zAMABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOgmwP/i9jLD0h

     

       134
       134
       -
       yEyusmJaIo26TW7wlN4gc1rk43AU4WXrlar2nCbW3wd5Mq5sqZPCqmOhGxXdCVP0

     

       135
       135
       -
       Y1bXSunSQnmGWaWRxo/H+rhWYOSwICGnc3JAjSnSHndgHPBkqyw1qGivI92xghT7

     

       136
       136
       -
       WPAn/aBDH/VgQ0LuDPeJReDFc0KFCpnxBql/eBVS5/D25LYyNhFaZcCZJItNzieP

     

       137
       137
       -
       dJfhGdml9NoC92AP2qHTO6UgrmPJKlxDOWIEs8ITwClZp9Y5jWnSY1xhQYPfoa2M

     

       138
       138
       -
       87WbDJRZ9XMrhUyGuqdoADdsnSIKIr+So2QOM3dPsQ/Fq6tkK9tTBlT2n9wHgmuc

     

       139
       139
       -
       uTuT3n27GkFIF5Npz1/TnsGM8WzIsBmfOaUh8DVcurhW0ovmq+drLV15FillcV4r

     

       140
       140
       -
       hAMBLKYquj35BjoxXaX39NKjKe7+Ngh4gUZVeQPeQtQq0jZ4rEd26x5Pj0DH3Jkz

     

       141
       141
       -
       OaphQjS4K1Im9fZ5EL+mJ89AMKGSmMNAGnivIt84CUd6i4sT2a1YxUkq8HKQJpgr

     

       142
       142
       -
       nPMkWpsXpq0+xnr/43CC6vnalEUjrKsT63ToHOQGRxK7RLBbUioBVy0tWKKr3ujp

     

       143
       143
       -
       W9iPefELT8Refw5PIXHXedb8cpr0jmblQ77DM0mXXljQuTjxE9VaakHA+RwBYy0Z

     

       144
       144
       -
       zdMMKKTcUXcHOJJgZ22RTA+07RO5c7NLkC2ziQJABBMBCgAqAhsvBQkSzAMABQsJ

     

       145
       145
       -
       CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCF2AhkBAAoJEAn+RHNOt5kOABMP/2Df

     

       146
       146
       -
       9RUECEKAoxnUQvDpdki0UTEJvgjdQVDonztdpGw7kaquH7KLQBxacIU0J3KDr5Da

     

       147
       147
       -
       60RyKL1InGugbLRIt/iMbLn+ENPsIGOHAJNmIBXvChwUGFzGmSRKxZG921DJmI89

     

       148
       148
       -
       qjtFbK0nSy3m5AUpPAmj3UD+JXGGc5QIxmhOZLcPcY9YGv0oQA51ukiycgy8s4uZ

     

       149
       149
       -
       7SuT+VYk9wMA3EoDlMbh6nwJjaiz9eunlqMF2aB25Ri6SxtXLNJDhuTzEJSVZQTO

     

       150
       150
       -
       k068wBR6271Y5gC6K9+DPqBQeVXoKrFzCFfGmaMAkiK25WFfwqJJKvejkWNi0FwE

     

       151
       151
       -
       tlBKOc3KzCG3rV+0FYu/4rzNL5j9EQuMZIsu+drCz76/hA4j/sWOz1wqwRMf0197

     

       152
       152
       -
       /EqnRVXHPnDIa9h5WbCGTKFbVaXth0bP0EXgCZ1IxFsZh7JjtVSUHYDSfZc61npe

     

       153
       153
       -
       zXshg1JKEk9f4XIW4PoVpjrIKWFMJ0ILsE7GQA/MlW2gK4CpEMAxH8EuXQPXEHA0

     

       154
       154
       -
       yJ1pKdpVfO35ChqYdVBIp/oNkAbYp+hwUe44/TJsWN7ARVioH9JK+EHef+QskZl0

     

       155
       155
       -
       796cQLNW9I5txkOpSQ7cSbEF4SEaCGS/gHVtFo8xCEhVBt2ElBHeQ4Y7B4Zbv62e

     

       156
       156
       -
       yM44mcJTTxP2SoZ/dwyFMUEbJ6PA8HScDLbFZL74tC5KZXJlbWlhaCBTZW5rcGll

     

       157
       157
       -
       bCA8ZmlzaHJvY2sxMjNAcm9ja2V0bWFpbC5jb20+iQIcBBABAgAGBQJYvupKAAoJ

     

       158
       158
       -
       EJVRoLGm4pfOpIQP/36ItdPwRczrB8eH3ifzqXCJXoeOZ8a1Ys/XWtzGp2j7+wwO

     

       159
       159
       -
       PwL/t5YY8oxbZarQr3QX2RRCIiz2Ftjfea3/AN0J+AgFs+0t4zEuBkVX17SUrp5T

     

       160
       160
       -
       Gc8EeyH39KHX2B42VgFmZyQPQMxbg/yTnhH6qUeUuteiZ+mFBhap/od+ORHfZzk4

     

       161
       161
       -
       19ybLpOYPZPjSYw+XKgv+mLt+59h2Tt8fCy1mZUYuQOGb+YJ64Hi4IQAtLdL3x8d

     

       162
       162
       -
       dhhG6pAsXDU5ezb8obHpySQkBqVUOcUWSYPU6p92nM0klXA5QvYuynxl8LRUy1Mx

     

       163
       163
       -
       FL74o7aisQ3CKzIxXFkoAeorYWAAzBVDOIOiI3aEFMxHu0FQIebfI3ln0mCwSCKE

     

       164
       164
       -
       IlrTWdeBFfJ1m9gTmbrA9ljnkMXaTcDWNszCjB9btcxV0nRqQGyEZ9wBFMwrLVy9

     

       165
       165
       -
       cNiJ2qophrha5OmAN2lwVlKUTwTM7zisgpAPs60Z4OPsKUQ0wTjqLp6Xmv2xiTdX

     

       166
       166
       -
       ezBEQPIBGRRcUSwO8dvKt0zRZqYBChIsgWxyTK2a5eeiTpqD4g0W8rSwf7i1GZUl

     

       167
       167
       -
       ZR4PqgeEAuRw8ERz0o9lMuYYLBqnyMnoar+MPF/tewiKgQsiaVwBGsy/UFLP6fEA

     

       168
       168
       -
       BE0cjueF3AtZscR5WU7oT1Qn8DzoVC54GG5QfGmV9bgRmeyon4ksMFl/6SDciQIi

     

       169
       169
       -
       BBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTI5dYQALdHmZ+NlBsDOrGCY/kn

     

       170
       170
       -
       qdsDreLnmHWjoK3cMrU5jkO7PgpZybjlyx7fI0A/q5HP20ZSg6BuqEn2wmLPHW34

     

       171
       171
       -
       Xpdcr14XXjU2fZkRDFV2X4XM30to+MViQLDxcy32qguuC6HhoZBbGGgUHZ9kJQOY

     

       172
       172
       -
       bBb6BerpEsF+5/1kUeLuHDy5BBLHWmU+qt78Qqrp1mOWE06abKpkrdkIR91FVgmQ

     

       173
       173
       -
       a7ILIPjXWfLq/AukgZgv/Pqxq7b8wbSAKn15t7v4NjCtMHYVSfNPyRotO08H7cME

     

       174
       174
       -
       6KxdnIbyVBwoCx0K8CAl3vq2654Z5hy+Y7Cj+ecxXxld8RHpZqzIUaqGaG6bf2gW

     

       175
       175
       -
       uuRpFcOqDUKT7DhHK6Pg+TkyaVoh+K0ORk1B49EPY2v29WGe2TlrUJhgmecVLdi0

     

       176
       176
       -
       ylvHF9FkBsyqxMFFm7Ph4xqa1O6Okyng3KLX/A/Il5qlI90dRCiVUMY8zZd9B1Qm

     

       177
       177
       -
       q2Es15bDdI13YG/9K61eoO94kD6af8w+PAPmTWok7nxr/YlZ8hgo5o8cApyDHOnI

     

       178
       178
       -
       iKF+Kk1NUeZqLjI5Ht0dzcCyE1+Kjqh8EGQFAN4AijT2ERApj1ipRqs/KxDpoUkJ

     

       179
       179
       -
       jkJ5V3gfIKfsTZDYLVh5aqm46A2pg8jd8rhF1dZCl8XjUYylSZCrl0bLZkV2/sFS

     

       180
       180
       -
       Y1w5mrUJlwzd5Fp7PhWWbKR4iQI9BBMBCgAnBQJXBCFqAhsvBQkSzAMABQsJCAcD

     

       181
       181
       -
       BRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOMjkP+gL22iXwbP4B4WVRScj5

     

       182
       182
       -
       FFjT0lm3/5nP8Mg+RYL63E66ZLcVH76B63s8le0u7IGtUpj8U4DX6EJx0ihJqROp

     

       183
       183
       -
       o3cZrBKj0OYUz8yUDFk4BnvhqpTmACiBaVBNSlQHdTMT4PR+j3BuWpzOiwthPjYg

     

       184
       184
       -
       tDd7Dm51hsJYg7kuFJWDYPdnP+BqwWksHx75TSLiFWzUXmFRaAvLFUIxu+9/fptd

     

       185
       185
       -
       ITHKAOBkJRAInAd/NcAiJBjDFTYjqqztST6xv5cJgtDSpR1Nd+dw5A+y+cfcN1vm

     

       186
       186
       -
       3prZgpKbj5F40q9kDqE5GHJB3gEMh9PF+SPdPeudkafLPU7tQ5x6yo/82NyH1Vvz

     

       187
       187
       -
       mPJ9S5fBK5NWvhs2WIvtnU+3DiCbDX+m1lVDJzusuBAJKvR4Qku+CT2OcjONpNpv

     

       188
       188
       -
       09MwOro075fgKmFrtssOexDPp82k28qrA14HjuRH3I0Af4KfGhU3cL4DE1GB0nib

     

       189
       189
       -
       QSjPGp516eiQtU2YTZUDrONNfquNIbKAVmHsW8+JCXS3Mxn4ShWv4+rG3bcVMKAC

     

       190
       190
       -
       hi0bm+/U8lFiIEmB3d+Oa5CFV483pAofbyPbC665t9rS9ihLJDI6684qnK+FmLYO

     

       191
       191
       -
       xuhPT1U4WL9E/+09VpnafrL+vrHXNNhLf/V+uJ+DvqI744j6d3zBlxl7Re5nOGV7

     

       192
       192
       -
       j3jsizc0PAyTfQy1SOvc+1r/iQJABBMBCgAqAhsvBQkSzAMABQsJCAcDBRUKCQgL

     

       193
       193
       -
       BRYCAwEAAh4BAheABQJXBCGnAhkBAAoJEAn+RHNOt5kON3AP/2RfLbVPFTNaNktN

     

       194
       194
       -
       RRBzO3AdX9F5WvvyTuISP1yPXTyirrdTyzr/mYzc9/hj3Cl0aXGmhtTMqyw2RkG4

     

       195
       195
       -
       Xvy/Sz8XlDxDb7+6H+DnNrJvAPaspCL0Nt8xQNKqnfJaQzpWOH9BMuO2DbBSYcdH

     

       196
       196
       -
       gbWtrj7WRVJHMrvkMb+ZxFQBoXGGK1qYRy/APqYLWEA7iwahlkfF9hLsqKxq0QQF

     

       197
       197
       -
       kn/j3C4vir5GX2D5sE6DMTOwbk/WjbR5B7ClsLrcsJOjRQS/VR7bAfmSz5SbQaLG

     

       198
       198
       -
       ODshpWmm02cVBSYFrFy3rI5c1XWsRPUyVMgeV4Xet3IqPIeF2V+fUAa4pAZ/Kum1

     

       199
       199
       -
       D+2+ww04s5ClLxIDDDzQtNMs51Rysp4e+512i3PlFHThpzOdyecTUuJ4rzdlkFab

     

       200
       200
       -
       +xF+GgWb3e2RbWO7cuqsreMNKJZb1B6qLBgpzKkgdhUyh3oWvm5VCGwxyrmI/fgt

     

       201
       201
       -
       PCfhV6W5MrZon9KJ4Bjac6YqurfEJNJNY977N7pe6+bDpCMIVTAzI5Ts0ghcticQ

     

       202
       202
       -
       vMONTPqtEkQ8tBpGglJ5AxdyeRqC1SFinLwcRt+BjB1rgMA0/Jq2/E7ztMdKcWDH

     

       203
       203
       -
       vdX334gTEaNZnlWcHcVh0vEoQAQCKrslnfvHktxbFvkDTC2LpSasjWkelObbVfxz

     

       204
       204
       -
       qpGa21qQV9ZfDn1tpdG/vfz6FTxDuQINBFM7JpoBEAC8b4+YhGkK7yqWzWXMk3oJ

     

       205
       205
       -
       HWN8wYU8GkbURn52jg1yuYS4cJOH9C3T/iKAMsUYGIjIJD384FQX+V/vOJEWo32b

     

       206
       206
       -
       O0L44LHhQtZSxO27Zpm4dp4jGVK0vQTN7w0ov8Eve708nRK+9uHO0S8Y6/6Ex1iB

     

       207
       207
       -
       EfU+4s8vOLMg6jW+D5rfU/y/O6iFbZDJWXDrVLmEM5yViQNR8/EpD67T9+8wBRcE

     

       208
       208
       -
       Bxwa6zeezh3Y9p4GOqK5JLwx8LDrr/mPfgOpLlq8l+yJHSHVz5ZoJLwY8TE4+K+I

     

       209
       209
       -
       7WqtNcuEnDqSHrOocihIwFycY5Rp9Ta+PkjQPssymMfAIQhaBx45SZGwTybp4GB7

     

       210
       210
       -
       j2oQ11dUYQtCBV+8eB8UQQoo5EocZfuSEvFU9kvdmFCt4Q8tebveGm+MHu4FQEox

     

       211
       211
       -
       pplg4ei2F891R38ldG3VlDbjMJJ2oaknvHWsglZZWj0QztCrTC2+7eDq28s9/zKg

     

       212
       212
       -
       4FxDsG+LcFhg4qkABkQZp3s33vWkxWN5Vgm8tvXn3mcibBt07jZhRPjBXSjHJRO3

     

       213
       213
       -
       HYxJGvWm2++Jc1CuQKjvhDR0IzTD+XBHYg4ajmYcpIsGXGQGNOHTWfoi/0AJYYCq

     

       214
       214
       -
       nAm+1kqUHsub2DNccUzZY88n3LSelEMZLYiO1S+yGtbte2LCO0zmIQF4JOyWFkfO

     

       215
       215
       -
       mAEO/Q9QYdTL344e3H0uVQARAQABiQREBBgBCgAPBQJTOyaaAhsuBQkSzAMAAikJ

     

       216
       216
       -
       EAn+RHNOt5kOwV0gBBkBCgAGBQJTOyaaAAoJEEX17r2BPa6OgjMP/1lduIq+zHYM

     

       217
       217
       -
       EWBfdBeOsxZPVc9zt2/XHghbblvsJarQ4blasMiAkJu5R+nnu2DsL5gUvPmOekrk

     

       218
       218
       -
       e3y6/Ioe2SBtLS0i41pKsObpfmoLF5GG3JAoqOgpKcr4WPgZ5Kj+FZDeMnQIIPFA

     

       219
       219
       -
       0XXcDrpiD/IPbtqlrTV/0YtoRQiISNtcvpeAudADAJwROTEcFY+WbVdPs/U4SMui

     

       220
       220
       -
       ixZFZSLvbatrHnm71Hi5zLeZPtjcMMhuGcnl8GBSD/jFz0XaJfImqtiZHnH1nPjk

     

       221
       221
       -
       KcXV7afBZJRJ0dCVyM9uJZmsIqE4OCXDcyTTCZY/V+A0mDxNcfHZl200grdIAmhU

     

       222
       222
       -
       Z74McRpPAvyj0fLdmt3XJ74NaF4rooRibOf/5kwWNoSSThKbpxfdmFrzfPvBS1P6

     

       223
       223
       -
       MtGKfJ/bCq7BUZ1wnDwxSQ2G/X1U9sW2b5XOJX59uI6KZy4qyrp4XWNSJdKiw4qH

     

       224
       224
       -
       qy1z/6H4nk/TQLQ5LL4q7vD0FndpN7eK6DIZYoekC1AC3iXTsKFTIqh09uhpIxeI

     

       225
       225
       -
       j5c/lyjQpm3sWCEoLsGfW20kOPvQiBuo266IPCFoeEZgHHD3RGmB1c7f7Bu2DsHY

     

       226
       226
       -
       5SYGYvNMlU1Yju+ozMi9onLRkLBKE1IJhPUVmTST8Cw6LF7kZuGGLujwMKgBkLWc

     

       227
       227
       -
       z7EdivTjrXc2U+znZupWTxzlM76i02APtQ0QAJB3IZr6yWl0cwtWt25tq0FUlqsf

     

       228
       228
       -
       dZ3S9QfcFrkiv02NISmKKNGhB59sfXBJRXT8C1BjYvA7OG58UYrnE2s5U+g9Nspc

     

       229
       229
       -
       3V9TAKS2xoQYOu/ZGmv9OJi6o6wATbpR58rvK8ppv2cRVsE+rohBGXylISqbFsoP

     

       230
       230
       -
       3MFukjr7ZYsxb4+ck9bPl/aDc/F20Wl95V6rSjbb4vqx0YcfxC5Cr/qh3t9IHW28

     

       231
       231
       -
       fHM9ey7Dsy9QtGgaeqHZ/ffoPMyiEFt+zauIj4iTrru44XhGss1F8NVFvk+INxMC

     

       232
       232
       -
       4cZoO0mNSkGWsb1Y1mXCOj2TdaFRYU+FrhkqJEga9OH4LjAmYl5HnW7jU6VCMQXg

     

       233
       233
       -
       wlOBmIZZlKdMpu/3jYW9dCkrPkOC3o1oYNzERc6PmiE/xVaUtl6XwfydyiWM0RxP

     

       234
       234
       -
       bL5JTcLyjerTHO/qNOVlH+mLXkTGRniZ/tVB0+QvBSvCnXQcxG3ynEIGNOe8QHAx

     

       235
       235
       -
       UvKrV+jnPdzO/cuJZbxEFi1MFn+wW/bFFxqt91V4ZjmvtkpGGWQmPovzH3peKTsP

     

       236
       236
       -
       lv0blKIgSLpdfdk4hqJXiYN8NpUW4gic92tTQGDWOoFZBkOqMS99EdggNCl3cCHF

     

       237
       237
       -
       u/nonTa2Xqzb2AxPl1hEUTs6FonQIKmGwfrqpw+9YiazJDc51UnsBTd+4VEVUiBD

     

       238
       238
       -
       CiiFOkooIgZMny7WmQINBFZypZgBEADeIdm42LaylSWw5CosOAte2m6S9DgAGEBr

     

       239
       239
       -
       g/yHSFTZWz341EZrlq1fghIC9nHh09wVlJNOOo3orB9tYoJ3LArB0MQb7Ha7dcnf

     

       240
       240
       -
       n98O1od0T4QTlEroEeJaOfuElLD+5b9HVYqhdRtMIFiUTfSTbEXbQcvZhaLf3M8a

     

       241
       241
       -
       I1G+poPRYNVRx30pX9PM5N8DDmW8Q/xYg3T1uHuYUmd6HlzBiESNE2WWcJoxoKuQ

     

       242
       242
       -
       R2Lk4Wkt+qYnxdHH0vYIsk9mN0yDySpPEv+kzrAU/UuZ9Ve0GhlLsVLL3yHFUjLQ

     

       243
       243
       -
       Ox1gV/ofrV/v0vcWM3+rRovU1cFPUUv75mzA/TJ8aseAbboAY84RyF0b4jQLOmiT

     

       244
       244
       -
       HWdDMSZwDVR05r82JqynI0GGfXRgztNpnnebiYk5QLAqvUzzdfRMyrU0SSl6VDCX

     

       245
       245
       -
       UQAEz3CyODwJ8GGk6PaTQ9/9vmt3OY4leEEf3SrSwH+l4E8Z59gCvAUx/ao1pIac

     

       246
       246
       -
       PdCd/kdx1mPVcwxTjiPDMp8sIeBSdLt9Lo8jt5m/92nKoH9SnE6L4snJVvB21mfw

     

       247
       247
       -
       RxRj1cWmeZ1+BAC7+5WfcJRM6xhr7XXeEmZO+QQYjLzKS1t+zIsv1modQMl/f2ci

     

       248
       248
       -
       Si1RTO82mIEaCfRBXVEpewsRV+nikjsAJ9FOV+kr4NAUIg6zg9QRiHtTulm3P/c7

     

       249
       249
       -
       iRKFnbdehQARAQABtB1FdmFuIEx1Y2FzIDxldmFubHVjYXNAbWUuY29tPokBHAQQ

     

       250
       250
       -
       AQIABgUCVu4HGAAKCRDCc3kvfYNUXfVmB/9pxeCKnQlj56TKRyKwp1vg1UyWnse+

     

       251
       251
       -
       OF546ILttRf7/6GE5BfmOQZ6S6SnvEr3l7+2QGlV3mPEydKpxwpn4hCWgjwosDNJ

     

       252
       252
       -
       tBxbNLwypMkAGNxkb554Fuj7jU9qg90oX/EqEQpj2nrM1/pjsaDHOF1wH7M7k2fX

     

       253
       253
       -
       sWMCjoC7o6EzS9OzuNlyAlb50t9eUB1ZoaqS3LHaMwoGb/Ou1emZbd2k5Z5zzp+j

     

       254
       254
       -
       cZXHlxPCJ2OCLOtlrnQMW6QrAMF1Me5c3hOy34GhlzkIWJUv7dQk+GGM7/YRIDmY

     

       255
       255
       -
       sSSpyllMU/oSGN8uAwVxfqWi9RAoNqHP68uRKhAJDtsARh1wS91kg65RiQEcBBAB

     

       256
       256
       -
       CAAGBQJXyhfIAAoJEImmV2CeyUCYHYoIAImOHk6YWRJYvC1mq1qnctJuhXoZOt3j

     

       257
       257
       -
       aeF9gIzc9qyPAxf0tChn1g4pmhmBbgZmoIjxHuB1BqgcV1Y2P/1tW8mHJdJNbhy/

     

       258
       258
       -
       ndQl36EgMYzVEt2mbuj01BE/eW12h10KYC1Ul3rXLrhUy/Ig5KUT5aGIrDawx3kx

     

       259
       259
       -
       xDXafsjS7R9hBhwz6M3LujgBvvsyGgN2Crh/h/hERYZ5ckXNlixbjez2cB2DZQFB

     

       260
       260
       -
       vE4eKqBGRAj/Ij2JQljHKt/FczBBhXDCVTW7SSeGi9wPlpgj6w6NsTSiKRCi85s3

     

       261
       261
       -
       BtVAH7zIy0YxxmECUEeqRQ91gQTcg9YqFdhIJY9/ze7xMQKTRWqR2JeJAhwEEAEC

     

       262
       262
       -
       AAYFAli+6tAACgkQlVGgsabil87JwQ/+JT/RooAGS4d5Bg3TyZQOSfw3v4iHyV+V

     

       263
       263
       -
       P1U2lyf4s9/xUiAMw1d6JH1Evu2K5EcS9biC7JcnRNWOGlnxTzShBm9dP+itpeLx

     

       264
       264
       -
       hAEoWjRBYATgWn48PpiUIejWzlkp8ulNR8s3cf7Pj9osXHx4ml8I+bOfESKffilB

     

       265
       265
       -
       a05iaJusPraZvdxkGzI3oPmFY0wMKWq0YPWDosik499ceBZvLku8a49GFPDB0yoe

     

       266
       266
       -
       0QJnYpx7J+Gp84tXO9YiOB2hAZUiLBlEJ7DAxxiFCrzWxhKNVuh5kz9/aJnL2slY

     

       267
       267
       -
       AuifQ3fwIBJvV0fgzwuAgQf0nX14zhlRXnKS04nKfJVcDaZ8FsMliYndvNBImQFY

     

       268
       268
       -
       Xey7HNEZyutEnS1p1BZJRDEc/vp9jBfKyQNU8EO6WZ5gy36CRf1cd8zf3QB/7FlR

     

       269
       269
       -
       WlDxvqrrfrjSwEm/cyA8IEoBbAhUssMMloV1pxtb9mGZZk/QXt6eZTcNTBVZjNQY

     

       270
       270
       -
       VNwnuKPfNfgX3JQ92pwqg+pb23BPi4NRxXBAzupLpcwG1lTC5cG4PLdJtut1LJSu

     

       271
       271
       -
       p+0Fbm0/AesHCXDSpHz/vgmlcAX8feaEzq3TDsj0ZOD/Fn9EN9127WebR41XYQk+

     

       272
       272
       -
       Xj4V70VWy6esS5ECLioir9rIba0KhJlGBKh+AFnMM1nKiv7mzjNfssOuwKC7kSka

     

       273
       273
       -
       +VY9/qqUvFiJAiIEEwEIAAwFAlcNTBIFgweGH4AACgkQ5zvGQcwR9MitRRAAyWkY

     

       274
       274
       -
       hvT5ctDMhxj6KgQVn2Vf+j5d49Zqu5e0piNMDtjoeudTeFFDhEHZPiP04vRre3+d

     

       275
       275
       -
       rPdgUbm7UpFOSh82cIODf/1NhLiSjKL4BKS7UF+boD9vcRbnb9VDzsMnaxyfZ68n

     

       276
       276
       -
       0lAm1hu2GD/At+bfOKFbdvTkDlk6byikMEKAeLROC1+07aQbtscnpJTDqEyi39gN

     

       277
       277
       -
       65SXheghpmDZUrjt3LGlSgeEPncKhL6Dqb5CitEnX02Bs9LG/f9yk4PaiqSkkGsP

     

       278
       278
       -
       3AXLrCRAEloq3+8JhlZI643uz2SYsQPv4PTrCuYhPua3+/nL5ONxJ04vhDwckVb/

     

       279
       279
       -
       hupEdg0hpbWmen0149YcdkGdqnNrL8W2lDFETO1zN0vKO09L0wJ8aSshts6/sU1g

     

       280
       280
       -
       vqDjogPhyL99XMdeaZn1b2czq3J6jTRaKV4fSub54Msm9UbggHhxZrO2LByTPzEk

     

       281
       281
       -
       bCbK4tAwpQm/sZa0/V3ORHGZd1KuwtAn3fkQwNDsrFZl8YdgZk/TAgGR7Iq6DkYp

     

       282
       282
       -
       UG5mtFjOrjRNEmgXDFESJsMmOMlhL/uZJfE0g5qlRkOFfqci5sc9ovy5F2OmrtSG

     

       283
       283
       -
       g7ZTFsG8eF9Cdlem+6iwLVeccHHOjCPRiVfJEIe3VrhZVpMV/MUWjnc3ikzrw+T9

     

       284
       284
       -
       ryio7Y3Zv7VTM9D75nHDD9CBtBjWw9EParmqWS6JAj0EEwEKACcFAlZypZgCGwMF

     

       285
       285
       -
       CQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQtjtTWkwgbKmCbg//VXdM

     

       286
       286
       -
       k2GkmI9QVg7rAfBqMIVbIj4hxTvm+yz3DTutJjzlPHpiQsiA0ezGU8xrohz2s8Ve

     

       287
       287
       -
       M2ICtSBGdWtuDOPN4vudwarno+56nIdwBlZSgPaJDxTU7CTrdEJG7j0xs7VPvmUn

     

       288
       288
       -
       4lJzaWO4TANH+a2VaB4NQSDkr/Y87fxI+Dz0SqIjAe39MEnkJGMl6I6tYpXGQ2CL

     

       289
       289
       -
       pPYpencQ/Ji4HOR6CXAiyIbgVIag5RDB/9cjg6qKJwyTFEoSajmRPtV6esyesAXj

     

       290
       290
       -
       AviBhnn6fFMiL7prU/PZdia0uY/ugyz0QuyCqKPWXHSsHV/3q1+L33ntrqKwy/7u

     

       291
       291
       -
       uKDdaLWBHmXc+e9a6vmIqU5cqgPuJL5s8ZelbM9IW1TrJLbSzk640JGfsLuuHeFa

     

       292
       292
       -
       XM6Jnr7KmXBE6yMMvtJZ4JDsbEHYdPOZDv14If2m0Yw5Fne28VpHTGr5n2NKHmh4

     

       293
       293
       -
       tfzVlogWZ/DzNxBYTSDVYAoy3X8A/oByeEhWQl1plXMSHpaPZGdGcIeui1Yg4RwH

     

       294
       294
       -
       xNnv6a/rUN+4VuUo9y4GFJUypBS+IkpXIm+hCi+wTZpkbZgw6XZ+kJOQmV490yKo

     

       295
       295
       -
       xp6cFMoHDcZrNb79mbR6q9nT5p1SU/JM60IUB2hN8ky8nk468D5xQN9OATmhJpHQ

     

       296
       296
       -
       mwFVfUJOlHxlex39qydECOk86S6LVTdkHJWButiJAkAEEwEKACoCGwMFCQeGH4AF

     

       297
       297
       -
       CwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlZyph4CGQEACgkQtjtTWkwgbKnJPRAA

     

       298
       298
       -
       qjncEbZ3/19r6nbDsYrD48b7X2+IxQtY9Pa7FnF5jqFURcaYa4l+2PhGtfqcAEnj

     

       299
       299
       -
       B0elD9YC6WyEjFSqAcQ6dJ/derE8R+Sj3quaPcXInkQKDbm88UHRAK8ApHeeOS7+

     

       300
       300
       -
       CtUpWEzVlGcRAhwpBxHKVANyQTmM3db5CU0u9waMdNszqw19hU19DWn9qXbjRxbE

     

       301
       301
       -
       Nm+6dVo91yBDdGA7x0plginapUEX8WC/u6mpHdde9CC6pj2aYyLVPoy5C+3e1lzY

     

       302
       302
       -
       CPBI/99DgcoDZ7XYFGYngeNDoM7r8nttJQh4wExdtm2w+4MnNXrQCGQoLQhYiwqK

     

       303
       303
       -
       ayUztMApMt8HrI0UxJ8+Z/FZc/11i5ZQhDrum94liVSoB1FD+wD9xFCE0+eLAbgx

     

       304
       304
       -
       JxxO/Ns4W2mBo3DyUAloNISkxHR580GotAmoEhJcK5vns9pCvztUekA3aPT/8ca6

     

       305
       305
       -
       YZej6Ce5x44L4FfJLqB/zpZTdxOEmeEzhFNGvdPUASpqIpMkk7ZS/7q+ePuL+6S5

     

       306
       306
       -
       yhaE9tSQ+UqPiVHoeolyRwyHdsns+AoGRoekrbEmbGwyencabrfkkzMqAzmblrjo

     

       307
       307
       -
       wR8d2Yt7UjJDsz2khn71Y90j6IJ7hneLT1PaxggfX7TFv9fc7OE8/BtI+/JaJj18

     

       308
       308
       -
       oFIiimequgSNJ/aTeOQ59pdVBhfUTfhWXQDZAsMNdkC0IUV2YW4gTHVjYXMgPGV2

     

       309
       309
       -
       YW5sdWNhc0BrZXliYXNlLmlvPokBHAQQAQIABgUCVu4HGAAKCRDCc3kvfYNUXeF0

     

       310
       310
       -
       CACDdJ1DfgFZGy0j6krl7GF78r6RKjixOOZHBVaVKl+K3sWqbFQxCfVGWJDaxRBO

     

       311
       311
       -
       ACngV8pPdp7Kj3vbWE3lENaaPushB2++8PdkHSAvJohwRLNbhuRmDck/dUy/nw3r

     

       312
       312
       -
       9lFKp2eRr4fkHRdnWelsfxqD5Eye7Id9bOaeIF7XfIcKbK9HRmfs2ZJVWX6tQGVK

     

       313
       313
       -
       LcC6mYk2iIRTnzKBGJ1Jf9fGj+JnBhH31ct4SpNHTq0+85Bo7biG9l6jIrbl14V9

     

       314
       314
       -
       cfIV0ZHGnIrKC4E7r/l0cYX4UPgl92A6J6DqtGi8AWXodtPnQTdZm6kq7zMCX7iN

     

       315
       315
       -
       qkednlohGP5JhwKFvlzhn+OZiQEcBBABCAAGBQJXyhfOAAoJEImmV2CeyUCYd3QH

     

       316
       316
       -
       /AtbL+UtD9Tqcay9nHTeM1aXP/edzjjui2+5nE8+fIWxrFRL4X7Qs9Xps0KQnrY3

     

       317
       317
       -
       n0b7OMxk2cJgI6Bl5gVu83Oz7Pljpp1+W22BXS5a0pU1VNjjsXqW08ICRDnqBzIH

     

       318
       318
       -
       hsoPsUcLPD5v1+cW9O/SO3ucg28sonE7fuVraLc5T3hgxe3AQFYOBsGwypNjO1VV

     

       319
       319
       -
       fWl+PTuyZlHW5+IH1Hv0omIaauEnr81ONu3KGf+ckQW3Qt6D/Nu/DeplA/NANhT6

     

       320
       320
       -
       tlRybWNxFDn3pLfMM0Xn/EoNZAnyd8GArE9j6aRAvVN7pWqr5AbSlhC9Um3/64nc

     

       321
       321
       -
       gTomS+iy4H06o7qODEXlBT2JAhwEEAECAAYFAli+6tAACgkQlVGgsabil87mdQ/+

     

       322
       322
       -
       NPKWzfFwdQVHmQVcm1jFvnQA5VNLGs0pYXwhNYXF0V78FODZi1N7P5Eag4+VvBzE

     

       323
       323
       -
       tMuBfYUwq6ZLxsqlyGXMaHsPdtdJ2S5UBByP7UQzJmEjraUUgpaO210mekrCGSUl

     

       324
       324
       -
       I3quCEiC0+ytaM9bvBh2EeNfupSIknXZ/0aTs+jYMTmttNU9QuFdgEVR21Vx9WC3

     

       325
       325
       -
       0qLdiDnuBBENddGCfDWXGw+n7JulWNQhsxxqbsynRQV4rK9fCGfgLIIf5Mb0VI9p

     

       326
       326
       -
       +hDlKqNtVRQt1S6npE5SU7Ilqgj5SGE6j9ClCh3FOGxxqGhpF6fwk4tl67wmdC7/

     

       327
       327
       -
       JR7zPAb+JtTY/ayRl0QsuqvOMFuAUEG+LE23IhLGpD8VwWdx9hYFn60C2Q/bC2WU

     

       328
       328
       -
       pdS/ZWhkCuA1Gdi+DvLMmSIv5V+o0N2bM7Wv6JwrXIbjg//+aYN1hlTvlj2rOmp+

     

       329
       329
       -
       5iICTLkVUvFgnJeVhES4sVchUnOpLQkTn4JsMGpqX1++UDsUb1cdLW3Br6E1jFm+

     

       330
       330
       -
       EO8yOJJ7Xu10qvVOdhk+H1AhWFTKngsPxp+M92NPFp+ZtkXkZJX+pLzW1YYHL2OJ

     

       331
       331
       -
       JJYxjvo0RhGNuZAzsNGOo6MP0guy0SCf9Z8vLyQxz7GcUlJb0I9xe5oclcw8KiGp

     

       332
       332
       -
       zq5iziLImz8PBQ72FvYTft5GVm6NcEZ9c7o2KudBzkeJAiIEEwEIAAwFAlcNTBIF

     

       333
       333
       -
       gweGH4AACgkQ5zvGQcwR9MiKAxAAlcAV4pEvw0Sj2fBJLEVblqwE+ACLR/reTP+e

     

       334
       334
       -
       sFOCv08zr1EDNPKM3PVqP4jZrPhANa02GmzZEdslgn/PasCmgqxmnHCquyf2gkkT

     

       335
       335
       -
       uPPgdbweYQ6wiR9PWvedNMQhgHySYSO7n4Rxd83isfoUAiwe66FH7r8+T4Z6pOS6

     

       336
       336
       -
       XJocE88eIvh3zghBcaeg70ME0goq6TDhrpGfKhExvMXotyx3iOiqx/vUbmDTvp0g

     

       337
       337
       -
       kQtWcBfX07cyGzgIR0NSqeKFK7F6USUc257uKRCGiaXMwIwFyN7eb+KsdA7+emNG

     

       338
       338
       -
       ChwdIQHOjfEiq7c8LyUGY5Z1ZMMbi2F0WuWQlhpBmKCK29HXCOffkH/NIyMf8VAb

     

       339
       339
       -
       bi56b73y2kwH5KKFb48XpIxMcV0abPCJCsbcgAUmDytTHbLBuPM8VbHWP5uIhto8

     

       340
       340
       -
       Ff68zb75iv6F2nYHDZUJ1EGLWb8tZWacoxd/+Wx9TEAc0S/o25gOG4c1ZwF94b8M

     

       341
       341
       -
       2jsOT2Df1JMcrrQsoIf+mN9wLS1kGbj6tyfKF+k1oWpDmaBQEVgF2vrxMJ/w7wPO

     

       342
       342
       -
       JuHV5CRDRxQPZNbCwo6B8PXyY8oL6vLg0bDP7OLSZL9rF3u7wGShezgz42yCWeii

     

       343
       343
       -
       ErOwBKprp+9zxA2Oahrimgi7Cl9Lhvm4Mti0zHKAXV6O/EIpZX63QAqjJkiNj1FM

     

       344
       344
       -
       uYWsBNuJAj0EEwEKACcFAlZyphUCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQAC

     

       345
       345
       -
       HgECF4AACgkQtjtTWkwgbKkB0g/9GcjCZXIIdEMWfqImVGQif5UN+fo2JWWiu7ZU

     

       346
       346
       -
       URomUadJm5dpiT74u9AtvbVIkIk9TUJT88OYA4FJUparbEKiD1ZUN1Rks3fiCCoY

     

       347
       347
       -
       ElZAUxgWaVMWtiYMetI7sU/GLj9SX/xSa88g5X6CQswkunj7hoReHZ0PWU69Y9fa

     

       348
       348
       -
       1XFpR4ynby2kvoXVEcQdTMXuG/4STWhN9Y8gMiXrlbyne9VQ4b5UmLeIVLL9Xf9H

     

       349
       349
       -
       /Fsj7rHiqstA+IGXFBDyddpdqpHPsLNjTG5GH1ertcbm2mJUeC8uvp+tkUFCIKfH

     

       350
       350
       -
       ZQsMukULwX7mYRlBSmlrr27Q78RtJ/alV0jopeoU2dA24d8/655fBCQBk6NA0gfU

     

       351
       351
       -
       eLgIcmEbiIfVMD0UuOCC/86uIyZ6JjPdo6FT28NcS928yplJWIbTcsHMRLPYsZ9E

     

       352
       352
       -
       GO7JTs+MUwp5E3wGLJescTzBdWnSfhnqWF8JUCjVxUaJ5Tlr6FKcL1dZDXZSV+QT

     

       353
       353
       -
       AT/tzYUNAGnDZQK6LvQ9BNi6ZY7Z0/Trv4cfuiMLJSL3i0ZBbMks5vP5/bLRMhZh

     

       354
       354
       -
       gaDIGJ7ZdpiuQ7vWuX+/LGBdBXzMy9aSpI6m6DNb91bJE9AYTppLjrY2AiRZ526O

     

       355
       355
       -
       uXRVmoAba9+4RuIJZf5I4RYD31FmAa8haMiQqx4ESyVC9EIsw46L0r8fQGp4yOct

     

       356
       356
       -
       /ke7vgG5Ag0EVnKlmAEQALpPU/Kd58YIaCOGMh59cGBLH13dflRycXj4m4wbru0R

     

       357
       357
       -
       q7VtcEC5y9sP8VkA5ziwJfUr/If4Ky+9NqbcKJXwiQkYGAiPhWRaU1uL/NC+DDX5

     

       358
       358
       -
       vM5hFW2HnvGHnxIdQ0cimXtxwUsw6GYKNR8BqTrEL89V/Re0rXfZmP64RPwST320

     

       359
       359
       -
       Jl+nFpm5GZGRy0h1KeXfkCOZXhZv6XhGztJV/EfwmwOm7w8gXyuwZTUk1NVy6MZq

     

       360
       360
       -
       JPcYHm8mPM7ZCesLazc8TZMOCf2MMKz+L9Tg2BysDgEmHxB0fggi6X9TyUZ5Bxkl

     

       361
       361
       -
       vn+K7zKAGqP5nKWku0eiULrVesUm1NvZfaYgs7A6qvIcu6LO5KRk6lMbbWGB1DgW

     

       362
       362
       -
       eymcXrIW85e4cPVFY2BTuN6wBJgEbGkdHL+jDPB69LGq9zGe/f0/hHUEyaD1HqHH

     

       363
       363
       -
       qd9ArrSLAibVcHVTpcVuX2akiCuJ+jit5uwZqJeDUNGFuU57uogKq84zPsN2QUKk

     

       364
       364
       -
       LM1JsGf/ctmcOU/h/K7v/7LrRJTnmUvCnk+YLa4mSUH0tgdEq9QsrcrHlWRd+1jH

     

       365
       365
       -
       LsOS0clOkmlT8zV2tAUNghKSJBQ4cqExid2vh/A0CBITW5DvKbd9QXgRfcWi7CHV

     

       366
       366
       -
       bXwYvrY+RxXaLlWQT4F6/Tt0Gie6ee3OkdGpm6Wyn03Q+L/efqzu0zHyhHz2h7x7

     

       367
       367
       -
       ABEBAAGJAiUEGAEKAA8FAlZypZgCGwwFCQeGH4AACgkQtjtTWkwgbKmagA//YZXg

     

       368
       368
       -
       hn9XaW39IRjnhDnViFFpAcZP75y96aR8IhAsn6dY5IMUllRpmLA0XuwLdTRytcwn

     

       369
       369
       -
       zsCKzkvETkQgWqqMqf9xtNlfhr0l3u42ihlC8bNPzbnOv3wwfwaj09l2h1xLDC0t

     

       370
       370
       -
       /oL+A9rZVgjpfvCl18FLVFpQH1Jb49fRH+tBHq5ZXJSdPXvGT228fMXJq7EECbRR

     

       371
       371
       -
       Z33oLcjjO8e6Osfch/tCiX59YEMxlnuUyMh35/cjH57Lf2WxpJVleJE/YabKOk+K

     

       372
       372
       -
       Una0417UGP3ox8R6/SjCXdTPksmuFPL33NB19Q1UuBeW6+yUr9bOmk2Y5df67dfD

     

       373
       373
       -
       hzendAv2q3JdrL22/auyLX0dQuk8TkWRm6WxxsOttQgRzIBzUJOrRLTAm9W+c821

     

       374
       374
       -
       QiI6SIsY2VMhmlWnp7e+LXrkGbgrHsrDEQvK4TTukkm/o9seN9sPhRMYY8HEZrf3

     

       375
       375
       -
       L+HvaeHSG/vcS/gcMNEDCBCEAuEewvV5fJzqQwzEteE1Hdb8B0GrYEMgPWqPiDXk

     

       376
       376
       -
       WoGdWZw4snv0ABuzND7ZKHTw+Y8bDTwPSIAayq86yZZb7j5LbToQh8qXjd4t388w

     

       377
       377
       -
       TWi34UA56lP0JeRDFoCz5kfusqaXHyaajC6PBfQJvWOmRq0eElkCypjwpSNJeoV9

     

       378
       378
       -
       WM8eCXEvI//zLCCL8wGXBKdNO1sfIqaoPK2zU8+ZAg0EVpWOlAEQAO39kLgWyyQ8

     

       379
       379
       -
       2QCAurbjQr4KM8nOr/Ry4TIAEl4BV5hYkVQlFxvM0cFXOvzm9bSkQolQbJPJXEZX

     

       380
       380
       -
       U/1XOSpovlFGK6lWLALmV/jw/vx8IyARrbPgsi2eUiJacnVSUN5O8tzUOIsLFaCx

     

       381
       381
       -
       hNFGP7HvT+wvoSYfuVoTUL/lGWeQae7EzhWCu5xPVQwexkkT+R58973k2HMm276K

     

       382
       382
       -
       L+/fjlmoeGwY/J94lhXYKJLaJMirG/K+uWJ2tXCGqKt3UIou6/T778VjnQ7xOrjF

     

       383
       383
       -
       vsrP20hA4O0JIGx7HbiwHZrAe3dF0LCZbt30XpkGZbJwqWUW25eM1/RsM0Ikty1U

     

       384
       384
       -
       DLBQrbyXCOtDDzrLdU72S2ZUINKxIEl3RNuEPthSe+RqdMnNaEX68KhDBqsK4Phl

     

       385
       385
       -
       1pYG+UtMgW/ReMntUDb5GXBG5i9M3Y+UhHMu/Gvj4mIiKi6cacEflbIBXF27p6da

     

       386
       386
       -
       x0goIia6ObQlSq9Jcsm1j+ZTktQjJoZ73AGc4PFF5K2808JZp6GALzc0cyQ7u34C

     

       387
       387
       -
       f3MO6aYNkXebPBRlE7w1c8CjCbD5f5i37juNQ4C6UddquOJG6ibQidbfr0kn1lSZ

     

       388
       388
       -
       3Wb2kKahD5X9g9pDnrLmuIjPhbgcmoBqqSyHi87QkzIivdUmMEPFVHpAD1QwdXY9

     

       389
       389
       -
       NVQAUD29hO6/3FNdXfIckV7BfjjYfrtbABEBAAG0IU15bGVzIEJvcmlucyA8bWJv

     

       390
       390
       -
       cmluc0Bnb29nbGUuY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXztn0D/9k

     

       391
       391
       -
       JpQL0eqVj7xr3vPFsBRugEuQB/sbhjVK+E9ZOq+Ssvs9QRSkJAiQrLVVDQZEIx7z

     

       392
       392
       -
       56U67lAOIRyxNeT9eL+9MTNaWop8F9bFyAoD7s/eH6LGA+h5BLK5DfAORJbUwzBm

     

       393
       393
       -
       fqleTgIToU7ckr/83wOyH14KItOz2JGvuo5P209pFNYZ114TCJgtg8aVZRZQCx9y

     

       394
       394
       -
       fOI4kXHy+wHmiPHv2/shnDEISUlfgrmWJgg4fkauQbgD6G9U9Kf0rpJodidWG/dy

     

       395
       395
       -
       TX+j5KsTKmV5XiY/5+0dkN+hjx98QZE6RAmtq58aerirYAntZYMrkknM+1bgJnEG

     

       396
       396
       -
       yKUredZbSIVaYgc9tAUk793aCCD7Ew9JVLl1prP8a1HA+ZeRbzSw6lGmuK+YKSyt

     

       397
       397
       -
       /01Tz6i05Bi7wdDVjiU70r8gR5ZnP/OduOSmvMoFXCq91YzePt+bJioPPIIPX6Z/

     

       398
       398
       -
       1dTpOvBK8AlJwp79Vb/+iyuxATKk6RwRSETSDRcqA8p3yoRSMv+2/OtlyIFU5GxQ

     

       399
       399
       -
       VimdJVHMnwnxJ0OgrqNq+Bsk70qWeqDyJKBBRDm5HkyW59XIZ9B0QEdnFTGsNS89

     

       400
       400
       -
       hfCGyUuNJt7U+uL2cQdf5UWX4FAo8B6UIiqzul2dw8umXCHA+DxuolEoK8JsvSb1

     

       401
       401
       -
       UKnt5qtKUtckbRzkffcQyKNClwqNuZOqahLLjZKvJIkCOQQTAQgAIwUCWJCxOAIb

     

       402
       402
       -
       AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTImAMQAJvksYVm

     

       403
       403
       -
       iDOXoqK6eTTDiGM2DsK57v8z5UajvYhw+Dnc//fobtC13uQxGlMiLYIIWmvmMuFv

     

       404
       404
       -
       rnl+8xiytCOmosNeuoSUcD5CC/vUObwJM7QJlvx6y00onjsdLuHAyM57dmZgFWuj

     

       405
       405
       -
       aI//iyXkkRTCEs7X2JrgkJzE7zCn9P1qLqZ6sGuHfDKSbQs75UV9wOE33cr5O4/r

     

       406
       406
       -
       rE1QvJtHE8kjuqLcDoRPM9to/2j3IelTQHtwKRgNevpzxLpfrdp5O2g06+VETEOB

     

       407
       407
       -
       vriPuaSo88254NWBNEslGjABPrdnLEzRS2UNjAC3A7LKzptsb56znkGj2/I1ZNPc

     

       408
       408
       -
       a0cmUvxao95/roP7JD6w11Oa+V3iYSV+EGYRq9UD+T5nfQPK76/PW9T/GjcFUPON

     

       409
       409
       -
       kr2ItrEZ5vURhz1ChHUkkP9FIfDzZthwsVV8aR3ktM9YzAT6tNhanBWzMDQc/MMm

     

       410
       410
       -
       4Zo4Idh8U1lf/rLrEIDR0RzH8d4uW8T/K0GF7XA6JUO5bFk6+E6MwV3pUtMn/pcm

     

       411
       411
       -
       jJoNuWOJsE8LoGjkaTjIID+DA4tbmVVhegPQjiRayVkIflAFjO1bczoyxU/6J3QN

     

       412
       412
       -
       ePLiLqp3SJSePCa9dCnm7rtRCZ3GwQOKbKMLjBcpCtQAiaMXrxCtE4580JsCZDif

     

       413
       413
       -
       PqQRMqA+pGQgchifOfRdtxYoCJudmNyfiMkutCFNeWxlcyBCb3JpbnMgPG1ib3Jp

     

       414
       414
       -
       bnNAdXMuaWJtLmNvbT6JARwEEAECAAYFAlbuBzsACgkQwnN5L32DVF2YRgf/Y45C

     

       415
       415
       -
       QErahooYrXghHqN0q3Tt7iGuJr/GyLCEcQFkEeUj8G25Q6PdnAWSb5/qm1De7LY8

     

       416
       416
       -
       UcOFDo/seVj5ANNxrVnWXXLlpEZwrtN2CWDVbWEUHxxpDESH+0FrAN1F589bT8DI

     

       417
       417
       -
       L7Vq5z2dh+ulXnymqiGSwQkFzMlZYbrS05/O5+Ljpxv1ZYKQ3N1ulJJi+Z68GTpr

     

       418
       418
       -
       rtkMEns4S+la0cj9Aw/S/94uGvXA82k5mvhKbsqz1nFvnde8QhPyVDTwMCJ0f++J

     

       419
       419
       -
       n1KzPNXnHjzMes+fBuCNVV97jOoPZZF1TMJvJeAOgRqQkxNAEzb7E4W41WMsPRMB

     

       420
       420
       -
       SsoyDiFkFXeoHbp3SYkCHAQQAQgABgUCV+ReKgAKCRAUXU4NeXB5mqlZD/sGvm6o

     

       421
       421
       -
       pVbHlshEu3hmsEzBzWgaa94VFJ21mO5h7joDX+lSM6ozTKjCovklLGybGUj9caUw

     

       422
       422
       -
       3DuZx472HBsATcJH70koSNJcrD5ePzK35YLtkuZq0rWr/o1GxelEzoeJgjmsZqEj

     

       423
       423
       -
       6vGVkyZc6+NW5dBhMcKkITHMrFprq5R9do6v7dYlNbnBySMT1FOTTay1yhoHw3Az

     

       424
       424
       -
       /afTE6DsH0s9MUJExmok1hSn5cpcWQjnY1GeL17UikO7BGaHQD9n3/4+KOX/Ga40

     

       425
       425
       -
       dLUUtBL4sL6l31HlyTbcPO1AQPvHzUdvsBIbZKk7MilzBPz13GLcoMQEQb/UMIqB

     

       426
       426
       -
       dc5M18oHMzckVbOoAMjKujPgP68m7+wYnaj7Xl9uYtfTgj9RtzVsh7JRoWxmPPx1

     

       427
       427
       -
       Rx6VaHO50QkALtrgr0BXuFqjzkVqmb4nEi1OaI4Mv1grBXkoYl48P98MMVNfmtJk

     

       428
       428
       -
       LE45NrHEsZAqOaU4eTeOmcedivTFilku6lKKdkBwLuLr+UHeVDEFCLKPY5jVdEbr

     

       429
       429
       -
       vYnfitDFsY+x/QUKkaLrqEEFgeHCAMUp7mtDXhGgE8j3UY+U6ftrtOgbt3SUF5nB

     

       430
       430
       -
       nFD6aPplWZW8FDlGecVjxuG3NHPCyg92GMa5pIBlnlDnZuS0u4Mc1CpzFgcrg2u4

     

       431
       431
       -
       8kQnpHGHJ7Xo2R7F6r0CLUGayK5lAtxhX43W64kCHAQQAQgABgUCV+VoygAKCRDU

     

       432
       432
       -
       L1Awh3AmJ1dYD/wNSDzkUZpH+5rubJROIdVnR8DNDQkqVZln/ZVWXc8bghK3OlR1

     

       433
       433
       -
       35NmjiFrtvEEudHMxkLdoJBFuDBNR1yf4Y0nJU25El/WehqYzQe/rMNPyJ/uPOmT

     

       434
       434
       -
       P1AQrNUBc1x4nrMJbZq/1yiTst8mJu7ZRnEvM0F1JOy+rDwySNM8918aOuX+ZqNf

     

       435
       435
       -
       vL4oAALkLvLL0x0pj5gdgVu666X29z+wZJ3b4sJKZAuZfYWS9WS+Y7AELu5oiH97

     

       436
       436
       -
       DJo04vgyqcJOpcrNp17B+3yoAxjTHv0jW3xPg3MLfHRx2ZSfnSV7QNc0DWj0KU1i

     

       437
       437
       -
       MaQYRM593BFOXLwJrEw3xiCONnArgrUC7L7DsaveJtuVN8BLKZDT709Bi6p4DpQn

     

       438
       438
       -
       IvsSztiAPapgg+e7Lt/V1f6kWcXub5ga5wTMubZYAlkk61vh5nPAwQymcKyAIMEp

     

       439
       439
       -
       4Q7vrQhqv8/COYRnYhwIrvdPRay4lgLQ0OJz0A3X1RtRlaH7ODOapsrZn0LT5Syc

     

       440
       440
       -
       MDIk76fnhg857jxhfnpWjc3Xp0JB/twaBdvUWWDjpIb5t3d4l4nO5DkXNKfSQEmw

     

       441
       441
       -
       PWKUetQlMjEzPD7B1nPZrmbZNK0RXe21ZfVjHvXXvXiHXp+HT3RxAMNCH4mVX3LR

     

       442
       442
       -
       SQzz8OOEieLFO50vNc4mxDN+AknM0Q7aC1FiEcJtEXdiFkPbtL460R62R4kCHAQQ

     

       443
       443
       -
       AQgABgUCV/Ok/gAKCRCYZCyGIK9H1tkUD/0TnHwIF8sGbrPQWvKNrNSpuTEx8i5P

     

       444
       444
       -
       w/To8yyrI+59abcJSHWh8uYJ/bm7Z9HQsguKF7Fdi2pwWxsjC4ND80x+a9f0DGS6

     

       445
       445
       -
       AoIJDtYXdVInsbaAkBqLp7JMWI0gmCgnTdHRPSmJXM/l0BX0zFAGQbWGC7XBYc8M

     

       446
       446
       -
       cBpjiVMJXyDqYFm9QEBLW9zShB3Pb8y0lEiAPmsCfsnwiOIAFJw7eBtimdYo/e9O

     

       447
       447
       -
       5VAxFFImZ5Yk14nvyUdL80e4RX7O+lZ9JJq0wIz98fmR1aaPcKTQirTuJRLft43g

     

       448
       448
       -
       nFdxeH43REzkqyj+9PB99ewjF16+0RGNWm+vpk5TyM80UGj7Ok/pzkxr82qzQwJi

     

       449
       449
       -
       XDl5XmvgTAuagVeglKqh4onQHtvXTh9sVKg4zJqm/+eesjh0YrNn5qWOWOjtyfCX

     

       450
       450
       -
       3/WlcKBbvZ1X7S0l4mkG7iKAfOB+sgs66Nq2a+sf1EUou4iz40wLfxpz1fB3SLgN

     

       451
       451
       -
       oQQxkB4k7PDntjM6y8FiXRUvELKF46QJ8OIbEjsdDOpY8fA2M1Mwd8WgpcJpFxDj

     

       452
       452
       -
       DYUPW8e6m1KvIwwpkcpYSSVna7KzBGtTCy+3+R/RB6c7MpJgl+sSIt3yL+S22M36

     

       453
       453
       -
       LSW5Yh+gtm7BZS22bEB2NL0kQEDY1S+j4y6qDQmTxR/X904ofsQLj9gJ0gxsQ3w4

     

       454
       454
       -
       cXwFJWEnG2vmZYkCHwQwAQgACQUCWJCxHgIdAAAKCRDnO8ZBzBH0yCq/EADbu9TZ

     

       455
       455
       -
       i8AlVAgk9D1uxMuLGYrSheOlX/NJKVQmyMBLzp4oLNiSSmScUlzXQjRxHOf12pF4

     

       456
       456
       -
       GLrvQZo2VxxoGt+WQlL64n/IT+imVM8qesHuKODtPlHRiltFtK8J+w/WnMXyAq6Y

     

       457
       457
       -
       4WyOYly4ilTPAtkKPW4x12fItB2xB/JEKRW8oeWFe4KXJaq1hImOuSSAObfkkC9+

     

       458
       458
       -
       9wdF39Lu6U8KECOEvCfgaQ2yxCvT6b1tDQjUP8/O3CCFz0/66QJFSNq+/Gmzvkpx

     

       459
       459
       -
       cxpHflqS7vVZuR4lLAhlg9pSH2QEganBDcg4Pm5cZhJiOcAYfjxDtZrXmAYfbF5B

     

       460
       460
       -
       oZZICVmv2K7eXzVdvTv7mkTjynaUehv0W7OTWWsdUHI1qiAtbK/IXfzd6fcNqtyA

     

       461
       461
       -
       CtWIxtWocHrdkZdMS+9Hd/0FGV3aPn3ApyYDsdOmhFgSUF/bmpY0jcW88b0QJtz2

     

       462
       462
       -
       CXl5IIrmqTfmgWWA7NmLj/F0zw3TU5M/NKBtL/wDVHEzfiFEj2uNXFrI5waxbtjk

     

       463
       463
       -
       iwvGLsAb3TIDVBdBhKQWPflHy/kvxaRrQX5Z5HhNJKtFFbk9CfP7p/dFB0VN7FDH

     

       464
       464
       -
       1ANbfLUOhdA5zgI2+zoLcIf54Yx5MD9NlSXMruo4x7+GkqdeDV4JxjeCpeCbjXGE

     

       465
       465
       -
       ZJxwzBcMjR+Q9nJtwlU/FAKyDWgm8b6z5pB8G4kCIgQTAQoADAUCV9/YSAWDB4Yf

     

       466
       466
       -
       gAAKCRCBhnRIn7wSfqyDD/48iOpq+Rm1+oHRdmz0iYdVsyt8E435PtlkW7l6NE0k

     

       467
       467
       -
       1BgGnubLkNbDgbJBbdr3AgTAzotBqAQmAnRLdirlWeCYaTIM0Ng2lYRfWmlmHkcb

     

       468
       468
       -
       1P/f4aBzVjsCz68IzYIrRlsSxg2Imm0klSNN8IGL9Xl7unBS8Gk+1o1/d8HY8y6x

     

       469
       469
       -
       eWkpqcLJ4wVCwuCBbRlxOmp0n0Wk2cPi9KWzKWonb+KwYrfDLKzoxvlcs6B3PPSs

     

       470
       470
       -
       FDyIIdLfwFAHlbJBACWVZHKCNZXG6GsqT/pW+xdcXAhG8a/Is1GCGHBURxtZeLbi

     

       471
       471
       -
       qrcsrtIx0fEQjINKA0v00vPU7OoJF8BGrKntVqHzP6BHaqo4nZzgyOZqIBwH/YIU

     

       472
       472
       -
       X3RJOQNAMKqK10ywYauL6YnOL1rr8DrYrXBHCCmBl6QsQPlmAhHgdPl9ZKiYDpLh

     

       473
       473
       -
       VPSDW+4eXYm4i+IEUJ/GuNZhxjI1V7gjJ/bsKD64qAiGYjPBxfnqM5xNF0p7JiU7

     

       474
       474
       -
       /D4FXUOllNFM8yx5vRzBwo7Q1l5yVlZ80fpcKk99QUrHBuBZ6Hd6tlNRCYiyARwe

     

       475
       475
       -
       Ezzw0tybVpYDQ0Hhp47Mp1tMyuSo4eJwQDExDz9lFlO2uBnmC2OnUrRnpe2D2ZM7

     

       476
       476
       -
       FJUFq+xFIVnPpDC186gDSN3w4h5+pAzokfy1xtGDFm7EUbwLlNwphNG/GE+AJw+R

     

       477
       477
       -
       dIkCMQQTAQoAGwUCVpWOlAIbAwMLCQcDFQoIAh4BAheAAxYCAQAKCRDnO8ZBzBH0

     

       478
       478
       -
       yHnBEACIuAutkvqNa3eWm3WjH50Mkxgvcp1ox9UT6YoUctnBvR7lbZJQIsrtBbV+

     

       479
       479
       -
       DMwN/Z76surTP10Tj6QKDfVz4nL2zka+tlatWDDUujWuC/wSjqSJ4DZnAA9l6m+x

     

       480
       480
       -
       8v3/s/HFB9f+iDRBGjOWXMfcdoePdyVFW0ZbPMceernITA9g5trNfeaXUI1YPVPE

     

       481
       481
       -
       +e7LDawNjB2OEUccOyUVeT3rbZoNJOk4mmlaPgYwG3u65HvlnRyTXn7bQrCBvD+P

     

       482
       482
       -
       61/K4ZxViWVqQYwYFRXi9okhocckGynHxoa4bFnook4P8L8N3qYh/3B0s/XvHF8A

     

       483
       483
       -
       gbTimbo7+kk655eYtG7kxziks+YGQKe0AlBqF0ztaLVjMswQXkYgy9yh5ot5sxmS

     

       484
       484
       -
       Rle1ZJk/A+0vJghVeaE/o+886BzT4YogfYWvZX1vq90vDMqX6RhZzb459jt2L158

     

       485
       485
       -
       APQVbnWk0pNzUAMUudj4zWBGs7LzXjo07nsicKARDO/ratkwV58u9gfYf20ZevCh

     

       486
       486
       -
       pFbrh4WuMCh0zGtFa4Wiwksxauk05iZgYOdwWoIlyjkR4oU1fPOuulKI9qBCMwzd

     

       487
       487
       -
       S+wvcIzdhvoEQoxck6W+DezYEfxWUG4SRcd9a49hgJixb/bZL/DsOwTFGq2arwG/

     

       488
       488
       -
       FCRIvpcBDlazeJUbxQ61WTxGP4btqla5IClHHer9oF+XEkNWv7QlTXlsZXMgQm9y

     

       489
       489
       -
       aW5zIDxteWxlcy5ib3JpbnNAZ21haWwuY29tPokBHAQQAQIABgUCVu4HOwAKCRDC

     

       490
       490
       -
       c3kvfYNUXeyIB/0b87yed4qZ+YYYBGvrm68OP6zanl1XlNfJS9sUMZLlFzvP6RX7

     

       491
       491
       -
       3LzvZTRqMsXCjiimbgU2E069xiSfpozFb/fQl5l4V2981D+rI5MGkxMK9UV8nPTK

     

       492
       492
       -
       wXd6S12CY5Pr+k4452vHEt2lcoEBGlTxEzuvN2OKSKbgThDBVKXH4IXdWa1Bh8I4

     

       493
       493
       -
       U5JwfQykdLeiCXUwURdfyE7Ky+4/aBPvTTIv8nbdOuj+ivrBN2V1+CBKMx4UC71x

     

       494
       494
       -
       RyyiUUnZSOsVnrzgKYZ2ukmljJ/tbknYepZd2CY0pX3f8b1bVUXj6vOjnetPj2fH

     

       495
       495
       -
       6ITbOwEwneHKDA0P7/+gB0Cunbet1xa2d/4FiQIcBBABAgAGBQJYvuq/AAoJEJVR

     

       496
       496
       -
       oLGm4pfOs0MP/3IZxRCUfuwRHrO0tViAz3OH4G0BNOU3qdzKZ2/sDEaZKUbMRgyO

     

       497
       497
       -
       XF+GhHkhAJdB+JrepdlugTKdvgZ8iGwse3ojmxgAGXPtKbi6nP1DrZ6p5vBluCdc

     

       498
       498
       -
       z/MC+LFA2iQUKMbLcj9NUwQW+9/Hw6D/WHs2JALIi6B76sGOtQHrYCpwCtNzCoGE

     

       499
       499
       -
       UsNd/K20FIRkmt2zEOnuDrF59U1Y6439nv+WCtYVg8T41hyKs0H4aNZOGC9CaAbN

     

       500
       500
       -
       mxeNLbTGthsnXsNKVyw3Hvm0wIOOIo5qG7W434a2bULuZVQEHW/LRV4kXuWbg1SL

     

       501
       501
       -
       n2gt+QZrI/eJ+qHnWMzxBFuwqYCGus0zciOmDbKnCwsZxq2kPXFyXz4rZzZoOcpN

     

       502
       502
       -
       jFZ07hpooGzulL6oVz+1QDc1fnatbgeKMQEoRw+4Va1aiYbGQDTsww4knpejEJyS

     

       503
       503
       -
       MlbIy71R5ZOtRKEfu01BIn0MiX+RDQTpV4oY013lkVSHYe+4JcEM4yZy++lVLfea

     

       504
       504
       -
       rRkQi2mdT6aSeIWeb822ptt2REt5QS7MFresD30JLQRAuaJVlQ3NEWntQq+LAwcc

     

       505
       505
       -
       uvubDGwqVLAMK6tmQ43bLEwasZ+AYawc8Q/5SjTylASdyxSJUUK63JyCYfnqdw9s

     

       506
       506
       -
       uCLcSVS4by0NUqS8Gr3++GLlyfZ5Wt5JdjsQfbcTHLdnYJ85g/r6371/iQIcBBAB

     

       507
       507
       -
       CAAGBQJX5F4pAAoJEBRdTg15cHmaWzQP/3TDwyDrjOaXZZrp16rvBcRoXgBmE2l1

     

       508
       508
       -
       idK77k7dyrZ0IdzCdmAeALC0S7b5hnOJCyHj9Si7/qPwBOIdlT2E8+0WkUktsFtr

     

       509
       509
       -
       ZqVgQFYvAWdyxiYMh6s1jvmbPQvq/u1BxZlwlLiPUo+V3NKz+hl890hc3duhIzmJ

     

       510
       510
       -
       7X3SkW4pMFMLI/9H5ulqvvQyAbhXlQ5j50RcgGVpduAJGy37Cc6QxdxUkGXF6FPx

     

       511
       511
       -
       Ne7lhVGmDn6cU8jpZZ05p79cDh3Qh4HsR7SHC2YzxKLIwsdgn41bGbqQOuh/ZXfz

     

       512
       512
       -
       aGC6EsxZWo2QMkeCz9ayNNz3E2QxH7o5TajFCFAwb5HW+ufxGd3O6IY79r1R667g

     

       513
       513
       -
       sTF+W1yo6vMMFpoP/MDEvf2cOzaiJ1JiQ7iq+XkPVDGw72+FzsyzQ+m0ajb31fIQ

     

       514
       514
       -
       zSiW7BdnMjn7IvHOO/2/KvKCLRZMK1H4sUUsERnPOAT6gkL+WIvAboLb6sx/l35S

     

       515
       515
       -
       aHHKIyNSjc8jTR9FxtmTZATjcz6Wj3+MR/4VRr/LZpCc4TG585emJnjoTp5JmQz4

     

       516
       516
       -
       mnU+M1urKh8lNcoJV6oKAEJZmejWs6C1s/UF+7MqfUXh925FE3HDkLfm6R7CWUHc

     

       517
       517
       -
       XrB9FGRwRd1kK2+f9TtQlQOC0tJH9ntufPFkfDpV/oMD5x6UIW9qEWIUlFbPYtMa

     

       518
       518
       -
       DwNrvtY5gwg5iQIcBBABCAAGBQJX5WjFAAoJENQvUDCHcCYnJYIQALbnxsnzyh8L

     

       519
       519
       -
       MXRH0LSM7xuCh1U+xKupAKMC19Yy9sc0HRzYwjdcqY3QbaaxOjexHRHii6hXCUjs

     

       520
       520
       -
       woefVtg6/Xw+NiGaK3VEwK7VGMq4ZBObSJHGmZOzv/NOTOtW07xtsJ5Cta1njbHq

     

       521
       521
       -
       znsklgFW5u/PJ1Id9EsROzm80CDK9ZAhqhT5s7bzBPV4ThDxGyaiDIVXX7TxGkp8

     

       522
       522
       -
       +BQfAzvj6QZgwXfl8pr6ReES/4qL+SyFrQkmz7ZEirhWFnN6dEa4WjHkH0NMasgM

     

       523
       523
       -
       bB5uRuOP5BP2DKYSUpx4J3LHHW0kqhwoJ7y/k2agcMtu2VvorehsmTJYCJroCg/5

     

       524
       524
       -
       drtyHKVu6NCDAir58c5ZLpgSyKCAa/xTUtd7+Yce0HHixwt1LW23iqC3BSKMT9OZ

     

       525
       525
       -
       ZGTDv+khWzM0vTuIobm+KmuCJq3MOXk0OTYkRV4O1JsytQRWhw8w0zw3Ziq0eepw

     

       526
       526
       -
       h+emUey/ammePNuaHBx0MTnV0rgnlqRgTIFK3fC1YJQQ4vi0OqiSDMnCfAO1u6ht

     

       527
       527
       -
       GS6TDULOb3grSQnZBl1IFB1594VsZ6KaMxpA4Ko7Vc1ZlPsvfJdonDEhjZFNa3Ue

     

       528
       528
       -
       z19ZPIKhj8vuxWFwakUVM4g3724F3bjI8H+cbF851n92LM591nR5uYddr/DVK8d6

     

       529
       529
       -
       yW5qYmpUBsLw7CRLTQjNzI0o0iZn6dIKiQIcBBABCAAGBQJX86T5AAoJEJhkLIYg

     

       530
       530
       -
       r0fW1fgQALygE1VC6TN3afQ+UkALedXqZ07b2ypYeL6wE5aSFI3qhTOwcrRFkwll

     

       531
       531
       -
       iZ0Ou0xhKOUkvfMoCfujrpK1VNQQ5LK4OYu64ga5K8WU4AzePgYzPY7Nn5LoSWl7

     

       532
       532
       -
       tXSoxFMuk8AWpIt7XJ9hQqa9PsbDLwvKgQ0ZPkp26dSzx0Epic5lqzy9/u13H6IE

     

       533
       533
       -
       hQDhdHbQlPNSr/JxivIzhvg93k+zFbmreryVp8VN33rWnPdkv7NJs868hNztaBIa

     

       534
       534
       -
       Wm4ZtIoQBEtSsVTJ8llSLJEfwMN0fRNM76skmK1jzmtrnngsHvvZIdU6HwAwisg4

     

       535
       535
       -
       ZLcpsrv0M/MLXH/tjHfdMudnj6HZenkDG07mRvRuNKxFBgoPC5KWrJ63+JqhR35S

     

       536
       536
       -
       D5HfVhl7WWeDS/bsQEWK+hu82Jl0W5uoG7TgIO1S8viKN7Zdcv8NhDjSV9VRaGgC

     

       537
       537
       -
       Nt4KS1lhWIRQZo7hww4Ex/dh0QVbHthnvcwEdn3DbJ7NdjR3hu9howgXzhEZfTgf

     

       538
       538
       -
       c4PyN7h9jgdtbcaL+dQzA1lkSxe0DtVNLurOlTJnUBVHOb0evz9QcqkT0abh3Itr

     

       539
       539
       -
       vpcz8aOoI2r1Jjgtm6toDpELa/9WTHiECW3oxAUrZFrzYigVShWym1FGrz8lk3w2

     

       540
       540
       -
       sDO+A6YqGgN7ar0PdmeaRFUYwNzQmhrKfW4a82gd70s2BEdFAR8CiQIiBBMBCgAM

     

       541
       541
       -
       BQJX39hIBYMHhh+AAAoJEIGGdEifvBJ+SBsQAKgXFN+vYHwj+tRSLYOLU9mzM5Jl

     

       542
       542
       -
       JUeCV1RVxb/hbTh4RdcRJ3Do7WmXt0qTQ+1yMgfvTad84y9w7QA7xI64s3uv3kD4

     

       543
       543
       -
       vWBgw1pLqxix+FIXZTIHNe3OaNkEfcTdMoJyvuWVpOXUz8xbWFZIJke41aA3QJXK

     

       544
       544
       -
       KLy132/NGiieKoYlGgJ4kaXzM4/17qfS1gnfiOw/sAMKna6FlV9qZwxtS3PqeYbV

     

       545
       545
       -
       iZZ5yPIuXb2CD+nG8Fnj98KrZWOI4/YAZiIe16ccCNxcdXjROXHzBdOY1OG/6Np5

     

       546
       546
       -
       c+BtCaG0D+Oa7U5K6ZHfu6TTCo7c+L25ekZp8YGn5Whb2HNzfRjn1NkKmDKxa5ar

     

       547
       547
       -
       hTIHGgB3Zizcf22PwNnrUx3godC20ELTWA4MV/JB596MKp+p6j5hxhoJrZnJl33Y

     

       548
       548
       -
       P1jALLSmO3CukOmRUgw5MPSgaloInO4yyJgL9vmZ71ikPJ4D1sEFeKAia/hvTU+Y

     

       549
       549
       -
       dOb8jg7wtuBrwF+2vgbjbfCzIMvi/7hLJjmDF6qVs6hRjCSQVPPsBXaM4gtrhNOh

     

       550
       550
       -
       ZwNPL70bkg0icsal1Hdua2MXoPmY3eX9g4CatuWcnVu9oL0mtAmAzP1I/gP8OPYd

     

       551
       551
       -
       R5YA7mXSdCp2smutC1hvW/kWyv9SrU7oIu0/e1nkx4O3Xv5LbK1TRXMk4YDrVLrg

     

       552
       552
       -
       nIuFf+gUxkeck51AiQI0BBMBCgAeBQJWlY6UAhsDAwsJBwMVCggCHgECF4ADFgIB

     

       553
       553
       -
       AhkBAAoJEOc7xkHMEfTIB1IP/jd39peJKGZkKeK7X4fUB6CmnxWAWX7aTe4cZA9/

     

       554
       554
       -
       Rpbts7O6LRYaErlabEqYW3RUXIiuqr34Z/2sw9JGaPCmXWBP2d6mwSaCyJW4d8+m

     

       555
       555
       -
       rv+BzAcoWjdf6XdohLCNp/9XwAsE9Pe/i4I1oxLWYRsnlJBEK8ANpseDImiwR4D5

     

       556
       556
       -
       HLnelCEt73Jhl0stDtlALz+4Ex5nq0PL+QYDKE6Ol6Blut3Zr0InL77PLBHcfl6C

     

       557
       557
       -
       TKPs3jbHZVS2zve8Zz2iI73mpqzSkSqB5ZZmdPCof5a1d5Tm+hcfu9VG4xPASuAI

     

       558
       558
       -
       GuB/wLQX9BK7t18LFH7oPej6pn97WmkchnO+SQzhVxG1OKdNNCA8/qikUAxHi+TN

     

       559
       559
       -
       z990hQU8AaUR0LPcmoreY+QZX7EJjn1rpa4KKmxigNGFwiTLqScBekwpIv9VDOoV

     

       560
       560
       -
       EnPJ2MjFfHTXpFED2btey4bKWneisqAgiUxLcBv8h7ibBG/TdgBxmKzofeuDSLRZ

     

       561
       561
       -
       H206wfMhff+YAqADF/Rg8CafZBMErNM1BUNg3IBgwH/GKqsX5Qt2IyVQf3NYAkRX

     

       562
       562
       -
       ZUHWMqB+/TEON3gAkd7ZvYDP1KEINUnVA3xDwztA+bP2tlBnJdLkBis/nOYFZtsi

     

       563
       563
       -
       8AkityhOzVC+7dnKw1QoqwuGBxwJgX9hmqgtETJw0HabXEPosyAngh57iDVFPSaK

     

       564
       564
       -
       4+sntCVNeWxlcyBCb3JpbnMgPG15bGVzYm9yaW5zQGdvb2dsZS5jb20+iQIcBBAB

     

       565
       565
       -
       AgAGBQJYvuq/AAoJEJVRoLGm4pfO3mIQAIIR/5JwKuwuu1H4NYG58A3TXB8Izy2Y

     

       566
       566
       -
       GGrwmF0YfrwLDvHsXMeMkl46PmSWz6qJcs1fnyNwTurP/3qknPEH5spdjyLECXdG

     

       567
       567
       -
       ps1MyeYyEjVFu7cxA5qpvil+TU7tn89mwf4CaHDKi5Li/RsgQT0kcSAX0EQ690rO

     

       568
       568
       -
       m1xOkWjpDas5tfJPXX35e6lPvlzhlRDzVuxRgRzi6CDhMy+KtYyzABpG0xt+ak++

     

       569
       569
       -
       aonL7yWiHoKZGNUmstGR3ZfcvgYa7A/jA3/EPKxovqj5k7KzC0MkUU2OyrhmUK3m

     

       570
       570
       -
       HnY7/hqtc7LLE2HfmBctprZ06fGkgmY+tn8E3sRCT/nncGn4Ur2ovdNtFcwSWvfK

     

       571
       571
       -
       9uGR3N6Sa5OFCVt6Uxgt7yL3PEryDsq7x+ycbtUYr1n0GxMxPQYee0kah1RHqIKk

     

       572
       572
       -
       JaNJuUL4pkgzAEXHZUXoEE09UjoJQRPcebFV42ssONz3ENLFMKUEd6xbzkVWa9RV

     

       573
       573
       -
       h+CPTRLagYkfnpvJd4qSbqeo9bjtFQyqhhfeBekVxzj1bixG6tKQ/mMpqSkLHXFU

     

       574
       574
       -
       WzbNJWBx0yG1LvW/0IfjpkNoTETGii+JeVUD4Z3N0tCXR8tgyatiptZGjp87jfxD

     

       575
       575
       -
       KTF5A5aIZPMQzlNqZdJ6y2MAFvNLtBwqi2Rn1HFP3p5vaEe4XyuVI2QiaR4jFhnD

     

       576
       576
       -
       lYnp2NFwjxz6iQI3BBMBCgAhBQJYkWsOAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B

     

       577
       577
       -
       AheAAAoJEOc7xkHMEfTI8s8QAK1qXN5jxhzPYDLiz4NvjchC5wTNZYD+g74bxyYg

     

       578
       578
       -
       jJOA7u6HIBLwCs3xaptzlYseci9nDsPVZ1fzCDHQemjWHMlFfVeZlK9nc3qyj9BY

     

       579
       579
       -
       woUI1eQgZMGOFYf56gnbDSHOHPzSmQfw1CzDmXHdv4h/5HMT00Q/wJXjN/F1MpjR

     

       580
       580
       -
       fm4vIigHRcZ8cJCHjJOtr9qppRdMQqxYg2KLA/Ly6UO04chkqj643Zmv0UGwlCzA

     

       581
       581
       -
       /yfrZd9LeKDw7WXt2S2M0AslB8J6I8LYXDx4n3ri32G3bQ/ifCIvsTuTsHpqIdAU

     

       582
       582
       -
       CiqQErMSuw5kFQley3YkJEYDuFsNfFrizCq+1JyNlUARGKANUbjLiLgb3pDe1LCk

     

       583
       583
       -
       dCxQTlHhLpd5H2xy6/0SVy9XYzYHR3gRVX0TId14MRspgC/TKE6GvOcu4lP0qd0x

     

       584
       584
       -
       WxbIdO0YW3qjmkCoyAGN0S/842x1RyEbzlSguBIetGh0dpoVc9teSOaotoRO9hv1

     

       585
       585
       -
       LkY1bUroaJLIcJE5M9eihvZIVfzCW5rMAmJ5hT+i83x+3IforsdbCRKatd/T//uQ

     

       586
       586
       -
       8QXv4/Qu9JfhGL9fbN9r4aCR+YgrrqfxWX/5hdJnGvzdh/TqTXo2XSWhhmphiSFC

     

       587
       587
       -
       93EojKtcrHjMuIhTdA4pYVTLkS8AXCD76Lmzxi9K/Fvvanm2WFnsLYjn/PNkbr5U

     

       588
       588
       -
       8URriQI5BBMBCAAjBQJYngOvAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AA

     

       589
       589
       -
       CgkQ5zvGQcwR9MjdFRAApqCfPXRkjRZRdhtCVnT15QbMPPEDyCmwwCgRvfX6+jdv

     

       590
       590
       -
       AUnyGUStKRZ79awehoXvLQGKpaVRiJt2kqt2Y2eK9uyPlNNvkwSd0/+Qpix8pBm1

     

       591
       591
       -
       s1nA/khNTeUpUQ8cIFlsNhBYo91AFKr/qq9DUPX+VKvpUSEwvSn9dsXL2y3baMyp

     

       592
       592
       -
       NaJIS7rEfI5/u3r6eItwu4Gj951H/6M4QXyqLMZhlpRHt4W1GRYPkjzLyw9a2OOJ

     

       593
       593
       -
       GZudX/Vhwk19koM27hF5XNeH2IkG3eILwdjWdQWjaJzZtnfWh3CkYut95se0vreP

     

       594
       594
       -
       K7sFbUauVArs3CtBuAWDZ4+k0K/rY/PP4tSReXhQfZAoVEGEn4wyar1PHgggBStw

     

       595
       595
       -
       7H/Bzb3ZLz5U6gfjThJynzLXd2xbi/Via9s7vOhuiYV5MDVNnfvWrs6q6bG0KXYH

     

       596
       596
       -
       yCcAXHME8ftbo7dgdKzbMSnC13evbRVL9ZnajCXz4cvWEaDUBj4sJUGxfgGIEX/h

     

       597
       597
       -
       7iqv/oGCG9JzGKYtshOFL2MskImzSOmGE8q51Lt0wBC94ZKVYlQnWy0uqhaSZC6j

     

       598
       598
       -
       Sd0Csu2cdAX6kVG01xoiqafZk5Az4YP3U/EiUyZH+HB0rNV/pvmdzC99LZ2LTJKX

     

       599
       599
       -
       y/nRKAG9lNsub8LZCHlVwH02iXNUeogK2hU798Pgjc+BLnYCx3HoN56rXzzKhdS0

     

       600
       600
       -
       P015bGVzIEJvcmlucyAoTm90IHVzZWQgYWZ0ZXIgSmFudWFyeSAyMDE3KSA8bWJv

     

       601
       601
       -
       cmluc0B1cy5pYm0uY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXziHaEACN

     

       602
       602
       -
       U6bIrEP229xDXRmhcx0xQ6nJ30wBbX0uNS7WJXxmyo2AuSfxx2dIjrF3O9UDDHpl

     

       603
       603
       -
       u3hsL6rdaIzYO0tg/Vgy1KJVYhbwpFuOWz/NRW24KbY7mnyq7rx31jmTPCMptM4P

     

       604
       604
       -
       yYv6mC/9j0ZOH+xzOjzmXuE6fuZIB4GCqqlWPBzJiqxh++sRxMejYGe5HVfe0t17

     

       605
       605
       -
       TJNTHk0RKViM8c3bBnQi6RLASUn9wGFI/yPbEE7R0+dPgqLe/10Hrc74vv5RDJhL

     

       606
       606
       -
       UimiyL4hTodhsV9bcaOBio9DiB8gAC9hfYBNw4ps7HaVBnqrJNSPuIMk6boXjtTz

     

       607
       607
       -
       XENBU15BWsyKMUQ2gpBqDcspnHZqRTzNDjplMB6d6pMoKZpLljnflBu+F/kq3TSE

     

       608
       608
       -
       u9JthqxeevAGa+IS8ZGJ/P7HO3b5SDyh/wdIMstTgGrfB3fA0fGfGUUQIqLOZWqW

     

       609
       609
       -
       S+Ud7k4XdydaUeGlfK+1x7/41WYDULad0UlIM/G1Z7FaEJAouBfGM0TAkQnGsA1+

     

       610
       610
       -
       QhUOaIJqUjP2szzfzn/gswr6eYBGwvojVVClbPCvBn3RUB+Y+NgOMKhF/xJiYA38

     

       611
       611
       -
       nYv27TW8MQASoh1prLQsci9gtwoR+MUlA8eCKcf+TyOgVz/f/N271vWSEWesqLj3

     

       612
       612
       -
       wtx37edD10AWgzTFMsNSJMtbBpy1csDgWT7aNwclzIkCOQQTAQgAIwUCWKFlowIb

     

       613
       613
       -
       AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTIvsIQANvVntac

     

       614
       614
       -
       LCksR8dYkAV9syIn8uHzbVTYJPPZ4kq6UW6nR3k+9dbGRL6kBk/YOn0/ib3mVz/q

     

       615
       615
       -
       MPZLFqmoWTkRh3qCGeBLfZtOd4HjLQ5vvpFsnkWmN4BW3Ji/lSeYHyXU5Zv9Z9YO

     

       616
       616
       -
       xbo1y9tOHvhrsre3kh31E9AN5rb9x2KVS3dwfmN4PIx+m0aC6JqfNlf78hDUbGdu

     

       617
       617
       -
       Pm6TkHcmEVfbJT/XqqzUTcJsNVk7047rGxZGo+TxbW8Ri3CPoe7QR/LhQ/IxIPp1

     

       618
       618
       -
       eNu6oMWycY6m7EYhNiagf76j/Jv9T7R5XmRtxZq21z4985cRNC5auooD+apdOiVj

     

       619
       619
       -
       ft3gAbey/DZPhpY6P2Dtzq1MFXdHRfoW5an40Bg5IgnbRhqcg9EY1+182WNB2iaz

     

       620
       620
       -
       ntR43IeNNZXXlkLIVxW4oAG3vq6DV37lwNuOYLTsdGUvbkMd/u1zmecfX9C8wU4/

     

       621
       621
       -
       Exefk676SE1v5shA54UDUvUhaGnDbLZZ66MfiXfitE/RuG3/uFfkxeKc3/CsUKk3

     

       622
       622
       -
       RYbtKA3Ou/0O9C6pKIVCiQhUe/HVSidkk0GAZ3Fq64Cqajd2Byz0QFDHwKv16BSY

     

       623
       623
       -
       +E4mmAWXYw2aV7pO+tivib6XXbLHU/WgJ1qbm/Qr3uo+ZYv4k7f4IwYi0kbSb9nx

     

       624
       624
       -
       tbft90fuq3xmJk/BzY6NZ2f6FIO8aaJzTIGbuQENBFaVjpQBCAC3wjTlC5/jdi2j

     

       625
       625
       -
       nIophctvA8XaqmrQeD6GaLugfCfy1zzU/7LbzGbb0mzPdnF1OT8htQFu+CWNrInU

     

       626
       626
       -
       DqM2sHE0tqx2EQ82KoK9uQduFjyX33GK0FFkQh+cDHkTDSIQkoqx67FHP+jgehv8

     

       627
       627
       -
       rAzpwc/G4QgoWppj+q1GwcPe34WMCazsfUMYyr/+iyw6PY0WZyQNMUgOItwGlvq7

     

       628
       628
       -
       QsYqW2rF8bl6qO8KPlXxXK7f7ERm1ScLvec6W7DbaQcO3KlK+tUgsFVAkHEYwz7M

     

       629
       629
       -
       Gy2ybNN/fHTjS0uB9ODkyRFFGsEXcg1BhJsgHNy+mWTs6dOmtKEZW41BeXL6pgpp

     

       630
       630
       -
       +xQcCfCVABEBAAGJA0QEGAEKAA8FAlaVjpQFCQ8JnAACGwwBKQkQ5zvGQcwR9MjA

     

       631
       631
       -
       XSAEGQEKAAYFAlaVjpQACgkQ3qFjcZdAMaXgNAgAkmmQPq02lPA7cjdkWtbYF0tx

     

       632
       632
       -
       YnnjPcIhj8metii3YseDkfJcsVc5IVDMqg3Ns6W2cudSR9cgfw+Jc5MeVtEgBerR

     

       633
       633
       -
       w6UXAfvGK7khVXe9TFe46Fx1TEJ1rW/hc0lNKNNcJfQhYPIlsjFRiYQEvOi7A9VK

     

       634
       634
       -
       cpatFXqHDRGSvjWnZfavJEpQL7f5eFd/GXzFTNOzKYwTRqOn3ESQEzY65lbORQwb

     

       635
       635
       -
       wTT4V704i6x3aBhwjmqnOMFaPlU69QQgrmPZkaSk+R7NkUS/AcpDFJ5t1L/z2HiK

     

       636
       636
       -
       F/XeG5U6lmDy/Pna0et6jnTFEkDOkMPQSpuV5kVrmYychbWiSbX2xLSnHOWh3un+

     

       637
       637
       -
       D/9zafSr+LbYbKsp8lmSrcucZZeuD7OLJCk5MnGboNzdGuwMmxKmtRSuL+lk9L/k

     

       638
       638
       -
       gNLRIvy4XlgnVycVUDFoKcUCNxgIwN/P7vkEbvfdYVeqcS4QWGyPYh0XdBvDWl3E

     

       639
       639
       -
       Wt5iCyHItkRu4gYwphMuqH0HT1ukilwxwyVi7grJr+b6BAWmfLyWEuN1ewaxNoII

     

       640
       640
       -
       q302TraoPGlbrQb3klqtkiL1i1y6zIbkwsycxkSZ6TX02hKLBB0bvAPBA6wJpL6y

     

       641
       641
       -
       mUrKAJSynTvg0YFmT1A8qdKvpGaIjNx23d8Ak/wxOW0aBjsOXowJbWxAzsjzYWgz

     

       642
       642
       -
       UjHxqjlu5M0L1eAgAjB7uHWM/CQvUKevn3NB/QvvSTxBKF3idebMrGBjeIIbpefM

     

       643
       643
       -
       v4q84+6msPeNpZOAjL86uHi6+Afd/R/eZU36mAuLepEO27M+5Y1dZbtbSsSy85Xb

     

       644
       644
       -
       DPJwdnPnZm9iASoxLdUqKYPTn3P6grmlFR6PaxSlvH4VOwOJZ/00ZocUkwev8xQF

     

       645
       645
       -
       babOCpb8+LhtqHx+4fU36HzPl/DnFclgXwld4yxw8ui7HQahjfvkIM+wdpp/G+2+

     

       646
       646
       -
       iGggWWZZ3aJ8AGx9NgbZg6Tt5VvS8o/B1BQR4li0Lq3qyzINz5tCrlaUXFpAJB/j

     

       647
       647
       -
       l3Gu785wMDCEQb/ea29LIKzfYiqK6KOG9K+VaYi6STifNbkBDQRWlY6UAQgAveYL

     

       648
       648
       -
       9Vh+G8jdNcPxr7oneutYclTxbLDAXcF1cPygn4h71dGrE3tNpbsLxG8K3C8nxQdc

     

       649
       649
       -
       L0NwBnRp5LAF/QNLhxWLbFRnxXlULU9McWc9oUC6VFKSBGOmtdbuyzKneBIri0BT

     

       650
       650
       -
       Xqrjmc4lI3dwvHxRRX1Bf4krbk8UTeM2P5tt6NciJ1yQliXvPk6iHVeP+LWv+k6A

     

       651
       651
       -
       kG6KLn5TVwZjHbEflGcPrwX/1vWQPySp/36kx91t9+xbw/LW+Sa8bxyNvovH8oXQ

     

       652
       652
       -
       aEFmHlk0BhgN1nyftutFpT7FcJfglf6ljXPx5WJynib1baAnu70VsPsL6SVlXxQn

     

       653
       653
       -
       mfNyeS+ts2y7hqJdQwARAQABiQNEBBgBCgAPBQJWlY6UBQkPCZwAAhsiASkJEOc7

     

       654
       654
       -
       xkHMEfTIwF0gBBkBCgAGBQJWlY6UAAoJEJM7AfQLXKlG4xgH/2rkUtqEPcpZHPHT

     

       655
       655
       -
       6Yd6qvyQVLA4YDad7VwIHHI+XtOReq6GbEOlHUJaaQthwobO9HfZ07winb9DeMnM

     

       656
       656
       -
       mx+QY3yrdMidS57vSp0Z1sJsA69UaOCcMO4HEZEoMC4W45YRZhMHJ5V/uL47uCHj

     

       657
       657
       -
       be+Ss7RwGn9+1DrmFApNPQqJ/KYZC4uXJxbS8qStZtcjbEdcKYsoegAdtzXOMaI1

     

       658
       658
       -
       G1YACZgzrPmATp5jQ7xpo4l5YCyCbqH4dDMnUiXDjl4Av2dczX0Jbd9DKpw2U9rL

     

       659
       659
       -
       AsGTbRtEv36hWKDPW9Cb0FcqO9e8w4Mxv6teOip4+WQMgITkoVZ3BOaLi3BYi1NJ

     

       660
       660
       -
       RajTpN60AQ/+O0ElgIoCFsHcVYI4NSWDzmmFXqeE1jllVw2wnA2rO8gp3q0fcjEd

     

       661
       661
       -
       57LjowC3GVFBZfrwKX94G0Jtl4WHtzNUymUxnuz6z35jT6C5ijNNDgd/+uAszaGg

     

       662
       662
       -
       Shp61pl0hFTibIx4rUT4fXYuQhwu+JsYgiE7kLjGG4wNaOP1EqtoBrhR+vud+Obi

     

       663
       663
       -
       2K/iz2wlfbhF45Lrh/om8B795uA2kn42X+FhgYwrf2x++2jkO2McJ3VvZdv5AoVx

     

       664
       664
       -
       zQYkkUb3pJrCPhK/l7Awgf7qpRvrrQcOX+tpnlhJ2keWUSjd1Kk1QcbFPKWQG4kU

     

       665
       665
       -
       nMUcMWp8VG+WCLBu1MleYF5DFAwkGrGQV6pQNdMOs14Qy5xZJoVYrNuL349BYeKr

     

       666
       666
       -
       AxPbkNhNPYxXhdNi35jmXvXIExnoe0scJgcjhcHC9rgX3NOVmD9HEY4MzAZnNLzi

     

       667
       667
       -
       5EUsbtWV1/Sui/tjnojbnCxq7uncPvBZNiMS8voKsFIXXjewhctO+VNLRBbvM18M

     

       668
       668
       -
       JOaK/QJVeR8lwvvsDzly9QcvA8YPpyOZVr83MXl3nk0fkGT0rjZzHzvNhvL0zWSo

     

       669
       669
       -
       LbGK3K95XCBzNHuOUqJCMlRDcdgW43WYMzzpLvMOGSxlm36n4EyncCo4bDMl9OMP

     

       670
       670
       -
       mp78cAZSaannJqbKrGZp4bNzIgnoupPeo3DurGIiTvr0weuQZHymNlqZAg0EV/eG

     

       671
       671
       -
       ZgEQALphDJCKCF/WZ5TWAbw7KOV9GnsowkkebG0GO0fl9a0zwhYJ2ZmcKhSA1skc

     

       672
       672
       -
       hgPYWfeH+KNfj9L/j3aZvKZp2ZbbgPuZh1784G4BAKZ9+PKkEJRLkaFmZkXS270O

     

       673
       673
       -
       DhyflnH6ZyGe3ffSbtPpxSt5ZHX8KIFcg0lZDohK7A7wwNb85Iok3KtF2t/gervc

     

       674
       674
       -
       8MGRKQcrdrBdUfId/Kl4k/jh+oFZsb6PjfvFYkUSqdVIiEyWTnL6pLtOhlOaPJur

     

       675
       675
       -
       QDzy18xnO1K5S/oICkZVtL/PFKnJisVtJbW9kr2CWtnaomxZlgIGW3rXtbU/mdZg

     

       676
       676
       -
       ik/pPY0s6bHoeT2iRAv5NWt84awGR0wEj8oGVX1KXFAWXAg9KPbhrt9SOmM/zYHH

     

       677
       677
       -
       yx0StQz8NESevt6ktTzyN0vFrNbLAj7KH6sR8TgD72jGlybHAm2nM/vaxWWhaFpU

     

       678
       678
       -
       uNYNtpIn4Au+QWv0+Y5rbufGdFi3vsPkAxa22ePKha9Lx8nkFyb43u1utUE5GqTr

     

       679
       679
       -
       VYIkOa4r2CEKBD9icLV7s8YSHFRVh8kRT6b40gA9w4TSW/ecdJMC6d+kjMfAj1NO

     

       680
       680
       -
       R30qPisfPG1Bb62ZOh4Y7SCGcGPqnvjWvMxh1UcRHmKy8PfpWKPdtbR/6oki0htw

     

       681
       681
       -
       OnCI8wFQ4g8HmxpnOfu2hc0yj5+ZgA3jileTfwiadkzkXSWNABEBAAG0JUdpYnNv

     

       682
       682
       -
       biBGYWhuZXN0b2NrIDxnaWJmYWhuQGdtYWlsLmNvbT6JAjkEEwEIACMFAlf3hmYC

     

       683
       683
       -
       GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRCwH7uSghxYerFZD/4yuqSl

     

       684
       684
       -
       Hdrm+1PPnen6mBT/VcBGvz88hJMgsD3r0Vlnidpc/JSlggJWdUyCziwW7tfwPkjS

     

       685
       685
       -
       1JSZUMPXNAffn53xKDF3nYCCseDWBdrwPJzc09qYbXIPmtUH/5B2ETzfiSW+z+Ub

     

       686
       686
       -
       9hmsBJDVWtEfrFWZ0ECcYQ/X2MnbFJAYqJ3OzejRKPc5nyAyVZFgnGbL6eeG64oZ

     

       687
       687
       -
       lZvpT5xBc/xsxPN/hHGGCaLrqyeYvd9999rxgaD+EyJbabRtfL3+f2MBleOKHMYO

     

       688
       688
       -
       KeA9i/pWHas7yU9b7ChVZf9L/n2ejVDuYJbskQzH68PyS55P85i+EOBcLKWpKSIP

     

       689
       689
       -
       ORpNDO70dFMi3Q4NIhzSBXWvqsWkqgGW6gkXg9Fdu3BiIz72EdP+UWaHhFesvgq9

     

       690
       690
       -
       u3WQ7BOEJZASJHagN3w7e/hGD+Y10eNdpJSceZMNqBkTDtAu4gCVAIBAr88g3urQ

     

       691
       691
       -
       JWnNr8DfmuVZy6T3lHHlNhy09+BPdXMNe2rCy23HNKx54M3FJRfrNHYyoAyDw8tI

     

       692
       692
       -
       g3izFJDkPAOgWMZ7MO3RIXP5/Wxks5fVlDq+pJ4YrhLczS2bzoxo0PcXwh7WjWD9

     

       693
       693
       -
       PGtkdVpJh0teGmQTE4TRNbam97QSEEMuMNzqe0T+S9Kcymii7rEYDVCn8Gu2og0E

     

       694
       694
       -
       6rXrq5muYKO67P6e6WSiv9PdFvN2TFMNluxwUrkCDQRX94ZmARAAp8o5b/A2nI5E

     

       695
       695
       -
       BaXq1fGWWEUV8IQdlDLwZnmWCj56Bocs1c2swcsbmw4HlHDRMhIS3tHFYnpvXMwk

     

       696
       696
       -
       hvZbKG8bkCpADRnwT6gvqmwoSiCQRaSuHrs2PbcGeYNCVjmuPMvH8yP2VWJaGxye

     

       697
       697
       -
       rtEkNRcrradu0OdkYhtay2ppZ1EUDGG/ensm8MCuNMR01Btk/DJOpyamJTsGdfFs

     

       698
       698
       -
       DG0mNTfYOD1EVZ2YrjO5GohWIBOy08XwxYPwPP/EF02jSgBbJ3hXA2wsc2OozLz/

     

       699
       699
       -
       iPZA1Ok0PKpwGvfZoJq9TckzGUGHVuEBjqMoQm7MMVYC0vo1X26He8RsqU1Jby/X

     

       700
       700
       -
       OBJS0LLmYP7+RTpEBhJcicUNrl/1Np/8NVR8U0A4LwHCDT/yctSMMZm+zQ+T6T1x

     

       701
       701
       -
       pXtyQx/oNNGScc5rX48766q/6LNYfXTktSVEr1kPpuA8brHenT0zX1C5nTn9DTx/

     

       702
       702
       -
       XWVvn0jVAnriR07PVLjlW2UR8L7puwKsQJZ/oWTpy8gVvfnMRuUDLdmxktIyT8yR

     

       703
       703
       -
       ltGUAWHrkA+b7Phj3RGP5mWq0FgadOBaHsE+lyhZ8sdx4cdFXja9tDeVg3NQ9iCi

     

       704
       704
       -
       kq0DcA3WQRyT8Y48Wpc4eF4MKiROnEudIKNotwdQS9yQwyILgGMLsoyf1ZCCercW

     

       705
       705
       -
       OWM0pGV3xWGRcu8If3DFmPEL+e1FQl8AEQEAAYkCHwQYAQgACQUCV/eGZgIbDAAK

     

       706
       706
       -
       CRCwH7uSghxYerY9EACRtMAzk3Ax3oFTvZi6HLemr6/ptsgppqq9XcsN9F0AEDrs

     

       707
       707
       -
       BaYQK7kHMteX4V4oIQOxrQnZZf1/p+14CFrvhzYq35QxfoaMdV4wX1yG+wF/uhtu

     

       708
       708
       -
       mCBHABhMMnWAZmfT6SbiAxny8FcmgW3Sf+OQeKLcTAP59tEOiUFTE39OYSPnVDxR

     

       709
       709
       -
       dWQHAMJupxrtsdrzho5hZjlLN+asj3YU5twztHr7pk2iZzPKNw4ZBLjrj1NKi4Ly

     

       710
       710
       -
       66KWiJyOFn5PS5texF9sCYw59kedG/kaBbxz4O/5xSYwvW7zGFAOX/cLehpoDwhh

     

       711
       711
       -
       mwmIRJm85brDfjvXldO8ZQZi8GWdKD4WdnRXVUQyRntux2bRseiXkTfN/NTrFYPr

     

       712
       712
       -
       gZvYmNflMdSQKqP1P0rjQpHabfWR6aSqzjtDSKdfj09HXWs3NbvpVnLBOIvInggt

     

       713
       713
       -
       PCU7lWaeIyM0rqvCgl8pRVWWJ0/CCsuTQ71FigPd9ifvu4DIdgj+QAIOGpkEre+u

     

       714
       714
       -
       4RAaaXzvzIRhDtELzsVp7UYGOzZ6TD1M35fmnqu8/jy4I/jOQ0H/6CKBr0tfyzjy

     

       715
       715
       -
       luh/yZ6zHR8uYECpweWWG4T1PhbGUvq5GwB+nODHR1Ag9qk4efHq187DNJTNkGkp

     

       716
       716
       -
       XD/6E+tsVumhHOmMNIB7Rd4+6JNxVsZkhC2OwCAmwrq36YYemlZOuL8qhmYVIpkC

     

       717
       717
       -
       DQRYhpLWARAA6AT3VJMFQPXTVYs9sMW/nt14mkGnrEh70UXg6TqVkO8rsNsi3cXl

     

       718
       718
       -
       Hq+iHsXKI3v4tfMfng+xRdYIvi6NidS1SEXIUwsdrxrPT9omFtYsqQkZfPQu9rKt

     

       719
       719
       -
       Gh8+koltDgHLZORTibZTsnLmKRq2vGyqsk5PHp9e7OhMoxHL0OeBVmnK4i8+n5NW

     

       720
       720
       -
       Z1d5gSIstNyFhDmlVMSL5rgTPDEEVF2J/wcVF9VaaNKqan/arV0e0G4lMo0zf3R1

     

       721
       721
       -
       M978WE9uumnxLDphToHVNi8LGbDSgElJx7EczTHjKkyKKRA9zC1R9SL8bABMpZQN

     

       722
       722
       -
       HxB1daQhCPLnuhm7359qNK/hslwGRQe6ScHkiSpxeJJry34+muaP1ARtSVkAQWRZ

     

       723
       723
       -
       Z46QmReYS/FupXXDI9HghA9jxGxRohIq5Dc48lNbFHrEpbi7LznOH869D2BQTRgJ

     

       724
       724
       -
       /UjU5RKuRaQrm8KbJirGQ6v1FmmPX0oLgv1IUXuqJJ7cubMCrZKeISq60z48FFUz

     

       725
       725
       -
       f38HYIhyhfzSKL3T/r4SLZL9+KQXKhfPbnT17bAx7cqNQZte3sxV1Rl1kp8H8KfS

     

       726
       726
       -
       nS1ZyFxmynts9XKZrzNwCNUGlqZdpwPm132BVWqx4U6fp1rOT80lFxCLQ/Sta0lG

     

       727
       727
       -
       vVc+qEMdVqbDPWWYt6xeLCoUkXNq9VQVKHhE0Iz84ytM7EqnQOFcBgUAEQEAAbQj

     

       728
       728
       -
       SXRhbG8gQS4gQ2FzYXMgPG1lQGl0YWxvYWNhc2FzLmNvbT6JAiIEEgEIAAwFAlia

     

       729
       729
       -
       OQsFgweGH4AACgkQ5zvGQcwR9MjBjxAAtLf1vcDkOsYtU+RCrpfWotwaFoYLRDlc

     

       730
       730
       -
       DIjFLO1bX2TIy1YFXDA9c0x8J5Pbt3wmhtkFojgmaGqvWpCJkb7lnudx9Qi/a2gx

     

       731
       731
       -
       ys7HS9heaUDoYM8kgeXVHJe1UcVi4veOthg8wp/hQJDUuKba1Xw9ujVi1PqbBNCw

     

       732
       732
       -
       5ALJK1iNcFmgjtk4Ab2rgCFHqTr/KOUNtYLs/uI9YOHGnzUAW0SrLgHQFD2B6TWv

     

       733
       733
       -
       kFBsRkR+LrY1xGinzt2V34BWmTgIvivC/DNdibhVoU2tSEj0VFkJuyKNSEj2PLA3

     

       734
       734
       -
       lzaDteCezITqkn0TFpWVkl0NH8c39WV9d9OE60zvTPKfWYteio7VKIQpnCIMGhwr

     

       735
       735
       -
       ojt0RD0EEznmc5UV+RWKRcoWk7B2BqsZxFp94XRBqFjVOmWeK/hMZxoMl7I0V4gk

     

       736
       736
       -
       NyLbPMRyi87ZrVmof+wv7B7Vs8eBKiPDQu9W53bozX4bSf2oyZ3EWSPg+GCCSFc6

     

       737
       737
       -
       NbBfkq8kdyA5LTKGRgxYZseiKaGvAP20AgRVSYhikl1zlcnGtnjjv6PeAAb4PlQc

     

       738
       738
       -
       ANhLLZ27XUVOWAtUdm9WQyGC7ONNKF7VbR1ikT04JaQMHb7a+cSiLlsV27B+9gk0

     

       739
       739
       -
       bqIDSr8LOT1EDYFb4Xpw1eWCHlepbCFGl0MHOSuOzr4MXgZAjPiGrW6fCk7zCFlc

     

       740
       740
       -
       bjfaMmOafUSJAjgEEwEIACwFAliGktYJECPv7+k8TP/+AhsDBQkeEzgAAhkBBAsH

     

       741
       741
       -
       CQMFFQgKAgMEFgABAgAAx9IQANh9VjRLD8cLrsjVgKeC8/ncD6cpk7OqbH5vKjse

     

       742
       742
       -
       56RK0ABpU3ZSS9rzJdT+h3vTnIgRKCUBaw2xcv7oN+GCNT3VJ7MmyF4NyDTOjBiP

     

       743
       743
       -
       o/Wvck1C81n2t4+05INt6AL7Zn5HfeEGWVLo7zbzReCXdm3kmoifYxxwIEnPZeJa

     

       744
       744
       -
       Ly3nJRUlTMWm59lfU88q0RCyBZdI9+muiD7voSIR5Nu6Uf/Erw+YryXcBLlRIG9k

     

       745
       745
       -
       1nML5cAcH1qhvhyu9Fj6B2SeDcBHK37KyxiOmsIY5H1KsX7ijdR1MrLUSIbqODpi

     

       746
       746
       -
       pN4qFHPR+IzDyAWXs2QdEAEruh33SCzYX1rcVpVQU0buARBlGK+XzxwIXUn/V1Ku

     

       747
       747
       -
       2bTRl5eKbgvn4bB6V9fxrUvN3g/mdmB/pGLCt9imEqPcVoiApnLbTJ6HIIFT/rNe

     

       748
       748
       -
       RomqK5iDNG27HjGxofIKbkqhFJ2j/JEBJKpG4DHrVEkup6GTxzAzCHLr6Rkmyp32

     

       749
       749
       -
       LQUq5yrV6u7e7tV6HoyaEDo6ywafAuBTfh3DAcfMandkpFdujGVniGrj9PJ8Ux4/

     

       750
       750
       -
       Jxu1pN151uHifMITuVCkmjrS6gfFzCoSzcQV7yjNecvnse5ipCcyo6QJ2yCkwK+f

     

       751
       751
       -
       u+VcWy5JVw+FOvS44tgGLcsBexPPOtZPxVeZ1GCMVjPawNMjOjmB0jLBA2lmvDJk

     

       752
       752
       -
       iSumuQINBFiGktYBEACvROrJShVGFXjlldqr+DpTMsN7HBirnM7v6esapd1HGJNB

     

       753
       753
       -
       QNhK16vGC6NwD7fpOJ5bn0AzE1RPNKZ/CXOEoCne70M4XuzskUlqR74kwvRcxkV1

     

       754
       754
       -
       WAHN+ABUIOXmfIVQZiQ9bM8FlUFFoW75MXDd8UeaOnMaxOMfYMQn0zCk+0w2o6UH

     

       755
       755
       -
       KtyTJEQ6L9XfFePaxTqxpWlWgDL50JeLPcqQbF5av851xppPqRrrSMat0E4T5I4h

     

       756
       756
       -
       W2m96A4KTCXt0TyrcziYSJ1elhiXZpgJ+ZlwEpk3lD32JDjar49gpcx2Nno4qj2i

     

       757
       757
       -
       Mdx62D2/OxpckLoRNaj25sdgC7JZBzmGGwbuSbE1q5QTwjMInbNccsUmFNECWPBM

     

       758
       758
       -
       vpJK/RC+/Htz8q373t/45W4d7zXNgQxlAKF99NVhZ1EBD5CSy3Q6qPqdrbdJh3Dl

     

       759
       759
       -
       VH/KnFl+hLwxsnjV0VhXPJgsg62TzIGDlS/N6N5C62lj9cCW6biek4QULgN1/Ni0

     

       760
       760
       -
       hedK6aBdzDtpS4CR1s1rca+rgqimrgOtl6qJW3+MSxtiLsDLLDAYsZdhWnuBhUB7

     

       761
       761
       -
       XIyBBtNir5rFibLNjkdxUF4Ug89U99m8vNOFiTaOBjy3rTvF9XtEqY3qg/KSUf75

     

       762
       762
       -
       Wwp4ys1LuA7RoKkNET/WXsGiU47eS0dD6DOQmSKrrAIPfqseW9phJD+hbbrPWQAR

     

       763
       763
       -
       AQABiQI1BBgBCAApBQJYhpLWCRAj7+/pPEz//gIbDAUJHhM4AAQLBwkDBRUICgID

     

       764
       764
       -
       BBYAAQIAAAsJD/0aaHE3/txaeMU1bfDs0nWIBmSrqhVvHEvyzIzWK30D6Nfmv7bP

     

       765
       765
       -
       81hILfa2PfxjIgOCHtdA4xtAqV3G2/+7UeWLKlv0tuiZmx8p8mQkA6MsOnuDR4sW

     

       766
       766
       -
       TQ8Vd0arkTyzlBOwvz/SL8YXDSxWeSAgSSbQ+Ri7XrwwE+BjcWSeKabqmgQ4Hp7L

     

       767
       767
       -
       bQ0IvQ5f+hBWfLvugCgHI/7PRPhQbpallIdQLE7Qoavl8aDG8AqeN6tBLfjn19RR

     

       768
       768
       -
       kottbntbUlSG+WoYk2hYiydZGRlKwkNfcsuaaNF0p9pH0HR6RrsknrqxT+l8DaLm

     

       769
       769
       -
       4BwIMFXjnSuCEPfiJ3kV4bzRRND7iOfokdjJioj4ChrFR6461kDl7zqdkGIqU45q

     

       770
       770
       -
       Q+aklo0WTFvfiiTrsMXLpIhrCNn8oGST0eM8u3GCfmMFbxhO897NTDYnz1wOMcXu

     

       771
       771
       -
       MVqJ489aDKKvEV8zLljjUjJiZVDnbq0QE1abzVdmBtJRA3732buBwrzlHL5z4Bca

     

       772
       772
       -
       Zwe1bQsPHAzyC9EpJn7PtJcdDkfBk1PsGWx9cmPvqvX1Xbm8UoVie0x+wge5SM77

     

       773
       773
       -
       5JeDdR41lHndWw67Ry59GgQapkOoargTqKyNYMYAxZBqKvdvIhS8jdAt5ldagJpV

     

       774
       774
       -
       quRCpSq91OAxMG0TFGCBXKjtqzsHk58WtAalk49TvO/0r0inTnfWSORiKQ==

     

       775
       775
       -
       =jVEm

     

       776
       776
       -
       -----END PGP PUBLIC KEY BLOCK-----

+4 -5

pkgs/development/web/nodejs/nodejs.nix

···

       25
       25
        
         jq,

     

       26
       26
        
         curl,

     

       27
       27
        
         common-updater-scripts,

     

       28
       28
       -
         nix,

     

       29
       28
        
         runtimeShell,

     

       30
       29
        
         gnupg,

     

       31
       30
        
         installShellFiles,

     
···

       520
       519
        
             passthru.updateScript = import ./update.nix {

     

       521
       520
        
               inherit

     

       522
       521
        
                 writeScript

     

       522
       522
       +
                 common-updater-scripts

     

       523
       523
        
                 coreutils

     

       524
       524
       -
                 gnugrep

     

       525
       525
       -
                 jq

     

       526
       524
        
                 curl

     

       527
       527
       -
                 common-updater-scripts

     

       525
       525
       +
                 fetchurl

     

       526
       526
       +
                 gnugrep

     

       528
       527
        
                 gnupg

     

       529
       529
       -
                 nix

     

       528
       528
       +
                 jq

     

       530
       529
        
                 runtimeShell

     

       531
       530
        
                 ;

     

       532
       531
        
               inherit lib;

-18

pkgs/development/web/nodejs/update-keyring

···

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

     

       2
       2
       -
       #! nix-shell --pure -i bash -p coreutils findutils gnupg curl

     

       3
       3
       -
       

     

       4
       4
       -
       # https://github.com/nodejs/node#release-team

     

       5
       5
       -
       HOME=`mktemp -d`

     

       6
       6
       -
       keyserver="pool.sks-keyservers.net"

     

       7
       7
       -
       cat << EOF | xargs -P 4 -n 1 gpg --keyserver $keyserver --recv-keys

     

       8
       8
       -
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5

     

       9
       9
       -
       FD3A5288F042B6850C66B31F09FE44734EB7990E

     

       10
       10
       -
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1

     

       11
       11
       -
       DD8F2338BAE7501E3DD5AC78C273792F7D83545D

     

       12
       12
       -
       C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8

     

       13
       13
       -
       B9AE9905FFD7803F25714661B63B535A4C206CA9

     

       14
       14
       -
       56730D5401028683275BD23C23EFEFE93C4CFFFE

     

       15
       15
       -
       77984A986EBC2AA786BC0F66B01FBB92821C587A

     

       16
       16
       -
       EOF

     

       17
       17
       -
       

     

       18
       18
       -
       gpg -a --export > nodejs-release-keys.asc

+26 -14

pkgs/development/web/nodejs/update.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         writeScript,

     

       4
       4
       +
         common-updater-scripts,

     

       4
       5
        
         coreutils,

     

       5
       6
        
         curl,

     

       7
       7
       +
         fetchurl,

     

       6
       8
        
         gnugrep,

     

       9
       9
       +
         gnupg,

     

       7
       10
        
         jq,

     

       8
       8
       -
         gnupg,

     

       9
       9
       -
         common-updater-scripts,

     

       10
       11
        
         majorVersion,

     

       11
       11
       -
         nix,

     

       12
       12
        
         runtimeShell,

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
       +
       let

     

       16
       16
       +
         rev = "08bb3693621796b22511e56b8418737bd116d70b"; # should be the HEAD of nodejs/release-keys

     

       17
       17
       +
         pubring = fetchurl {

     

       18
       18
       +
           url = "https://github.com/nodejs/release-keys/raw/${rev}/gpg/pubring.kbx";

     

       19
       19
       +
           hash = "sha256-j7auIjCzRV7GoX8jdtqHFniwmWWTBoRNmRYWWPFSJ/k=";

     

       20
       20
       +
         };

     

       21
       21
       +
       in

     

       15
       22
        
       writeScript "update-nodejs" ''

     

       16
       23
        
         #!${runtimeShell}

     

       24
       24
       +
       

     

       25
       25
       +
         set -e

     

       26
       26
       +
         set -o pipefail

     

       27
       27
       +
       

     

       17
       28
        
         PATH=${

     

       18
       29
        
           lib.makeBinPath [

     

       19
       30
        
             common-updater-scripts

     

       20
       31
        
             coreutils

     

       21
       32
        
             curl

     

       22
       33
        
             gnugrep

     

       23
       23
       -
             jq

     

       24
       34
        
             gnupg

     

       25
       25
       -
             nix

     

       35
       35
       +
             jq

     

       26
       36
        
           ]

     

       27
       37
        
         }

     

       28
       38
        
       

     

       29
       29
       -
         HOME=`mktemp -d`

     

       30
       30
       -
         cat ${./nodejs-release-keys.asc} | gpg --import

     

       31
       31
       -
       

     

       32
       32
       -
         tags=`curl --silent https://api.github.com/repos/nodejs/node/git/refs/tags`

     

       33
       33
       -
         version=`echo $tags | jq -r '.[] | select(.ref | startswith("refs/tags/v${majorVersion}")) | .ref' | sort --version-sort  | tail -1 | grep -oP "^refs/tags/v\K.*"`

     

       39
       39
       +
         version=`\

     

       40
       40
       +
           curl --silent https://api.github.com/repos/nodejs/node/git/refs/tags | \

     

       41
       41
       +
           jq -r '.[] | select(.ref | startswith("refs/tags/v${majorVersion}")) | .ref' | \

     

       42
       42
       +
           sort --version-sort | \

     

       43
       43
       +
           tail -1 | \

     

       44
       44
       +
           grep -oP "^refs/tags/v\K.*"`

     

       34
       45
        
       

     

       35
       35
       -
         curl --silent -o $HOME/SHASUMS256.txt.asc https://nodejs.org/dist/v''${version}/SHASUMS256.txt.asc

     

       36
       36
       -
         hash_hex=`gpgv --keyring=$HOME/.gnupg/pubring.kbx --output - $HOME/SHASUMS256.txt.asc | grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"`

     

       37
       37
       -
         hash=`nix-hash --type sha256 --to-base32 ''${hash_hex}`

     

       46
       46
       +
         hash_hex=`

     

       47
       47
       +
           curl --silent "https://nodejs.org/dist/v''${version}/SHASUMS256.txt.asc" | \

     

       48
       48
       +
           gpgv --keyring="${pubring}" --output - | \

     

       49
       49
       +
           grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"`

     

       38
       50
        
       

     

       39
       39
       -
         update-source-version nodejs_${majorVersion} "''${version}" "''${hash}"

     

       51
       51
       +
         update-source-version nodejs_${majorVersion} "''${version}" "''${hash_hex}"

     

       40
       52
        
       ''

+135 -19

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2025.4.4";

     

       5
       5
       +
         version = "2025.5.0";

     

       6
       6
        
         components = {

     

       7
       7
        
           "3_day_blinds" =

     

       8
       8
        
             ps: with ps; [

     
···

       15
       15
        
             ps: with ps; [

     

       16
       16
        
               aioacaia

     

       17
       17
        
               aioesphomeapi

     

       18
       18
       +
               aiohasupervisor

     

       18
       19
        
               aioruuvigateway

     

       19
       20
        
               aioshelly

     

       20
       21
        
               aiousbwatcher

     
···

       116
       117
        
           "airthings_ble" =

     

       117
       118
        
             ps: with ps; [

     

       118
       119
        
               aioesphomeapi

     

       120
       120
       +
               aiohasupervisor

     

       119
       121
        
               aioruuvigateway

     

       120
       122
        
               aioshelly

     

       121
       123
        
               aiousbwatcher

     
···

       331
       333
        
           "aranet" =

     

       332
       334
        
             ps: with ps; [

     

       333
       335
        
               aioesphomeapi

     

       336
       336
       +
               aiohasupervisor

     

       334
       337
        
               aioruuvigateway

     

       335
       338
        
               aioshelly

     

       336
       339
        
               aiousbwatcher

     
···

       470
       473
        
               aiobotocore

     

       471
       474
        
               botocore

     

       472
       475
        
             ];

     

       476
       476
       +
           "aws_s3" =

     

       477
       477
       +
             ps: with ps; [

     

       478
       478
       +
               aiobotocore

     

       479
       479
       +
             ];

     

       473
       480
        
           "axis" =

     

       474
       481
        
             ps: with ps; [

     

       475
       482
        
               aiohasupervisor

     
···

       513
       520
        
           "baidu" =

     

       514
       521
        
             ps: with ps; [

     

       515
       522
        
             ]; # missing inputs: baidu-aip

     

       523
       523
       +
           "balay" =

     

       524
       524
       +
             ps: with ps; [

     

       525
       525
       +
             ];

     

       516
       526
        
           "balboa" =

     

       517
       527
        
             ps: with ps; [

     

       518
       528
        
               pybalboa

     
···

       572
       582
        
           "bluemaestro" =

     

       573
       583
        
             ps: with ps; [

     

       574
       584
        
               aioesphomeapi

     

       585
       585
       +
               aiohasupervisor

     

       575
       586
        
               aioruuvigateway

     

       576
       587
        
               aioshelly

     

       577
       588
        
               aiousbwatcher

     
···

       619
       630
        
           "bluetooth_adapters" =

     

       620
       631
        
             ps: with ps; [

     

       621
       632
        
               aioesphomeapi

     

       633
       633
       +
               aiohasupervisor

     

       622
       634
        
               aioruuvigateway

     

       623
       635
        
               aioshelly

     

       624
       636
        
               aiousbwatcher

     
···

       644
       656
        
           "bluetooth_le_tracker" =

     

       645
       657
        
             ps: with ps; [

     

       646
       658
        
               aioesphomeapi

     

       659
       659
       +
               aiohasupervisor

     

       647
       660
        
               aioruuvigateway

     

       648
       661
        
               aioshelly

     

       649
       662
        
               aiousbwatcher

     
···

       748
       761
        
           "bthome" =

     

       749
       762
        
             ps: with ps; [

     

       750
       763
        
               aioesphomeapi

     

       764
       764
       +
               aiohasupervisor

     

       751
       765
        
               aioruuvigateway

     

       752
       766
        
               aioshelly

     

       753
       767
        
               aiousbwatcher

     
···

       942
       956
        
             ps: with ps; [

     

       943
       957
        
             ];

     

       944
       958
        
           "configurator" =

     

       959
       959
       +
             ps: with ps; [

     

       960
       960
       +
             ];

     

       961
       961
       +
           "constructa" =

     

       945
       962
        
             ps: with ps; [

     

       946
       963
        
             ];

     

       947
       964
        
           "control4" =

     
···

       1223
       1240
        
           "dormakaba_dkey" =

     

       1224
       1241
        
             ps: with ps; [

     

       1225
       1242
        
               aioesphomeapi

     

       1243
       1243
       +
               aiohasupervisor

     

       1226
       1244
        
               aioruuvigateway

     

       1227
       1245
        
               aioshelly

     

       1228
       1246
        
               aiousbwatcher

     
···

       1304
       1322
        
               dynalite-devices

     

       1305
       1323
        
               dynalite-panel

     

       1306
       1324
        
               home-assistant-frontend

     

       1307
       1307
       -
               pillow

     

       1308
       1325
        
             ];

     

       1309
       1326
        
           "eafm" =

     

       1310
       1327
        
             ps: with ps; [

     
···

       1490
       1507
        
             ];

     

       1491
       1508
        
           "ephember" =

     

       1492
       1509
        
             ps: with ps; [

     

       1493
       1493
       -
               pyephember

     

       1510
       1510
       +
               pyephember2

     

       1494
       1511
        
             ];

     

       1495
       1512
        
           "epic_games_store" =

     

       1496
       1513
        
             ps: with ps; [

     
···

       1507
       1524
        
           "eq3btsmart" =

     

       1508
       1525
        
             ps: with ps; [

     

       1509
       1526
        
               aioesphomeapi

     

       1527
       1527
       +
               aiohasupervisor

     

       1510
       1528
        
               aioruuvigateway

     

       1511
       1529
        
               aioshelly

     

       1512
       1530
        
               aiousbwatcher

     
···

       1540
       1558
        
           "esphome" =

     

       1541
       1559
        
             ps: with ps; [

     

       1542
       1560
        
               aioesphomeapi

     

       1561
       1561
       +
               aiohasupervisor

     

       1543
       1562
        
               aiousbwatcher

     

       1544
       1563
        
               bleak

     

       1545
       1564
        
               bleak-esphome

     
···

       1570
       1589
        
           "eufylife_ble" =

     

       1571
       1590
        
             ps: with ps; [

     

       1572
       1591
        
               aioesphomeapi

     

       1592
       1592
       +
               aiohasupervisor

     

       1573
       1593
        
               aioruuvigateway

     

       1574
       1594
        
               aioshelly

     

       1575
       1595
        
               aiousbwatcher

     
···

       1706
       1726
        
           "fjaraskupan" =

     

       1707
       1727
        
             ps: with ps; [

     

       1708
       1728
        
               aioesphomeapi

     

       1729
       1729
       +
               aiohasupervisor

     

       1709
       1730
        
               aioruuvigateway

     

       1710
       1731
        
               aioshelly

     

       1711
       1732
        
               aiousbwatcher

     
···

       1851
       1872
        
           "frontend" =

     

       1852
       1873
        
             ps: with ps; [

     

       1853
       1874
        
               home-assistant-frontend

     

       1854
       1854
       -
               pillow

     

       1855
       1875
        
             ];

     

       1856
       1876
        
           "frontier_silicon" =

     

       1857
       1877
        
             ps: with ps; [

     
···

       1878
       1898
        
             ps: with ps; [

     

       1879
       1899
        
               fyta-cli

     

       1880
       1900
        
             ];

     

       1901
       1901
       +
           "gaggenau" =

     

       1902
       1902
       +
             ps: with ps; [

     

       1903
       1903
       +
             ];

     

       1881
       1904
        
           "garadget" =

     

       1882
       1905
        
             ps: with ps; [

     

       1883
       1906
        
             ];

     
···

       1888
       1911
        
           "gardena_bluetooth" =

     

       1889
       1912
        
             ps: with ps; [

     

       1890
       1913
        
               aioesphomeapi

     

       1914
       1914
       +
               aiohasupervisor

     

       1891
       1915
        
               aioruuvigateway

     

       1892
       1916
        
               aioshelly

     

       1893
       1917
        
               aiousbwatcher

     
···

       2031
       2055
        
               python-google-drive-api

     

       2032
       2056
        
               securetar

     

       2033
       2057
        
             ];

     

       2058
       2058
       +
           "google_gemini" =

     

       2059
       2059
       +
             ps: with ps; [

     

       2060
       2060
       +
             ];

     

       2034
       2061
        
           "google_generative_ai_conversation" =

     

       2035
       2062
        
             ps: with ps; [

     

       2036
       2063
        
               google-genai

     
···

       2071
       2098
        
             ];

     

       2072
       2099
        
           "google_travel_time" =

     

       2073
       2100
        
             ps: with ps; [

     

       2074
       2074
       -
               googlemaps

     

       2101
       2101
       +
               google-maps-routing

     

       2075
       2102
        
             ];

     

       2076
       2103
        
           "google_wifi" =

     

       2077
       2104
        
             ps: with ps; [

     
···

       2079
       2106
        
           "govee_ble" =

     

       2080
       2107
        
             ps: with ps; [

     

       2081
       2108
        
               aioesphomeapi

     

       2109
       2109
       +
               aiohasupervisor

     

       2082
       2110
        
               aioruuvigateway

     

       2083
       2111
        
               aioshelly

     

       2084
       2112
        
               aiousbwatcher

     
···

       2316
       2344
        
           "homekit_controller" =

     

       2317
       2345
        
             ps: with ps; [

     

       2318
       2346
        
               aioesphomeapi

     

       2347
       2347
       +
               aiohasupervisor

     

       2319
       2348
        
               aiohomekit

     

       2320
       2349
        
               aioruuvigateway

     

       2321
       2350
        
               aioshelly

     
···

       2406
       2435
        
           "husqvarna_automower_ble" =

     

       2407
       2436
        
             ps: with ps; [

     

       2408
       2437
        
               aioesphomeapi

     

       2438
       2438
       +
               aiohasupervisor

     

       2409
       2439
        
               aioruuvigateway

     

       2410
       2440
        
               aioshelly

     

       2411
       2441
        
               aiousbwatcher

     
···

       2461
       2491
        
           "ibeacon" =

     

       2462
       2492
        
             ps: with ps; [

     

       2463
       2493
        
               aioesphomeapi

     

       2494
       2494
       +
               aiohasupervisor

     

       2464
       2495
        
               aioruuvigateway

     

       2465
       2496
        
               aioshelly

     

       2466
       2497
        
               aiousbwatcher

     
···

       2491
       2522
        
           "idasen_desk" =

     

       2492
       2523
        
             ps: with ps; [

     

       2493
       2524
        
               aioesphomeapi

     

       2525
       2525
       +
               aiohasupervisor

     

       2494
       2526
        
               aioruuvigateway

     

       2495
       2527
        
               aioshelly

     

       2496
       2528
        
               aiousbwatcher

     
···

       2552
       2584
        
             ps: with ps; [

     

       2553
       2585
        
               aioimaplib

     

       2554
       2586
        
             ];

     

       2587
       2587
       +
           "imeon_inverter" =

     

       2588
       2588
       +
             ps: with ps; [

     

       2589
       2589
       +
               imeon-inverter-api

     

       2590
       2590
       +
             ];

     

       2555
       2591
        
           "imgw_pib" =

     

       2556
       2592
        
             ps: with ps; [

     

       2557
       2593
        
               imgw-pib

     
···

       2559
       2595
        
           "improv_ble" =

     

       2560
       2596
        
             ps: with ps; [

     

       2561
       2597
        
               aioesphomeapi

     

       2598
       2598
       +
               aiohasupervisor

     

       2562
       2599
        
               aioruuvigateway

     

       2563
       2600
        
               aioshelly

     

       2564
       2601
        
               aiousbwatcher

     
···

       2597
       2634
        
           "inkbird" =

     

       2598
       2635
        
             ps: with ps; [

     

       2599
       2636
        
               aioesphomeapi

     

       2637
       2637
       +
               aiohasupervisor

     

       2600
       2638
        
               aioruuvigateway

     

       2601
       2639
        
               aioshelly

     

       2602
       2640
        
               aiousbwatcher

     
···

       2646
       2684
        
               aiousbwatcher

     

       2647
       2685
        
               home-assistant-frontend

     

       2648
       2686
        
               insteon-frontend-home-assistant

     

       2649
       2649
       -
               pillow

     

       2650
       2687
        
               pyinsteon

     

       2651
       2688
        
               pyserial

     

       2652
       2689
        
             ];

     
···

       2705
       2742
        
           "iron_os" =

     

       2706
       2743
        
             ps: with ps; [

     

       2707
       2744
        
               aioesphomeapi

     

       2745
       2745
       +
               aiohasupervisor

     

       2708
       2746
        
               aioruuvigateway

     

       2709
       2747
        
               aioshelly

     

       2710
       2748
        
               aiousbwatcher

     
···

       2827
       2865
        
           "kegtron" =

     

       2828
       2866
        
             ps: with ps; [

     

       2829
       2867
        
               aioesphomeapi

     

       2868
       2868
       +
               aiohasupervisor

     

       2830
       2869
        
               aioruuvigateway

     

       2831
       2870
        
               aioshelly

     

       2832
       2871
        
               aiousbwatcher

     
···

       2864
       2903
        
           "keymitt_ble" =

     

       2865
       2904
        
             ps: with ps; [

     

       2866
       2905
        
               aioesphomeapi

     

       2906
       2906
       +
               aiohasupervisor

     

       2867
       2907
        
               aioruuvigateway

     

       2868
       2908
        
               aioshelly

     

       2869
       2909
        
               aiousbwatcher

     
···

       2913
       2953
        
             ps: with ps; [

     

       2914
       2954
        
               home-assistant-frontend

     

       2915
       2955
        
               knx-frontend

     

       2916
       2916
       -
               pillow

     

       2917
       2956
        
               xknx

     

       2918
       2957
        
               xknxproject

     

       2919
       2958
        
             ];

     
···

       2939
       2978
        
             ];

     

       2940
       2979
        
           "kulersky" =

     

       2941
       2980
        
             ps: with ps; [

     

       2981
       2981
       +
               aioesphomeapi

     

       2982
       2982
       +
               aiohasupervisor

     

       2983
       2983
       +
               aioruuvigateway

     

       2984
       2984
       +
               aioshelly

     

       2985
       2985
       +
               aiousbwatcher

     

       2986
       2986
       +
               bleak

     

       2987
       2987
       +
               bleak-esphome

     

       2988
       2988
       +
               bleak-retry-connector

     

       2989
       2989
       +
               bluetooth-adapters

     

       2990
       2990
       +
               bluetooth-auto-recovery

     

       2991
       2991
       +
               bluetooth-data-tools

     

       2992
       2992
       +
               dbus-fast

     

       2993
       2993
       +
               esphome-dashboard-api

     

       2994
       2994
       +
               ha-ffmpeg

     

       2995
       2995
       +
               habluetooth

     

       2996
       2996
       +
               hassil

     

       2997
       2997
       +
               home-assistant-intents

     

       2998
       2998
       +
               ifaddr

     

       2999
       2999
       +
               mutagen

     

       2942
       3000
        
               pykulersky

     

       3001
       3001
       +
               pymicro-vad

     

       3002
       3002
       +
               pyserial

     

       3003
       3003
       +
               pyspeex-noise

     

       3004
       3004
       +
               zeroconf

     

       2943
       3005
        
             ];

     

       2944
       3006
        
           "kwb" =

     

       2945
       3007
        
             ps: with ps; [

     
···

       2955
       3017
        
           "lamarzocco" =

     

       2956
       3018
        
             ps: with ps; [

     

       2957
       3019
        
               aioesphomeapi

     

       3020
       3020
       +
               aiohasupervisor

     

       2958
       3021
        
               aioruuvigateway

     

       2959
       3022
        
               aioshelly

     

       2960
       3023
        
               aiousbwatcher

     
···

       3010
       3073
        
             ps: with ps; [

     

       3011
       3074
        
               home-assistant-frontend

     

       3012
       3075
        
               lcn-frontend

     

       3013
       3013
       -
               pillow

     

       3014
       3076
        
               pypck

     

       3015
       3077
        
             ];

     

       3016
       3078
        
           "ld2410_ble" =

     

       3017
       3079
        
             ps: with ps; [

     

       3018
       3080
        
               aioesphomeapi

     

       3081
       3081
       +
               aiohasupervisor

     

       3019
       3082
        
               aioruuvigateway

     

       3020
       3083
        
               aioshelly

     

       3021
       3084
        
               aiousbwatcher

     
···

       3042
       3105
        
           "leaone" =

     

       3043
       3106
        
             ps: with ps; [

     

       3044
       3107
        
               aioesphomeapi

     

       3108
       3108
       +
               aiohasupervisor

     

       3045
       3109
        
               aioruuvigateway

     

       3046
       3110
        
               aioshelly

     

       3047
       3111
        
               aiousbwatcher

     
···

       3068
       3132
        
           "led_ble" =

     

       3069
       3133
        
             ps: with ps; [

     

       3070
       3134
        
               aioesphomeapi

     

       3135
       3135
       +
               aiohasupervisor

     

       3071
       3136
        
               aioruuvigateway

     

       3072
       3137
        
               aioshelly

     

       3073
       3138
        
               aiousbwatcher

     
···

       3214
       3279
        
             ps: with ps; [

     

       3215
       3280
        
               fnv-hash-fast

     

       3216
       3281
        
               home-assistant-frontend

     

       3217
       3217
       -
               pillow

     

       3218
       3282
        
               psutil-home-assistant

     

       3219
       3283
        
               sqlalchemy

     

       3220
       3284
        
             ];

     
···

       3252
       3316
        
             ];

     

       3253
       3317
        
           "lovelace" =

     

       3254
       3318
        
             ps: with ps; [

     

       3255
       3255
       -
               pillow

     

       3256
       3319
        
             ];

     

       3257
       3320
        
           "luci" =

     

       3258
       3321
        
             ps: with ps; [

     
···

       3330
       3393
        
             ps: with ps; [

     

       3331
       3394
        
               maxcube-api

     

       3332
       3395
        
             ];

     

       3396
       3396
       +
           "maytag" =

     

       3397
       3397
       +
             ps: with ps; [

     

       3398
       3398
       +
             ];

     

       3333
       3399
        
           "mazda" =

     

       3334
       3400
        
             ps: with ps; [

     

       3335
       3401
        
             ];

     
···

       3356
       3422
        
           "medcom_ble" =

     

       3357
       3423
        
             ps: with ps; [

     

       3358
       3424
        
               aioesphomeapi

     

       3425
       3425
       +
               aiohasupervisor

     

       3359
       3426
        
               aioruuvigateway

     

       3360
       3427
        
               aioshelly

     

       3361
       3428
        
               aiousbwatcher

     
···

       3397
       3464
        
             ];

     

       3398
       3465
        
           "melcloud" =

     

       3399
       3466
        
             ps: with ps; [

     

       3400
       3400
       -
               pymelcloud

     

       3467
       3467
       +
               python-melcloud

     

       3401
       3468
        
             ];

     

       3402
       3469
        
           "melissa" =

     

       3403
       3470
        
             ps: with ps; [

     
···

       3405
       3472
        
           "melnor" =

     

       3406
       3473
        
             ps: with ps; [

     

       3407
       3474
        
               aioesphomeapi

     

       3475
       3475
       +
               aiohasupervisor

     

       3408
       3476
        
               aioruuvigateway

     

       3409
       3477
        
               aioshelly

     

       3410
       3478
        
               aiousbwatcher

     
···

       3484
       3552
        
             ps: with ps; [

     

       3485
       3553
        
               pyturbojpeg

     

       3486
       3554
        
             ];

     

       3555
       3555
       +
           "miele" =

     

       3556
       3556
       +
             ps: with ps; [

     

       3557
       3557
       +
               pymiele

     

       3558
       3558
       +
             ];

     

       3487
       3559
        
           "mijndomein_energie" =

     

       3488
       3560
        
             ps: with ps; [

     

       3489
       3561
        
             ];

     
···

       3493
       3565
        
             ];

     

       3494
       3566
        
           "mill" =

     

       3495
       3567
        
             ps: with ps; [

     

       3568
       3568
       +
               fnv-hash-fast

     

       3496
       3569
        
               mill-local

     

       3497
       3570
        
               millheater

     

       3571
       3571
       +
               psutil-home-assistant

     

       3572
       3572
       +
               sqlalchemy

     

       3498
       3573
        
             ];

     

       3499
       3574
        
           "min_max" =

     

       3500
       3575
        
             ps: with ps; [

     
···

       3516
       3591
        
           "moat" =

     

       3517
       3592
        
             ps: with ps; [

     

       3518
       3593
        
               aioesphomeapi

     

       3594
       3594
       +
               aiohasupervisor

     

       3519
       3595
        
               aioruuvigateway

     

       3520
       3596
        
               aioshelly

     

       3521
       3597
        
               aiousbwatcher

     
···

       3598
       3674
        
           "mopeka" =

     

       3599
       3675
        
             ps: with ps; [

     

       3600
       3676
        
               aioesphomeapi

     

       3677
       3677
       +
               aiohasupervisor

     

       3601
       3678
        
               aioruuvigateway

     

       3602
       3679
        
               aioshelly

     

       3603
       3680
        
               aiousbwatcher

     
···

       3629
       3706
        
           "motionblinds_ble" =

     

       3630
       3707
        
             ps: with ps; [

     

       3631
       3708
        
               aioesphomeapi

     

       3709
       3709
       +
               aiohasupervisor

     

       3632
       3710
        
               aioruuvigateway

     

       3633
       3711
        
               aioshelly

     

       3634
       3712
        
               aiousbwatcher

     
···

       3708
       3786
        
           "my" =

     

       3709
       3787
        
             ps: with ps; [

     

       3710
       3788
        
               home-assistant-frontend

     

       3711
       3711
       -
               pillow

     

       3712
       3789
        
             ];

     

       3713
       3790
        
           "myq" =

     

       3714
       3791
        
             ps: with ps; [

     
···

       3750
       3827
        
           "nasweb" =

     

       3751
       3828
        
             ps: with ps; [

     

       3752
       3829
        
             ]; # missing inputs: webio-api

     

       3830
       3830
       +
           "national_grid_us" =

     

       3831
       3831
       +
             ps: with ps; [

     

       3832
       3832
       +
             ];

     

       3753
       3833
        
           "neato" =

     

       3754
       3834
        
             ps: with ps; [

     

       3755
       3835
        
               pybotvac

     
···

       3757
       3837
        
           "nederlandse_spoorwegen" =

     

       3758
       3838
        
             ps: with ps; [

     

       3759
       3839
        
               nsapi

     

       3840
       3840
       +
             ];

     

       3841
       3841
       +
           "neff" =

     

       3842
       3842
       +
             ps: with ps; [

     

       3760
       3843
        
             ];

     

       3761
       3844
        
           "ness_alarm" =

     

       3762
       3845
        
             ps: with ps; [

     
···

       3903
       3986
        
             ps: with ps; [

     

       3904
       3987
        
               aio-geojson-nsw-rfs-incidents

     

       3905
       3988
        
             ];

     

       3989
       3989
       +
           "ntfy" =

     

       3990
       3990
       +
             ps: with ps; [

     

       3991
       3991
       +
               aiontfy

     

       3992
       3992
       +
             ];

     

       3906
       3993
        
           "nuheat" =

     

       3907
       3994
        
             ps: with ps; [

     

       3908
       3995
        
               nuheat

     
···

       3989
       4076
        
             ];

     

       3990
       4077
        
           "onboarding" =

     

       3991
       4078
        
             ps: with ps; [

     

       3992
       3992
       -
               pillow

     

       3993
       4079
        
             ];

     

       3994
       4080
        
           "oncue" =

     

       3995
       4081
        
             ps: with ps; [

     

       3996
       3996
       -
               aiooncue

     

       3997
       4082
        
             ];

     

       3998
       4083
        
           "ondilo_ico" =

     

       3999
       4084
        
             ps: with ps; [

     
···

       4094
       4179
        
           "oralb" =

     

       4095
       4180
        
             ps: with ps; [

     

       4096
       4181
        
               aioesphomeapi

     

       4182
       4182
       +
               aiohasupervisor

     

       4097
       4183
        
               aioruuvigateway

     

       4098
       4184
        
               aioshelly

     

       4099
       4185
        
               aiousbwatcher

     
···

       4140
       4226
        
               aiousbwatcher

     

       4141
       4227
        
               ha-silabs-firmware-client

     

       4142
       4228
        
               ifaddr

     

       4143
       4143
       -
               pillow

     

       4144
       4229
        
               psutil-home-assistant

     

       4145
       4230
        
               pyroute2

     

       4146
       4231
        
               pyserial

     
···

       4221
       4306
        
           "panel_custom" =

     

       4222
       4307
        
             ps: with ps; [

     

       4223
       4308
        
               home-assistant-frontend

     

       4224
       4224
       -
               pillow

     

       4225
       4309
        
             ];

     

       4226
       4310
        
           "pcs_lighting" =

     

       4227
       4311
        
             ps: with ps; [

     
···

       4299
       4383
        
           "piper" =

     

       4300
       4384
        
             ps: with ps; [

     

       4301
       4385
        
             ];

     

       4386
       4386
       +
           "pitsos" =

     

       4387
       4387
       +
             ps: with ps; [

     

       4388
       4388
       +
             ];

     

       4302
       4389
        
           "pjlink" =

     

       4303
       4390
        
             ps: with ps; [

     

       4304
       4391
        
             ]; # missing inputs: pypjlink2

     
···

       4363
       4450
        
           "private_ble_device" =

     

       4364
       4451
        
             ps: with ps; [

     

       4365
       4452
        
               aioesphomeapi

     

       4453
       4453
       +
               aiohasupervisor

     

       4366
       4454
        
               aioruuvigateway

     

       4367
       4455
        
               aioshelly

     

       4368
       4456
        
               aiousbwatcher

     
···

       4391
       4479
        
               objgraph

     

       4392
       4480
        
               pyprof2calltree

     

       4393
       4481
        
             ];

     

       4482
       4482
       +
           "profilo" =

     

       4483
       4483
       +
             ps: with ps; [

     

       4484
       4484
       +
             ];

     

       4394
       4485
        
           "progettihwsw" =

     

       4395
       4486
        
             ps: with ps; [

     

       4396
       4487
        
             ]; # missing inputs: ProgettiHWSW

     
···

       4491
       4582
        
           "qingping" =

     

       4492
       4583
        
             ps: with ps; [

     

       4493
       4584
        
               aioesphomeapi

     

       4585
       4585
       +
               aiohasupervisor

     

       4494
       4586
        
               aioruuvigateway

     

       4495
       4587
        
               aioshelly

     

       4496
       4588
        
               aiousbwatcher

     
···

       4610
       4702
        
           "rapt_ble" =

     

       4611
       4703
        
             ps: with ps; [

     

       4612
       4704
        
               aioesphomeapi

     

       4705
       4705
       +
               aiohasupervisor

     

       4613
       4706
        
               aioruuvigateway

     

       4614
       4707
        
               aioshelly

     

       4615
       4708
        
               aiousbwatcher

     
···

       4668
       4761
        
               home-assistant-frontend

     

       4669
       4762
        
               home-assistant-intents

     

       4670
       4763
        
               mutagen

     

       4671
       4671
       -
               pillow

     

       4672
       4764
        
               pymicro-vad

     

       4673
       4765
        
               pyspeex-noise

     

       4674
       4766
        
               python-matter-server

     
···

       4686
       4778
        
             ps: with ps; [

     

       4687
       4779
        
               refoss-ha

     

       4688
       4780
        
             ];

     

       4781
       4781
       +
           "rehlko" =

     

       4782
       4782
       +
             ps: with ps; [

     

       4783
       4783
       +
               aiokem

     

       4784
       4784
       +
             ];

     

       4689
       4785
        
           "rejseplanen" =

     

       4690
       4786
        
             ps: with ps; [

     

       4691
       4787
        
               rjpl

     
···

       4847
       4943
        
           "ruuvitag_ble" =

     

       4848
       4944
        
             ps: with ps; [

     

       4849
       4945
        
               aioesphomeapi

     

       4946
       4946
       +
               aiohasupervisor

     

       4850
       4947
        
               aioruuvigateway

     

       4851
       4948
        
               aioshelly

     

       4852
       4949
        
               aiousbwatcher

     
···

       4967
       5064
        
           "sensirion_ble" =

     

       4968
       5065
        
             ps: with ps; [

     

       4969
       5066
        
               aioesphomeapi

     

       5067
       5067
       +
               aiohasupervisor

     

       4970
       5068
        
               aioruuvigateway

     

       4971
       5069
        
               aioshelly

     

       4972
       5070
        
               aiousbwatcher

     
···

       5002
       5100
        
           "sensorpro" =

     

       5003
       5101
        
             ps: with ps; [

     

       5004
       5102
        
               aioesphomeapi

     

       5103
       5103
       +
               aiohasupervisor

     

       5005
       5104
        
               aioruuvigateway

     

       5006
       5105
        
               aioshelly

     

       5007
       5106
        
               aiousbwatcher

     
···

       5028
       5127
        
           "sensorpush" =

     

       5029
       5128
        
             ps: with ps; [

     

       5030
       5129
        
               aioesphomeapi

     

       5130
       5130
       +
               aiohasupervisor

     

       5031
       5131
        
               aioruuvigateway

     

       5032
       5132
        
               aioshelly

     

       5033
       5133
        
               aiousbwatcher

     
···

       5123
       5223
        
             ps: with ps; [

     

       5124
       5224
        
               pysiaalarm

     

       5125
       5225
        
             ];

     

       5226
       5226
       +
           "siemens" =

     

       5227
       5227
       +
             ps: with ps; [

     

       5228
       5228
       +
             ];

     

       5126
       5229
        
           "sigfox" =

     

       5127
       5230
        
             ps: with ps; [

     

       5128
       5231
        
             ];

     
···

       5276
       5379
        
           "snooz" =

     

       5277
       5380
        
             ps: with ps; [

     

       5278
       5381
        
               aioesphomeapi

     

       5382
       5382
       +
               aiohasupervisor

     

       5279
       5383
        
               aioruuvigateway

     

       5280
       5384
        
               aioshelly

     

       5281
       5385
        
               aiousbwatcher

     
···

       5432
       5536
        
             ];

     

       5433
       5537
        
           "stiebel_eltron" =

     

       5434
       5538
        
             ps: with ps; [

     

       5435
       5435
       -
               pymodbus

     

       5436
       5539
        
             ]; # missing inputs: pystiebeleltron

     

       5437
       5540
        
           "stookwijzer" =

     

       5438
       5541
        
             ps: with ps; [

     
···

       5502
       5605
        
           "switchbot" =

     

       5503
       5606
        
             ps: with ps; [

     

       5504
       5607
        
               aioesphomeapi

     

       5608
       5608
       +
               aiohasupervisor

     

       5505
       5609
        
               aioruuvigateway

     

       5506
       5610
        
               aioshelly

     

       5507
       5611
        
               aiousbwatcher

     
···

       5690
       5794
        
           "text" =

     

       5691
       5795
        
             ps: with ps; [

     

       5692
       5796
        
             ];

     

       5797
       5797
       +
           "thermador" =

     

       5798
       5798
       +
             ps: with ps; [

     

       5799
       5799
       +
             ];

     

       5693
       5800
        
           "thermobeacon" =

     

       5694
       5801
        
             ps: with ps; [

     

       5695
       5802
        
               aioesphomeapi

     

       5803
       5803
       +
               aiohasupervisor

     

       5696
       5804
        
               aioruuvigateway

     

       5697
       5805
        
               aioshelly

     

       5698
       5806
        
               aiousbwatcher

     
···

       5722
       5830
        
           "thermopro" =

     

       5723
       5831
        
             ps: with ps; [

     

       5724
       5832
        
               aioesphomeapi

     

       5833
       5833
       +
               aiohasupervisor

     

       5725
       5834
        
               aioruuvigateway

     

       5726
       5835
        
               aioshelly

     

       5727
       5836
        
               aiousbwatcher

     
···

       5785
       5894
        
           "tilt_ble" =

     

       5786
       5895
        
             ps: with ps; [

     

       5787
       5896
        
               aioesphomeapi

     

       5897
       5897
       +
               aiohasupervisor

     

       5788
       5898
        
               aioruuvigateway

     

       5789
       5899
        
               aioshelly

     

       5790
       5900
        
               aiousbwatcher

     
···

       6385
       6495
        
           "xiaomi_ble" =

     

       6386
       6496
        
             ps: with ps; [

     

       6387
       6497
        
               aioesphomeapi

     

       6498
       6498
       +
               aiohasupervisor

     

       6388
       6499
        
               aioruuvigateway

     

       6389
       6500
        
               aioshelly

     

       6390
       6501
        
               aiousbwatcher

     
···

       6453
       6564
        
           "yalexs_ble" =

     

       6454
       6565
        
             ps: with ps; [

     

       6455
       6566
        
               aioesphomeapi

     

       6567
       6567
       +
               aiohasupervisor

     

       6456
       6568
        
               aioruuvigateway

     

       6457
       6569
        
               aioshelly

     

       6458
       6570
        
               aiousbwatcher

     
···

       6556
       6668
        
               aiohasupervisor

     

       6557
       6669
        
               aiousbwatcher

     

       6558
       6670
        
               ha-silabs-firmware-client

     

       6559
       6559
       -
               pillow

     

       6560
       6671
        
               pyserial

     

       6561
       6672
        
               universal-silabs-flasher

     

       6562
       6673
        
               zha

     
···

       6664
       6775
        
           "automation"

     

       6665
       6776
        
           "awair"

     

       6666
       6777
        
           "aws"

     

       6778
       6778
       +
           "aws_s3"

     

       6667
       6779
        
           "axis"

     

       6668
       6780
        
           "azure_data_explorer"

     

       6669
       6781
        
           "azure_devops"

     
···

       6953
       7065
        
           "image_processing"

     

       6954
       7066
        
           "image_upload"

     

       6955
       7067
        
           "imap"

     

       7068
       7068
       +
           "imeon_inverter"

     

       6956
       7069
        
           "imgw_pib"

     

       6957
       7070
        
           "improv_ble"

     

       6958
       7071
        
           "incomfort"

     
···

       7074
       7187
        
           "microsoft_face"

     

       7075
       7188
        
           "microsoft_face_detect"

     

       7076
       7189
        
           "microsoft_face_identify"

     

       7190
       7190
       +
           "miele"

     

       7077
       7191
        
           "mikrotik"

     

       7078
       7192
        
           "mill"

     

       7079
       7193
        
           "min_max"

     
···

       7137
       7251
        
           "notify_events"

     

       7138
       7252
        
           "notion"

     

       7139
       7253
        
           "nsw_rural_fire_service_feed"

     

       7254
       7254
       +
           "ntfy"

     

       7140
       7255
        
           "nuheat"

     

       7141
       7256
        
           "nuki"

     

       7142
       7257
        
           "number"

     
···

       7242
       7357
        
           "recovery_mode"

     

       7243
       7358
        
           "reddit"

     

       7244
       7359
        
           "refoss"

     

       7360
       7360
       +
           "rehlko"

     

       7245
       7361
        
           "remote"

     

       7246
       7362
        
           "remote_calendar"

     

       7247
       7363
        
           "renault"

+5 -8

pkgs/servers/home-assistant/custom-components/frigate/package.nix

···

       18
       18
        
       buildHomeAssistantComponent rec {

     

       19
       19
        
         owner = "blakeblackshear";

     

       20
       20
        
         domain = "frigate";

     

       21
       21
       -
         version = "5.8.0";

     

       21
       21
       +
         version = "5.9.2";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "blakeblackshear";

     

       25
       25
        
           repo = "frigate-hass-integration";

     

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

     

       27
       27
       -
           hash = "sha256-sQgi3F44eT/iL3cE9YuKyjJmE4nZM+OcwirUyl3maGo=";

     

       27
       27
       +
           hash = "sha256-XVHw9AjngzbMnzRPJ/VL1Hy0gG3q+rV4Gfh8K7pIW6M=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         dependencies = [ hass-web-proxy-lib ];

     
···

       41
       41
        
           ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs)

     

       42
       42
        
           ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs);

     

       43
       43
        
       

     

       44
       44
       -
         disabledTests = [

     

       45
       45
       -
           # uses deprecated and removed constants

     

       46
       46
       -
           # https://github.com/blakeblackshear/frigate-hass-integration/issues/860

     

       47
       47
       -
           "test_duplicate"

     

       48
       48
       -
           "test_options_advanced"

     

       49
       49
       -
           "test_options"

     

       44
       44
       +
         disabledTestPaths = [

     

       45
       45
       +
           # https://github.com/blakeblackshear/frigate-hass-integration/issues/907

     

       46
       46
       +
           "tests/test_media_source.py"

     

       50
       47
        
         ];

     

       51
       48
        
       

     

       52
       49
        
         meta = with lib; {

+2 -2

pkgs/servers/home-assistant/custom-components/frigidaire/package.nix

···

       7
       7
        
       buildHomeAssistantComponent rec {

     

       8
       8
        
         owner = "bm1549";

     

       9
       9
        
         domain = "frigidaire";

     

       10
       10
       -
         version = "0.1.1";

     

       10
       10
       +
         version = "0.1.2";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           inherit owner;

     

       14
       14
        
           repo = "home-assistant-frigidaire";

     

       15
       15
        
           tag = version;

     

       16
       16
       -
           hash = "sha256-Jynm0e5y/mSgyd5Pyus+nIVV3XSjsm5z+oNuGIhCu9s=";

     

       16
       16
       +
           hash = "sha256-7SyOsB16P0O0RHEUXy79cqil+QFO2PilyWWlpv428g0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         dependencies = [ frigidaire ];

+2 -2

pkgs/servers/home-assistant/custom-components/localtuya/package.nix

···

       7
       7
        
       buildHomeAssistantComponent rec {

     

       8
       8
        
         owner = "xZetsubou";

     

       9
       9
        
         domain = "localtuya";

     

       10
       10
       -
         version = "2025.3.2";

     

       10
       10
       +
         version = "2025.5.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "xZetsubou";

     

       14
       14
        
           repo = "hass-localtuya";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           hash = "sha256-6JE2hVD650YE7pSrLt+Ie1QpvHcG0bJ2yrTpwTukBG0=";

     

       16
       16
       +
           hash = "sha256-cYaMHh16dmjO8UrpBZScGoHDNqvmQ5ceAq/lP6qazxA=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

+2 -2

pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix

···

       8
       8
        
       buildHomeAssistantComponent rec {

     

       9
       9
        
         owner = "wuwentao";

     

       10
       10
        
         domain = "midea_ac_lan";

     

       11
       11
       -
         version = "0.6.6";

     

       11
       11
       +
         version = "0.6.7";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           inherit owner;

     

       15
       15
        
           repo = domain;

     

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

     

       17
       17
       -
           hash = "sha256-GksX+RmQ7lcyuUL3vu9b1q3c56W9yB2Hg20DUNTeOxY=";

     

       17
       17
       +
           hash = "sha256-L1dlj7gOH/VpwayoyQGbwu/4IIDW1tTxmnTQNTwfxUw=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         dependencies = [ midea-local ];

-33

pkgs/servers/home-assistant/custom-components/miele/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       4
       -
         buildHomeAssistantComponent,

     

       5
       5
       -
         flatdict,

     

       6
       6
       -
         pymiele,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       buildHomeAssistantComponent rec {

     

       10
       10
       -
         owner = "astrandb";

     

       11
       11
       -
         domain = "miele";

     

       12
       12
       -
         version = "2025.1.1";

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchFromGitHub {

     

       15
       15
       -
           inherit owner;

     

       16
       16
       -
           repo = domain;

     

       17
       17
       -
           tag = "v${version}";

     

       18
       18
       -
           hash = "sha256-TShy2q3gKqTgRU3u4Wp7zQjzhEogqUVip8EkH8XIYw8=";

     

       19
       19
       -
         };

     

       20
       20
       -
       

     

       21
       21
       -
         dependencies = [

     

       22
       22
       -
           flatdict

     

       23
       23
       -
           pymiele

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         meta = with lib; {

     

       27
       27
       -
           changelog = "https://github.com/astrandb/miele/releases/tag/v${version}";

     

       28
       28
       -
           description = "Modern integration for Miele devices in Home Assistant";

     

       29
       29
       -
           homepage = "https://github.com/astrandb/miele";

     

       30
       30
       -
           maintainers = with maintainers; [ jamiemagee ];

     

       31
       31
       -
           license = licenses.mit;

     

       32
       32
       -
         };

     

       33
       33
       -
       }

+2 -2

pkgs/servers/home-assistant/custom-components/nest_protect/package.nix

···

       6
       6
        
       buildHomeAssistantComponent rec {

     

       7
       7
        
         owner = "iMicknl";

     

       8
       8
        
         domain = "nest_protect";

     

       9
       9
       -
         version = "0.4.0";

     

       9
       9
       +
         version = "0.4.2b0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           inherit owner;

     

       13
       13
        
           repo = "ha-nest-protect";

     

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

     

       15
       15
       -
           hash = "sha256-UAVyfI+cHYx0va2P14moyy6BbhNegsdLWtiex5QeFrs=";

     

       15
       15
       +
           hash = "sha256-CQVAvx7iRCRHw8YXDmsWaF6fhddx3OfSLjq218+ob6I=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # AttributeError: 'async_generator' object has no attribute 'data'

+2 -2

pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix

···

       8
       8
        
       buildHomeAssistantComponent rec {

     

       9
       9
        
         owner = "wills106";

     

       10
       10
        
         domain = "solax_modbus";

     

       11
       11
       -
         version = "2025.04.1";

     

       11
       11
       +
         version = "2025.04.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "wills106";

     

       15
       15
        
           repo = "homeassistant-solax-modbus";

     

       16
       16
        
           tag = version;

     

       17
       17
       -
           hash = "sha256-kX8poctK1Q7QZnpvkOisQ47jNzXJJ2nlB1fa+Pv4AFs=";

     

       17
       17
       +
           hash = "sha256-fgvhF+1fz3pNOZJQjf/iF2Lh9j6mMkUXjgLyCja84K0=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         dependencies = [ pymodbus ];

+2 -2

pkgs/servers/home-assistant/custom-components/volvo_cars/package.nix

···

       7
       7
        
       buildHomeAssistantComponent rec {

     

       8
       8
        
         owner = "thomasddn";

     

       9
       9
        
         domain = "volvo_cars";

     

       10
       10
       -
         version = "1.5.1";

     

       10
       10
       +
         version = "1.5.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "thomasddn";

     

       14
       14
        
           repo = "ha-volvo-cars";

     

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

     

       16
       16
       -
           hash = "sha256-UG/anp9ThEOQsRWraTayuyx6kS9r2vTH/8Bak4ZzYzo";

     

       16
       16
       +
           hash = "sha256-f7+RBAOkNUVJ4P/B/cMK7eGFrTnn8TGsC26vfSHc8Z4=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

+2 -2

pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix

···

       11
       11
        
       buildHomeAssistantComponent rec {

     

       12
       12
        
         owner = "al-one";

     

       13
       13
        
         domain = "xiaomi_miot";

     

       14
       14
       -
         version = "1.0.17";

     

       14
       14
       +
         version = "1.0.18";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "al-one";

     

       18
       18
        
           repo = "hass-xiaomi-miot";

     

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

     

       20
       20
       -
           hash = "sha256-jiskzH2MsddF1rdCnrdJyALQQxFrFUBpOjdR/zbTxh0=";

     

       20
       20
       +
           hash = "sha256-eKh3oa/dPmOIywdTkRhItzP4LQNLguNDfkQWMJjQkpo=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         dependencies = [

+2 -2

pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix

···

       8
       8
        
       buildHomeAssistantComponent rec {

     

       9
       9
        
         owner = "cdnninja";

     

       10
       10
        
         domain = "yoto";

     

       11
       11
       -
         version = "1.24.0";

     

       11
       11
       +
         version = "1.24.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "cdnninja";

     

       15
       15
        
           repo = "yoto_ha";

     

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

     

       17
       17
       -
           hash = "sha256-vlUPVKG6PAkQbROd/Pn5gf48/QWl2GAs3xGCnwX0ENU=";

     

       17
       17
       +
           hash = "sha256-iiS5bns7la17Wf/mRkraE9xL9i+OzI4ru4BaHiLtA6U=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         dependencies = [

+3 -3

pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildNpmPackage rec {

     

       8
       8
        
         pname = "mini-graph-card";

     

       9
       9
       -
         version = "0.13.0-dev.2";

     

       9
       9
       +
         version = "0.13.0-dev.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "kalkih";

     

       13
       13
        
           repo = "mini-graph-card";

     

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

     

       15
       15
       -
           hash = "sha256-JpteGI9oR2twCTvEQ8xtb55EGQw//9EVuELh4BG0BE0=";

     

       15
       15
       +
           hash = "sha256-er+oaUffKh4hXenDD6VHJ01K8kupzhY4Js8M1zSLMvQ=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         npmDepsHash = "sha256-Mg58i0L1e1YwBd81WwVgB56P7EYaq3FnMysIrgu0+qQ=";

     

       18
       18
       +
         npmDepsHash = "sha256-0INteDirb9jkmA0fNAuii0woqnZjTm0gl1brOeIJrn0=";

     

       19
       19
        
       

     

       20
       20
        
         installPhase = ''

     

       21
       21
        
           runHook preInstall

+3 -3

pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildNpmPackage rec {

     

       8
       8
        
         pname = "sankey-chart";

     

       9
       9
       -
         version = "3.7.0";

     

       9
       9
       +
         version = "3.8.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "MindFreeze";

     

       13
       13
        
           repo = "ha-sankey-chart";

     

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

     

       15
       15
       -
           hash = "sha256-krWK2P7tjK5loFYXZ5+b8UN4TEKPObW2QK+3l7+zvj0=";

     

       15
       15
       +
           hash = "sha256-qDFCrnx0G+RsDq1V8wvo04AelR82SlXOYqWJntnSBJY=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         npmDepsHash = "sha256-OBgmmPcwpMxXrytP2tHzCFe1imz1S6LHBWJkruw3jgI=";

     

       18
       18
       +
         npmDepsHash = "sha256-A4aw4OKBQRsc6O60ewp88QxABANjnNlejSUfcFGyyRA=";

     

       19
       19
        
       

     

       20
       20
        
         installPhase = ''

     

       21
       21
        
           runHook preInstall

+11 -14

pkgs/servers/home-assistant/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         callPackage,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       +
         fetchpatch,

     

       6
       7
        
         fetchPypi,

     

       7
       8
        
         python313,

     

       8
       9
        
         replaceVars,

     
···

       169
       170
        
                 inherit (oldAttrs.src) owner repo;

     

       170
       171
        
                 rev = "refs/tags/${version}";

     

       171
       172
        
                 hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";

     

       172
       172
       -
               };

     

       173
       173
       -
             });

     

       174
       174
       -
       

     

       175
       175
       -
             pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: {

     

       176
       176
       -
               version = "2.5.9";

     

       177
       177
       -
               src = fetchFromGitHub {

     

       178
       178
       -
                 owner = "vilppuvuorinen";

     

       179
       179
       -
                 repo = "pymelcloud";

     

       180
       180
       -
                 rev = "33a827b6cd0b34f276790faa49bfd0994bb7c2e4"; # 2.5.x branch

     

       181
       181
       -
                 sha256 = "sha256-Q3FIo9YJwtWPHfukEBjBANUQ1N1vr/DMnl1dgiN7vYg=";

     

       182
       173
        
               };

     

       183
       174
        
             });

     

       184
       175
        
       

     
···

       377
       368
        
         extraBuildInputs = extraPackages python.pkgs;

     

       378
       369
        
       

     

       379
       370
        
         # Don't forget to run update-component-packages.py after updating

     

       380
       380
       -
         hassVersion = "2025.4.4";

     

       371
       371
       +
         hassVersion = "2025.5.0";

     

       381
       372
        
       

     

       382
       373
        
       in

     

       383
       374
        
       python.pkgs.buildPythonApplication rec {

     
···

       388
       379
        
         pyproject = true;

     

       389
       380
        
       

     

       390
       381
        
         # check REQUIRED_PYTHON_VER in homeassistant/const.py

     

       391
       391
       -
         disabled = python.pythonOlder "3.11";

     

       382
       382
       +
         disabled = python.pythonOlder "3.13";

     

       392
       383
        
       

     

       393
       384
        
         # don't try and fail to strip 6600+ python files, it takes minutes!

     

       394
       385
        
         dontStrip = true;

     
···

       398
       389
        
           owner = "home-assistant";

     

       399
       390
        
           repo = "core";

     

       400
       391
        
           tag = version;

     

       401
       401
       -
           hash = "sha256-MiBsVsgV/M8ge7XQ4e4VpdAKTVZBCDu3Jqql2YHx9rY=";

     

       392
       392
       +
           hash = "sha256-aypBPEI9AOAW9BUkcjJtXa9ssLo4jwEeX47m8320/Gg=";

     

       402
       393
        
         };

     

       403
       394
        
       

     

       404
       395
        
         # Secondary source is pypi sdist for translations

     

       405
       396
        
         sdist = fetchPypi {

     

       406
       397
        
           inherit pname version;

     

       407
       407
       -
           hash = "sha256-qOhOs6I2Jx/7GWVeCBJ6d77w3RCFjsvFxDUbR60Ucf0=";

     

       398
       398
       +
           hash = "sha256-7bRBKCchBjAKmW4fjSzShr1RdNRQ677Dd1FXW6sqOQQ=";

     

       408
       399
        
         };

     

       409
       400
        
       

     

       410
       401
        
         build-system = with python.pkgs; [

     
···

       420
       411
        
       

     

       421
       412
        
         # leave this in, so users don't have to constantly update their downstream patch handling

     

       422
       413
        
         patches = [

     

       414
       414
       +
           (fetchpatch {

     

       415
       415
       +
             name = "fix-point-import-error.patch";

     

       416
       416
       +
             url = "https://github.com/home-assistant/core/commit/3c4c3dc08e306b75dce486f5f5236a731fd04cf4.patch";

     

       417
       417
       +
             hash = "sha256-ke04kJWuBHMANVZo75QL5QwU51DZtO4FBBNu4Szu9q8=";

     

       418
       418
       +
           })

     

       419
       419
       +
       

     

       423
       420
        
           # Follow symlinks in /var/lib/hass/www

     

       424
       421
        
           ./patches/static-follow-symlinks.patch

     

       425
       422

+2 -2

pkgs/servers/home-assistant/frontend.nix

···

       8
       8
        
         # the frontend version corresponding to a specific home-assistant version can be found here

     

       9
       9
        
         # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

     

       10
       10
        
         pname = "home-assistant-frontend";

     

       11
       11
       -
         version = "20250411.0";

     

       11
       11
       +
         version = "20250507.0";

     

       12
       12
        
         format = "wheel";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     
···

       16
       16
        
           pname = "home_assistant_frontend";

     

       17
       17
        
           dist = "py3";

     

       18
       18
        
           python = "py3";

     

       19
       19
       -
           hash = "sha256-oVvYSEvkJ2bvmoC4DHEUi4EE9iOBn3dJyUnyObWSx1k=";

     

       19
       19
       +
           hash = "sha256-9haMRgP7LxngEciafhTaOX/iSbiNZuqzBakJ3YNAWMo=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         # there is nothing to strip in this package

+2 -2

pkgs/servers/home-assistant/intents.nix

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "home-assistant-intents";

     

       25
       25
       -
         version = "2025.3.28";

     

       25
       25
       +
         version = "2025.5.7";

     

       26
       26
        
         pyproject = true;

     

       27
       27
        
       

     

       28
       28
        
         disabled = pythonOlder "3.9";

     
···

       32
       32
        
           repo = "intents-package";

     

       33
       33
        
           rev = "refs/tags/${version}";

     

       34
       34
        
           fetchSubmodules = true;

     

       35
       35
       -
           hash = "sha256-p1AQYwlMas6GLzg4ZsypDaUsQs74drKqfXA8uJ2K+xw=";

     

       35
       35
       +
           hash = "sha256-803TTK8wT00uZjXl6EfNMNveRBeKPQIgRXIawg68tEU=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         build-system = [

+2 -2

pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "pytest-homeassistant-custom-component";

     

       21
       21
       -
         version = "0.13.235";

     

       21
       21
       +
         version = "0.13.243";

     

       22
       22
        
         pyproject = true;

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.13";

     
···

       27
       27
        
           owner = "MatthewFlamm";

     

       28
       28
        
           repo = "pytest-homeassistant-custom-component";

     

       29
       29
        
           rev = "refs/tags/${version}";

     

       30
       30
       -
           hash = "sha256-hr9GZsyXj7ewEevyXs2PCMKFQahcco+gVFQi8kSxf9A=";

     

       30
       30
       +
           hash = "sha256-Y3+W+tS585N7+xikwhEdyn8mX19h/Udz1Uf6Ixw8OVo=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         build-system = [ setuptools ];

pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix

···

       55
       55
        
           pytestCheckHook

     

       56
       56
        
         ];

     

       57
       57
        
       

     

       58
       58
       +
         disabledTests = [

     

       59
       59
       +
           # https://github.com/dermotduffy/hass-web-proxy-lib/issues/65

     

       60
       60
       +
           "test_proxy_view_aiohttp_read_error"

     

       61
       61
       +
         ];

     

       62
       62
       +
       

     

       58
       63
        
         pythonImportsCheck = [

     

       59
       64
        
           "hass_web_proxy_lib"

     

       60
       65
        
         ];

+2 -2

pkgs/servers/home-assistant/stubs.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "homeassistant-stubs";

     

       13
       13
       -
         version = "2025.4.4";

     

       13
       13
       +
         version = "2025.5.0";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = python.version != home-assistant.python.version;

     
···

       19
       19
        
           owner = "KapJI";

     

       20
       20
        
           repo = "homeassistant-stubs";

     

       21
       21
        
           tag = version;

     

       22
       22
       -
           hash = "sha256-dQS0bMzBe9zwoyODz3DDrpqZO0+zX3UHtgoJaj+5mhA=";

     

       22
       22
       +
           hash = "sha256-90rtXrTCYlply34iDRKkS8Wtx88NRK0eQBLtb4odRHo=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [

+23 -21

pkgs/tools/security/sbomnix/default.nix pkgs/by-name/sb/sbomnix/package.nix

···

       5
       5
        
         grype,

     

       6
       6
        
         nix,

     

       7
       7
        
         nix-visualize,

     

       8
       8
       -
         python,

     

       8
       8
       +
         python3,

     

       9
       9
        
         vulnix,

     

       10
       10
       -
         # python libs

     

       11
       11
       -
         beautifulsoup4,

     

       12
       12
       -
         colorlog,

     

       13
       13
       -
         dfdiskcache,

     

       14
       14
       -
         filelock,

     

       15
       15
       -
         graphviz,

     

       16
       16
       -
         numpy,

     

       17
       17
       -
         packageurl-python,

     

       18
       18
       -
         packaging,

     

       19
       19
       -
         pandas,

     

       20
       20
       -
         pyrate-limiter,

     

       21
       21
       -
         requests,

     

       22
       22
       -
         requests-cache,

     

       23
       23
       -
         requests-ratelimiter,

     

       24
       24
       -
         reuse,

     

       25
       25
       -
         setuptools,

     

       26
       26
       -
         tabulate,

     

       27
       10
        
       }:

     

       28
       11
        
       

     

       12
       12
       +
       let

     

       13
       13
       +
         python = python3.override {

     

       14
       14
       +
           self = python3;

     

       15
       15
       +
           packageOverrides = self: super: {

     

       16
       16
       +
             pyrate-limiter = super.pyrate-limiter.overridePythonAttrs (oldAttrs: rec {

     

       17
       17
       +
               version = "2.10.0";

     

       18
       18
       +
               src = fetchFromGitHub {

     

       19
       19
       +
                 inherit (oldAttrs.src) owner repo;

     

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

     

       21
       21
       +
                 hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0=";

     

       22
       22
       +
               };

     

       23
       23
       +
               doCheck = false;

     

       24
       24
       +
             });

     

       25
       25
       +
           };

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
       in

     

       29
       29
       +
       

     

       29
       30
        
       python.pkgs.buildPythonApplication rec {

     

       30
       31
        
         pname = "sbomnix";

     

       31
       32
        
         version = "1.7.2";

     
···

       49
       50
        
             lib.makeBinPath [

     

       50
       51
        
               git

     

       51
       52
        
               nix

     

       52
       52
       -
               graphviz

     

       53
       53
       +
               python.pkgs.graphviz

     

       53
       54
        
               nix-visualize

     

       54
       55
        
               vulnix

     

       55
       56
        
               grype

     
···

       57
       58
        
           }"

     

       58
       59
        
         ];

     

       59
       60
        
       

     

       60
       60
       -
         nativeBuildInputs = [ setuptools ];

     

       61
       61
       +
         build-system = [ python.pkgs.setuptools ];

     

       61
       62
        
       

     

       62
       62
       -
         propagatedBuildInputs = [

     

       63
       63
       +
         dependencies = with python.pkgs; [

     

       63
       64
        
           beautifulsoup4

     

       64
       65
        
           colorlog

     

       65
       66
        
           dfdiskcache

     
···

       78
       79
        
         ];

     

       79
       80
        
       

     

       80
       81
        
         pythonImportsCheck = [ "sbomnix" ];

     

       82
       82
       +
       

     

       81
       83
        
         # Tests require network access

     

       82
       84
        
         doCheck = false;

     

       83
       85

+6 -3

pkgs/top-level/all-packages.nix

···

       7643
       7643
        
           buildDocs = false;

     

       7644
       7644
        
         };

     

       7645
       7645
        
       

     

       7646
       7646
       -
         sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { };

     

       7647
       7647
       -
       

     

       7648
       7646
        
         seer = libsForQt5.callPackage ../development/tools/misc/seer { };

     

       7649
       7647
        
       

     

       7650
       7648
        
         semantik = libsForQt5.callPackage ../applications/office/semantik { };

     
···

       10457
       10455
        
       

     

       10458
       10456
        
         kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { kanidm = kanidm_1_4; };

     

       10459
       10457
        
         kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { kanidm = kanidm_1_5; };

     

       10458
       10458
       +
         kanidm_1_6 = callPackage ../by-name/ka/kanidm/1_6.nix { kanidm = kanidm_1_6; };

     

       10460
       10459
        
       

     

       10461
       10461
       -
         kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;

     

       10460
       10460
       +
         kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6;

     

       10462
       10461
        
       

     

       10463
       10462
        
         kanidmWithSecretProvisioning_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix {

     

       10464
       10463
        
           enableSecretProvisioning = true;

     

       10465
       10464
        
         };

     

       10466
       10465
        
       

     

       10467
       10466
        
         kanidmWithSecretProvisioning_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix {

     

       10467
       10467
       +
           enableSecretProvisioning = true;

     

       10468
       10468
       +
         };

     

       10469
       10469
       +
       

     

       10470
       10470
       +
         kanidmWithSecretProvisioning_1_6 = callPackage ../by-name/ka/kanidm/1_6.nix {

     

       10468
       10471
        
           enableSecretProvisioning = true;

     

       10469
       10472
        
         };

     

       10470
       10473

pkgs/top-level/python-aliases.nix

···

       522
       522
        
         pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09

     

       523
       523
        
         pydns = py3dns; # added 2024-10-25

     

       524
       524
        
         pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01

     

       525
       525
       +
         pyephember = throw "pyephember was removed because Home Assistant switched to pyephember2"; # added 2025-05-07

     

       525
       526
        
         pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10

     

       526
       527
        
         pygame_sdl2 = pygame-sdl2; # added 2024-01-07

     

       527
       528
        
         pygogo = throw "pygogo has been removed, since it is abandoned and had no maintainer"; # added 2024-07-27

     
···

       547
       548
        
         pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20

     

       548
       549
        
         pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16

     

       549
       550
        
         pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0

     

       551
       551
       +
         pymelcloud = python-melcloud; # added 2025-05-08

     

       550
       552
        
         pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04

     

       551
       553
        
         PyMVGLive = pymvglive; # added 2023-02-19

     

       552
       554
        
         pymyq = python-myq; # added 2023-10-20

+11 -3

pkgs/top-level/python-packages.nix

···

       343
       343
        
       

     

       344
       344
        
         aiokef = callPackage ../development/python-modules/aiokef { };

     

       345
       345
        
       

     

       346
       346
       +
         aiokem = callPackage ../development/python-modules/aiokem { };

     

       347
       347
       +
       

     

       346
       348
        
         aiolifx = callPackage ../development/python-modules/aiolifx { };

     

       347
       349
        
       

     

       348
       350
        
         aiolifx-connection = callPackage ../development/python-modules/aiolifx-connection { };

     
···

       5859
       5861
        
       

     

       5860
       5862
        
         google-generativeai = callPackage ../development/python-modules/google-generativeai { };

     

       5861
       5863
        
       

     

       5864
       5864
       +
         google-geo-type = callPackage ../development/python-modules/google-geo-type { };

     

       5865
       5865
       +
       

     

       5862
       5866
        
         google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };

     

       5867
       5867
       +
       

     

       5868
       5868
       +
         google-maps-routing = callPackage ../development/python-modules/google-maps-routing { };

     

       5863
       5869
        
       

     

       5864
       5870
        
         google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { };

     

       5865
       5871
        
       

     
···

       6654
       6660
        
       

     

       6655
       6661
        
         imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };

     

       6656
       6662
        
       

     

       6663
       6663
       +
         imeon-inverter-api = callPackage ../development/python-modules/imeon-inverter-api { };

     

       6664
       6664
       +
       

     

       6657
       6665
        
         img2pdf = callPackage ../development/python-modules/img2pdf { };

     

       6658
       6666
        
       

     

       6659
       6667
        
         imgcat = callPackage ../development/python-modules/imgcat { };

     
···

       12256
       12264
        
       

     

       12257
       12265
        
         pyenvisalink = callPackage ../development/python-modules/pyenvisalink { };

     

       12258
       12266
        
       

     

       12259
       12259
       -
         pyephember = callPackage ../development/python-modules/pyephember { };

     

       12267
       12267
       +
         pyephember2 = callPackage ../development/python-modules/pyephember2 { };

     

       12260
       12268
        
       

     

       12261
       12269
        
         pyepsg = callPackage ../development/python-modules/pyepsg { };

     

       12262
       12270
        
       

     
···

       12738
       12746
        
         pymee = callPackage ../development/python-modules/pymee { };

     

       12739
       12747
        
       

     

       12740
       12748
        
         pymeeus = callPackage ../development/python-modules/pymeeus { };

     

       12741
       12741
       -
       

     

       12742
       12742
       -
         pymelcloud = callPackage ../development/python-modules/pymelcloud { };

     

       12743
       12749
        
       

     

       12744
       12750
        
         pymemcache = callPackage ../development/python-modules/pymemcache { };

     

       12745
       12751
        
       

     
···

       14127
       14133
        
         python-matter-server = callPackage ../development/python-modules/python-matter-server { };

     

       14128
       14134
        
       

     

       14129
       14135
        
         python-mbedtls = callPackage ../development/python-modules/python-mbedtls { };

     

       14136
       14136
       +
       

     

       14137
       14137
       +
         python-melcloud = callPackage ../development/python-modules/python-melcloud { };

     

       14130
       14138
        
       

     

       14131
       14139
        
         python-memcached = callPackage ../development/python-modules/python-memcached {

     

       14132
       14140
        
           inherit (pkgs) memcached;