commit fa2f6adfe61eb44b15aac592c3877eb096049b50 · pyrox.dev/nixpkgs

+83

ci/eval/attrpaths.nix

···

       1
       1
       +
       # This expression will, as efficiently as possible, dump a

     

       2
       2
       +
       # *superset* of all attrpaths of derivations which might be

     

       3
       3
       +
       # part of a release on *any* platform.

     

       4
       4
       +
       #

     

       5
       5
       +
       # This expression runs single-threaded under all current Nix

     

       6
       6
       +
       # implementations, but much faster and with much less memory

     

       7
       7
       +
       # used than ./outpaths.nix itself.

     

       8
       8
       +
       #

     

       9
       9
       +
       # Once you have the list of attrnames you can split it up into

     

       10
       10
       +
       # $NUM_CORES batches and evaluate the outpaths separately for each

     

       11
       11
       +
       # batch, in parallel.

     

       12
       12
       +
       #

     

       13
       13
       +
       # To dump the attrnames:

     

       14
       14
       +
       #

     

       15
       15
       +
       #   nix-instantiate --eval --strict --json ci/eval/attrpaths.nix -A names

     

       16
       16
       +
       #

     

       17
       17
       +
       {

     

       18
       18
       +
         lib ? import (path + "/lib"),

     

       19
       19
       +
         trace ? false,

     

       20
       20
       +
         path ? ./../..,

     

       21
       21
       +
       }:

     

       22
       22
       +
       let

     

       23
       23
       +
       

     

       24
       24
       +
         # TODO: Use mapAttrsToListRecursiveCond when this PR lands:

     

       25
       25
       +
         # https://github.com/NixOS/nixpkgs/pull/395160

     

       26
       26
       +
         justAttrNames =

     

       27
       27
       +
           path: value:

     

       28
       28
       +
           let

     

       29
       29
       +
             result =

     

       30
       30
       +
               if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then

     

       31
       31
       +
                 [ ]

     

       32
       32
       +
               else if lib.isDerivation value then

     

       33
       33
       +
                 [ path ]

     

       34
       34
       +
               else

     

       35
       35
       +
                 lib.pipe value [

     

       36
       36
       +
                   (lib.mapAttrsToList (

     

       37
       37
       +
                     name: value:

     

       38
       38
       +
                     lib.addErrorContext "while evaluating package set attribute path '${

     

       39
       39
       +
                       lib.showAttrPath (path ++ [ name ])

     

       40
       40
       +
                     }'" (justAttrNames (path ++ [ name ]) value)

     

       41
       41
       +
                   ))

     

       42
       42
       +
                   lib.concatLists

     

       43
       43
       +
                 ];

     

       44
       44
       +
           in

     

       45
       45
       +
           lib.traceIf trace "** ${lib.showAttrPath path}" result;

     

       46
       46
       +
       

     

       47
       47
       +
         outpaths = import ./outpaths.nix {

     

       48
       48
       +
           inherit path;

     

       49
       49
       +
           attrNamesOnly = true;

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       52
       52
       +
         paths = [

     

       53
       53
       +
           # Some of the following are based on variants, which are disabled with `attrNamesOnly = true`.

     

       54
       54
       +
           # Until these have been removed from release.nix / hydra, we manually add them to the list.

     

       55
       55
       +
           [

     

       56
       56
       +
             "pkgsLLVM"

     

       57
       57
       +
             "stdenv"

     

       58
       58
       +
           ]

     

       59
       59
       +
           [

     

       60
       60
       +
             "pkgsArocc"

     

       61
       61
       +
             "stdenv"

     

       62
       62
       +
           ]

     

       63
       63
       +
           [

     

       64
       64
       +
             "pkgsZig"

     

       65
       65
       +
             "stdenv"

     

       66
       66
       +
           ]

     

       67
       67
       +
           [

     

       68
       68
       +
             "pkgsStatic"

     

       69
       69
       +
             "stdenv"

     

       70
       70
       +
           ]

     

       71
       71
       +
           [

     

       72
       72
       +
             "pkgsMusl"

     

       73
       73
       +
             "stdenv"

     

       74
       74
       +
           ]

     

       75
       75
       +
         ]

     

       76
       76
       +
         ++ justAttrNames [ ] outpaths;

     

       77
       77
       +
       

     

       78
       78
       +
         names = map lib.showAttrPath paths;

     

       79
       79
       +
       

     

       80
       80
       +
       in

     

       81
       81
       +
       {

     

       82
       82
       +
         inherit paths names;

     

       83
       83
       +
       }

-1

ci/eval/compare/default.nix

···

       105
       105
        
                 ) rebuildsByKernel

     

       106
       106
        
                 # Set the "11.by: package-maintainer" label to whether all packages directly

     

       107
       107
        
                 # changed are maintained by the PR's author.

     

       108
       108
       -
                 # (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)

     

       109
       108
        
                 // {

     

       110
       109
        
                   "11.by: package-maintainer" =

     

       111
       110
        
                     maintainers ? ${githubAuthorId}

-1

ci/eval/compare/maintainers.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
       }:

     

       4
       4
       -
       # Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix

     

       5
       4
        
       {

     

       6
       5
        
         changedattrs,

     

       7
       6
        
         changedpathsjson,

+7 -6

ci/eval/default.nix

···

       26
       26
        
             root = ../..;

     

       27
       27
        
             fileset = unions (

     

       28
       28
        
               map (lib.path.append ../..) [

     

       29
       29
       +
                 ".version"

     

       30
       30
       +
                 "ci/supportedSystems.json"

     

       31
       31
       +
                 "ci/eval/attrpaths.nix"

     

       32
       32
       +
                 "ci/eval/chunk.nix"

     

       33
       33
       +
                 "ci/eval/outpaths.nix"

     

       29
       34
        
                 "default.nix"

     

       30
       35
        
                 "doc"

     

       31
       36
        
                 "lib"

     
···

       33
       38
        
                 "modules"

     

       34
       39
        
                 "nixos"

     

       35
       40
        
                 "pkgs"

     

       36
       36
       -
                 ".version"

     

       37
       37
       -
                 "ci/supportedSystems.json"

     

       38
       41
        
               ]

     

       39
       42
        
             );

     

       40
       43
        
           };

     
···

       60
       63
        
               export GC_INITIAL_HEAP_SIZE=4g

     

       61
       64
        
               command time -f "Attribute eval done [%MKB max resident, %Es elapsed] %C" \

     

       62
       65
        
                 nix-instantiate --eval --strict --json --show-trace \

     

       63
       63
       -
                   "$src/pkgs/top-level/release-attrpaths-superset.nix" \

     

       66
       66
       +
                   "$src/ci/eval/attrpaths.nix" \

     

       64
       67
        
                   -A paths \

     

       65
       68
        
                   -I "$src" \

     

       66
       69
        
                   --option restrict-eval true \

     
···

       78
       81
        
             attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",

     

       79
       82
        
             # The number of attributes per chunk, see ./README.md for more info.

     

       80
       83
        
             chunkSize ? 5000,

     

       81
       81
       -
             checkMeta ? true,

     

       82
       84
        
       

     

       83
       85
        
             # Don't try to eval packages marked as broken.

     

       84
       86
        
             includeBroken ? false,

     
···

       99
       101
        
               set +e

     

       100
       102
        
               command time -o "$outputDir/timestats/$myChunk" \

     

       101
       103
        
                 -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \

     

       102
       102
       -
                 nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \

     

       104
       104
       +
                 nix-env -f "${nixpkgs}/ci/eval/chunk.nix" \

     

       103
       105
        
                 --eval-system "$system" \

     

       104
       106
        
                 --option restrict-eval true \

     

       105
       107
        
                 --option allow-import-from-derivation false \

     
···

       110
       112
        
                 --arg myChunk "$myChunk" \

     

       111
       113
        
                 --arg attrpathFile "${attrpathFile}" \

     

       112
       114
        
                 --arg systems "[ \"$system\" ]" \

     

       113
       113
       -
                 --arg checkMeta ${lib.boolToString checkMeta} \

     

       114
       115
        
                 --arg includeBroken ${lib.boolToString includeBroken} \

     

       115
       116
        
                 -I ${nixpkgs} \

     

       116
       117
        
                 -I ${attrpathFile} \

doc/release-notes/rl-2511.section.md

···

       65
       65
        
       

     

       66
       66
        
       - `ansible-later` has been removed because it was discontinued by the author.

     

       67
       67
        
       

     

       68
       68
       +
       - `k3s` airgap images passthru attributes have changed:

     

       69
       69
       +
         - `imagesList` was removed

     

       70
       70
       +
         - `airgapImages` was renamed to `airgap-images`

     

       71
       71
       +
         - `airgapImagesAmd64` was renamed to `airgap-images-amd64-tar-zst`

     

       72
       72
       +
         - `airgapImagesArm64` was renamed to `airgap-images-arm64-tar-zst`

     

       73
       73
       +
         - `airgapImagesArm` was renamed to `airgap-images-arm-tar-zst`

     

       74
       74
       +
       

     

       68
       75
        
       - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).

     

       69
       76
        
       

     

       70
       77
        
       - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.

maintainers/maintainer-list.nix

···

       21325
       21325
        
           githubId = 23345803;

     

       21326
       21326
        
           name = "Szymon Scholz";

     

       21327
       21327
        
         };

     

       21328
       21328
       +
         ratakor = {

     

       21329
       21329
       +
           name = "Ratakor";

     

       21330
       21330
       +
           github = "ratakor";

     

       21331
       21331
       +
           githubId = 45130910;

     

       21332
       21332
       +
           email = "ratakor@disroot.org";

     

       21333
       21333
       +
           keys = [ { fingerprint = "B60F 8F80 D6CD C5D2 58CF  14C3 241B 1CBE 567B 287E"; } ];

     

       21334
       21334
       +
         };

     

       21328
       21335
        
         ratcornu = {

     

       21329
       21336
        
           email = "ratcornu+programmation@skaven.org";

     

       21330
       21337
        
           github = "RatCornu";

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

···

       62
       62
        
       

     

       63
       63
        
       - [TuneD](https://tuned-project.org/), a system tuning service for Linux. Available as [services.tuned](#opt-services.tuned.enable).

     

       64
       64
        
       

     

       65
       65
       +
       - [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable).

     

       66
       66
       +
       

     

       65
       67
        
       - [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable).

     

       66
       68
        
       

     

       67
       69
        
       - [postfix-tlspol](https://github.com/Zuplu/postfix-tlspol), MTA-STS and DANE resolver and TLS policy server for Postfix. Available as [services.postfix-tlspol](#opt-services.postfix-tlspol.enable).

+6 -6

nixos/modules/installer/tools/nix-fallback-paths.nix

···

       1
       1
        
       {

     

       2
       2
       -
         x86_64-linux = "/nix/store/gy397nw6h414f4l4vxny1wg8cn4i955d-nix-2.28.4";

     

       3
       3
       -
         i686-linux = "/nix/store/k192aqw8zh71zrli5abqd5wg01bqwmh9-nix-2.28.4";

     

       4
       4
       -
         aarch64-linux = "/nix/store/cp0bzvj8vf5y2z0nimq57crcq6h419fj-nix-2.28.4";

     

       5
       5
       -
         riscv64-linux = "/nix/store/zav2zzhxld8fqvj7hb5z83ggd3ij6888-nix-riscv64-unknown-linux-gnu-2.28.4";

     

       6
       6
       -
         x86_64-darwin = "/nix/store/gj4y690ligr5gawmpnkiw2qs087m068w-nix-2.28.4";

     

       7
       7
       -
         aarch64-darwin = "/nix/store/nb6nkjac7nj242j3m56pkdkbikfjw343-nix-2.28.4";

     

       2
       2
       +
         x86_64-linux = "/nix/store/0bvxg6fr61zrlhi93azhp8yfhb5rcrs9-nix-2.28.5";

     

       3
       3
       +
         i686-linux = "/nix/store/m5na49mxl4xpcs3xh086s5v08jqjhbmb-nix-2.28.5";

     

       4
       4
       +
         aarch64-linux = "/nix/store/95rhdhjfwbi7ilwy5j0knj1852p7x6c6-nix-2.28.5";

     

       5
       5
       +
         riscv64-linux = "/nix/store/cqiiv36c773023p6lp9h4ff57fjlzisk-nix-riscv64-unknown-linux-gnu-2.28.5";

     

       6
       6
       +
         x86_64-darwin = "/nix/store/xiw5636h616yi3balx96pmdk6b052rhk-nix-2.28.5";

     

       7
       7
       +
         aarch64-darwin = "/nix/store/sax8chv80d9fy4s0y3ahsr9y4kc2f0ib-nix-2.28.5";

     

       8
       8
        
       }

nixos/modules/module-list.nix

···

       362
       362
        
         ./programs/xwayland.nix

     

       363
       363
        
         ./programs/yazi.nix

     

       364
       364
        
         ./programs/ydotool.nix

     

       365
       365
       +
         ./programs/yubikey-manager.nix

     

       365
       366
        
         ./programs/yubikey-touch-detector.nix

     

       366
       367
        
         ./programs/zmap.nix

     

       367
       368
        
         ./programs/zoom-us.nix

+29

nixos/modules/programs/yubikey-manager.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.programs.yubikey-manager;

     

       10
       10
       +
       in

     

       11
       11
       +
       {

     

       12
       12
       +
         options = {

     

       13
       13
       +
           programs.yubikey-manager = {

     

       14
       14
       +
             enable = lib.mkEnableOption "yubikey-manager";

     

       15
       15
       +
           };

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

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

     

       19
       19
       +
           environment.systemPackages = [ cfg.package ];

     

       20
       20
       +
       

     

       21
       21
       +
           services = {

     

       22
       22
       +
             pcscd.enable = true;

     

       23
       23
       +
       

     

       24
       24
       +
             # The udev rules we want aren't included in the yubikey-manager package, but

     

       25
       25
       +
             # we can get them from yubikey-personalization.

     

       26
       26
       +
             udev.packages = [ pkgs.yubikey-personalization ];

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
       }

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···

       258
       258
        
               bootspec = get_bootspec(gen.profile, gen.generation)

     

       259
       259
        
               known_paths.append(copy_from_file(bootspec.kernel, True).name)

     

       260
       260
        
               known_paths.append(copy_from_file(bootspec.initrd, True).name)

     

       261
       261
       +
               if bootspec.devicetree is not None:

     

       262
       262
       +
                   known_paths.append(copy_from_file(bootspec.devicetree, True).name)

     

       261
       263
        
           for path in (BOOT_MOUNT_POINT / "loader/entries").glob("nixos*-generation-[1-9]*.conf", case_sensitive=False):

     

       262
       264
        
               if rex_profile.match(path.name):

     

       263
       265
        
                   prof = rex_profile.sub(r"\1", path.name)

+1 -9

nixos/tests/k3s/airgap-images.nix

···

       22
       22
        
                 "--disable servicelb"

     

       23
       23
        
                 "--disable traefik"

     

       24
       24
        
               ];

     

       25
       25
       -
               images = [ k3s.airgapImages ];

     

       25
       25
       +
               images = [ k3s.airgap-images ];

     

       26
       26
        
             };

     

       27
       27
        
           };

     

       28
       28
        
       

     

       29
       29
        
           testScript = ''

     

       30
       30
       -
             import json

     

       31
       31
       -
       

     

       32
       32
       -
             start_all()

     

       33
       30
        
             machine.wait_for_unit("k3s")

     

       34
       31
        
             machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"")

     

       35
       35
       -
             images = json.loads(machine.succeed("crictl img -o json"))

     

       36
       36
       -
             image_names = [i["repoTags"][0] for i in images["images"]]

     

       37
       37
       -
             with open("${k3s.imagesList}") as expected_images:

     

       38
       38
       -
               for line in expected_images:

     

       39
       39
       -
                 assert line.rstrip() in image_names, f"The image {line.rstrip()} is not present in the airgap images archive"

     

       40
       32
        
           '';

     

       41
       33
        
         }

     

       42
       34
        
       )

+2 -2

pkgs/applications/graphics/ImageMagick/default.nix

···

       85
       85
        
       

     

       86
       86
        
       stdenv.mkDerivation (finalAttrs: {

     

       87
       87
        
         pname = "imagemagick";

     

       88
       88
       -
         version = "7.1.2-2";

     

       88
       88
       +
         version = "7.1.2-3";

     

       89
       89
        
       

     

       90
       90
        
         src = fetchFromGitHub {

     

       91
       91
        
           owner = "ImageMagick";

     

       92
       92
        
           repo = "ImageMagick";

     

       93
       93
        
           tag = finalAttrs.version;

     

       94
       94
       -
           hash = "sha256-bQzHZGTr3dl8G7cMSjC5Is+H/7pnRtqgp/rvYZeJDu0=";

     

       94
       94
       +
           hash = "sha256-L4apUdF1VJXSVqWAyjYFG/4qDJoJ0ObmSOpd90kqXsU=";

     

       95
       95
        
         };

     

       96
       96
        
       

     

       97
       97
        
         outputs = [

+15 -7

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

···

       1
       1
        
       {

     

       2
       2
       -
         "airgap-images-amd64": {

     

       2
       2
       +
         "airgap-images-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "f98a57f7b25a4537096fbe9755f96cfd05bfe6fc6315f111c0f44e1abf4aad6d"

     

       5
       5
       +
         },

     

       6
       6
       +
         "airgap-images-amd64-tar-zst": {

     

       3
       7
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst",

     

       4
       8
        
           "sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842"

     

       5
       9
        
         },

     

       6
       6
       -
         "airgap-images-arm": {

     

       10
       10
       +
         "airgap-images-arm-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.gz",

     

       12
       12
       +
           "sha256": "33df3a2b155118198c48e66426a04292a348aa53fef126a3cb8e4fe7aea83ccc"

     

       13
       13
       +
         },

     

       14
       14
       +
         "airgap-images-arm-tar-zst": {

     

       7
       15
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst",

     

       8
       16
        
           "sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5"

     

       9
       17
        
         },

     

       10
       10
       -
         "airgap-images-arm64": {

     

       18
       18
       +
         "airgap-images-arm64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.gz",

     

       20
       20
       +
           "sha256": "bba9c2e417ece797a5ae8bf9346bb35dc8ab163828c801a2cb512d6097610b52"

     

       21
       21
       +
         },

     

       22
       22
       +
         "airgap-images-arm64-tar-zst": {

     

       11
       23
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst",

     

       12
       24
        
           "sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452"

     

       13
       13
       -
         },

     

       14
       14
       -
         "images-list": {

     

       15
       15
       -
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-images.txt",

     

       16
       16
       -
           "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"

     

       17
       25
        
         }

     

       18
       26
        
       }

+15 -7

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

···

       1
       1
        
       {

     

       2
       2
       -
         "airgap-images-amd64": {

     

       2
       2
       +
         "airgap-images-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "fa4f87e7e82c0e613f854eedf8f64d2cdabbd127f3ae84707ed1ca59e2137855"

     

       5
       5
       +
         },

     

       6
       6
       +
         "airgap-images-amd64-tar-zst": {

     

       3
       7
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

     

       4
       8
        
           "sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412"

     

       5
       9
        
         },

     

       6
       6
       -
         "airgap-images-arm": {

     

       10
       10
       +
         "airgap-images-arm-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",

     

       12
       12
       +
           "sha256": "0b6009407069fdd684d9627c5fa4bdb31ea4644172f1f429a2cce15d2c18631d"

     

       13
       13
       +
         },

     

       14
       14
       +
         "airgap-images-arm-tar-zst": {

     

       7
       15
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",

     

       8
       16
        
           "sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6"

     

       9
       17
        
         },

     

       10
       10
       -
         "airgap-images-arm64": {

     

       18
       18
       +
         "airgap-images-arm64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

     

       20
       20
       +
           "sha256": "6fa41db4ee001c1db8a404dd38f17f2426f27f688f9f7a2a76f4ef336f51c886"

     

       21
       21
       +
         },

     

       22
       22
       +
         "airgap-images-arm64-tar-zst": {

     

       11
       23
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

     

       12
       24
        
           "sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47"

     

       13
       13
       -
         },

     

       14
       14
       -
         "images-list": {

     

       15
       15
       -
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-images.txt",

     

       16
       16
       -
           "sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"

     

       17
       25
        
         }

     

       18
       26
        
       }

+15 -7

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

···

       1
       1
        
       {

     

       2
       2
       -
         "airgap-images-amd64": {

     

       2
       2
       +
         "airgap-images-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "f6a8720aa9bb03d0c8a97a93e994557292f1efba1fa6648cd8a07830622ce748"

     

       5
       5
       +
         },

     

       6
       6
       +
         "airgap-images-amd64-tar-zst": {

     

       3
       7
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

     

       4
       8
        
           "sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039"

     

       5
       9
        
         },

     

       6
       6
       -
         "airgap-images-arm": {

     

       10
       10
       +
         "airgap-images-arm-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",

     

       12
       12
       +
           "sha256": "9aa6f9f33e58e04fb9d8f9cd5c51dd01c6092d7b5434f84341b2f74bc8de783e"

     

       13
       13
       +
         },

     

       14
       14
       +
         "airgap-images-arm-tar-zst": {

     

       7
       15
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",

     

       8
       16
        
           "sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0"

     

       9
       17
        
         },

     

       10
       10
       -
         "airgap-images-arm64": {

     

       18
       18
       +
         "airgap-images-arm64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

     

       20
       20
       +
           "sha256": "9633b71655ed0f4af556c148f9bf7753221b3c9b42a8d902391187789302adca"

     

       21
       21
       +
         },

     

       22
       22
       +
         "airgap-images-arm64-tar-zst": {

     

       11
       23
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

     

       12
       24
        
           "sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9"

     

       13
       13
       -
         },

     

       14
       14
       -
         "images-list": {

     

       15
       15
       -
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-images.txt",

     

       16
       16
       -
           "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"

     

       17
       25
        
         }

     

       18
       26
        
       }

+15 -7

pkgs/applications/networking/cluster/k3s/1_33/images-versions.json

···

       1
       1
        
       {

     

       2
       2
       -
         "airgap-images-amd64": {

     

       2
       2
       +
         "airgap-images-amd64-tar-gz": {

     

       3
       3
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz",

     

       4
       4
       +
           "sha256": "64690dc963f6cbff8adb175a1bc41e6bf207734a9a214362544a36361a2d8350"

     

       5
       5
       +
         },

     

       6
       6
       +
         "airgap-images-amd64-tar-zst": {

     

       3
       7
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",

     

       4
       8
        
           "sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9"

     

       5
       9
        
         },

     

       6
       6
       -
         "airgap-images-arm": {

     

       10
       10
       +
         "airgap-images-arm-tar-gz": {

     

       11
       11
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.gz",

     

       12
       12
       +
           "sha256": "878d17722dd98e7d88de93a83606e0c9b0d7587c7e4a043559b5236a353fb224"

     

       13
       13
       +
         },

     

       14
       14
       +
         "airgap-images-arm-tar-zst": {

     

       7
       15
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",

     

       8
       16
        
           "sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5"

     

       9
       17
        
         },

     

       10
       10
       -
         "airgap-images-arm64": {

     

       18
       18
       +
         "airgap-images-arm64-tar-gz": {

     

       19
       19
       +
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz",

     

       20
       20
       +
           "sha256": "e4ab063deb50241e60218a3a30ce090a5817daa0f38dacd10651e27b2be28b9e"

     

       21
       21
       +
         },

     

       22
       22
       +
         "airgap-images-arm64-tar-zst": {

     

       11
       23
        
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",

     

       12
       24
        
           "sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6"

     

       13
       13
       -
         },

     

       14
       14
       -
         "images-list": {

     

       15
       15
       -
           "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-images.txt",

     

       16
       16
       -
           "sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"

     

       17
       25
        
         }

     

       18
       26
        
       }

+14 -34

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

···

       130
       130
        
         traefikChart = fetchurl chartVersions.traefik;

     

       131
       131
        
         traefik-crdChart = fetchurl chartVersions.traefik-crd;

     

       132
       132
        
       

     

       133
       133
       -
         mutFirstChar =

     

       134
       134
       -
           f: s:

     

       135
       135
       -
           let

     

       136
       136
       -
             firstChar = f (lib.substring 0 1 s);

     

       137
       137
       -
             rest = lib.substring 1 (-1) s;

     

       138
       138
       -
           in

     

       139
       139
       -
           firstChar + rest;

     

       140
       140
       -
       

     

       141
       141
       -
         kebabToCamel =

     

       142
       142
       -
           s:

     

       143
       143
       -
           mutFirstChar lib.toLower (lib.concatMapStrings (mutFirstChar lib.toUpper) (lib.splitString "-" s));

     

       144
       144
       -
       

     

       145
       145
       -
         # finds the images archive for the desired architecture, throws in case no suitable archive is found

     

       146
       146
       -
         findImagesArchive =

     

       147
       147
       -
           arch:

     

       148
       148
       -
           let

     

       149
       149
       -
             imagesVersionsNames = builtins.attrNames imagesVersions;

     

       150
       150
       -
           in

     

       151
       151
       -
           lib.findFirst (

     

       152
       152
       -
             n: lib.hasInfix arch n

     

       153
       153
       -
           ) (throw "k3s: no airgap images for ${arch} available") imagesVersionsNames;

     

       154
       154
       -
       

     

       155
       133
        
         # a shortcut that provides the images archive for the host platform. Currently only supports

     

       156
       134
        
         # aarch64 (arm64) and x86_64 (amd64), throws on other architectures.

     

       157
       157
       -
         airgapImages = fetchurl (

     

       158
       158
       -
           if stdenv.hostPlatform.isAarch64 then

     

       159
       159
       -
             imagesVersions.${findImagesArchive "arm64"}

     

       160
       160
       -
           else if stdenv.hostPlatform.isx86_64 then

     

       161
       161
       -
             imagesVersions.${findImagesArchive "amd64"}

     

       162
       162
       -
           else

     

       163
       163
       -
             throw "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture."

     

       164
       164
       -
         );

     

       135
       135
       +
         airgap-images =

     

       136
       136
       +
           {

     

       137
       137
       +
             x86_64-linux = fetchurl imagesVersions.airgap-images-amd64-tar-zst;

     

       138
       138
       +
             aarch64-linux = fetchurl imagesVersions.airgap-images-arm64-tar-zst;

     

       139
       139
       +
           }

     

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

     

       141
       141
       +
             or (throw "k3s: no airgap images available for system ${stdenv.hostPlatform.system}, consider using an image archive with an explicit architecture.");

     

       165
       142
        
       

     

       166
       143
        
         # so, k3s is a complicated thing to package

     

       167
       144
        
         # This derivation attempts to avoid including any random binaries from the

     
···

       467
       444
        
         '';

     

       468
       445
        
       

     

       469
       446
        
         passthru = {

     

       470
       470
       -
           inherit airgapImages;

     

       447
       447
       +
           inherit airgap-images;

     

       471
       448
        
           k3sCNIPlugins = k3sCNIPlugins;

     

       472
       449
        
           k3sContainerd = k3sContainerd;

     

       473
       450
        
           k3sRepo = k3sRepo;

     
···

       481
       458
        
             lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;

     

       482
       459
        
           tests = passthru.mkTests k3sVersion;

     

       483
       460
        
           updateScript = updateScript;

     

       461
       461
       +
           imagesList = throw "k3s.imagesList was removed";

     

       462
       462
       +
           airgapImages = throw "k3s.airgapImages was renamed to k3s.airgap-images";

     

       463
       463
       +
           airgapImagesAmd64 = throw "k3s.airgapImagesAmd64 was renamed to k3s.airgap-images-amd64-tar-zst";

     

       464
       464
       +
           airgapImagesArm64 = throw "k3s.airgapImagesArm64 was renamed to k3s.airgap-images-arm64-tar-zst";

     

       465
       465
       +
           airgapImagesArm = throw "k3s.airgapImagesArm was renamed to k3s.airgap-images-arm-tar-zst";

     

       484
       466
        
         }

     

       485
       485
       -
         // (lib.mapAttrs' (

     

       486
       486
       -
           name: _: lib.nameValuePair (kebabToCamel name) (fetchurl imagesVersions.${name})

     

       487
       487
       -
         ) imagesVersions);

     

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

     

       488
       468
        
       

     

       489
       469
        
         meta = baseMeta;

     

       490
       470
        
       }

+5 -7

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

···

       83
       83
        
       SHA256_HASHES="\

     

       84
       84
        
       $($CURL "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-amd64.txt")

     

       85
       85
        
       $($CURL "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm64.txt")

     

       86
       86
       -
       $($CURL "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm.txt")

     

       87
       87
       -
       $($CURL "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/k3s-images.txt" | sha256sum | cut -d' ' -f1)  k3s-images.txt"

     

       86
       86
       +
       $($CURL "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm.txt")"

     

       88
       87
        
       

     

       89
       88
        
       # Get all airgap images files associated with this release

     

       90
       89
        
       IMAGES_ARCHIVES=$($CURL "https://api.github.com/repos/k3s-io/k3s/releases/tags/v${K3S_VERSION}" | \

     

       91
       91
       -
           # Filter the assets so that only zstd archives and text files that have "images" in their name remain

     

       92
       92
       -
           jq -r '.assets[] | select(.name | (contains("images") and (endswith(".tar.zst") or endswith("k3s-images.txt")))) |

     

       93
       93
       -
               "\(.name) \(.browser_download_url)"')

     

       90
       90
       +
           # Filter the assets for airgap images archives

     

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

     

       94
       92
        
       

     

       95
       93
        
       # Create a JSON object for each airgap images file and prefetch all download URLs in the process

     

       96
       94
        
       # Combine all JSON objects and write the result to images-versions.json

     

       97
       95
        
       while read -r name url; do

     

       98
       96
        
           # Pick the right hash based on the name

     

       99
       97
        
           sha256=$(grep "$name" <<< "$SHA256_HASHES" | cut -d ' ' -f 1)

     

       100
       100
       -
           # Remove the k3s- prefix and file endings

     

       101
       101
       -
           clean_name=$(sed -e 's/^k3s-//' -e 's/\.tar\.zst//' -e 's/\.txt/-list/' <<< "$name")

     

       98
       98
       +
           # Remove the k3s prefix and replace all dots with hyphens

     

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

     

       102
       100
        
           jq --null-input --arg name "$clean_name" \

     

       103
       101
        
                   --arg url "$url" \

     

       104
       102
        
                   --arg sha256 "$sha256" \

+10

pkgs/by-name/_3/_389-ds-base/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         autoconf,

     

       6
       7
        
         automake,

     

       7
       8
        
         cargo,

     
···

       48
       49
        
           rev = "389-ds-base-${finalAttrs.version}";

     

       49
       50
        
           hash = "sha256-hRTK9xBu8v8+SGa/3IB8Alh/aGUiRRn2LmYOvXy0Yd4=";

     

       50
       51
        
         };

     

       52
       52
       +
       

     

       53
       53
       +
         patches = [

     

       54
       54
       +
           (fetchpatch {

     

       55
       55
       +
             # https://github.com/389ds/389-ds-base/pull/6930

     

       56
       56
       +
             name = "389-ds-base-rustc-1_89.patch";

     

       57
       57
       +
             url = "https://github.com/389ds/389-ds-base/commit/1701419551c246e9dc21778b118220eeb2258125.patch";

     

       58
       58
       +
             hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA=";

     

       59
       59
       +
           })

     

       60
       60
       +
         ];

     

       51
       61
        
       

     

       52
       62
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       53
       63
        
           inherit (finalAttrs) src;

+2 -1

pkgs/by-name/ag/age-plugin-se/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         fetchFromGitHub,

     

       4
       4
       +
         llvmPackages,

     

       4
       5
        
         swiftPackages,

     

       5
       6
        
         swift,

     

       6
       7
        
         swiftpm,

     

       7
       8
        
         nix-update-script,

     

       8
       9
        
       }:

     

       9
       10
        
       let

     

       10
       10
       -
         inherit (swiftPackages) stdenv;

     

       11
       11
       +
         inherit (llvmPackages) stdenv;

     

       11
       12
        
       in

     

       12
       13
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
       14
        
         pname = "age-plugin-se";

+99 -99

pkgs/by-name/az/azure-cli/extensions-generated.json

···

       36
       36
        
         },

     

       37
       37
        
         "aem": {

     

       38
       38
        
           "pname": "aem",

     

       39
       39
       -
           "version": "1.0.0",

     

       40
       40
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-1.0.0-py2.py3-none-any.whl",

     

       41
       41
       -
           "hash": "sha256-3QYsiwJ7avGM4Fg8H88shs3JKBo2cOSh0F39bTN/8vA=",

     

       39
       39
       +
           "version": "1.0.1",

     

       40
       40
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-1.0.1-py2.py3-none-any.whl",

     

       41
       41
       +
           "hash": "sha256-QDkq7GjOpqZSUFXkxrL5OjJwSnGHmRH/8r6N/Amriq0=",

     

       42
       42
        
           "description": "Manage Azure Enhanced Monitoring Extensions for SAP"

     

       43
       43
        
         },

     

       44
       44
        
         "ai-examples": {

     
···

       50
       50
        
         },

     

       51
       51
        
         "aks-preview": {

     

       52
       52
        
           "pname": "aks-preview",

     

       53
       53
       -
           "version": "18.0.0b15",

     

       54
       54
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b15-py2.py3-none-any.whl",

     

       55
       55
       -
           "hash": "sha256-YjRPELWfLshLQHgZTa7jXS96nyYiZ7h2Gu25/wKvw7c=",

     

       53
       53
       +
           "version": "18.0.0b33",

     

       54
       54
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b33-py2.py3-none-any.whl",

     

       55
       55
       +
           "hash": "sha256-Zkp5Nzl+eQ7PPniDF7/K5II2xIG6OKC3Rhm3ZTpyILc=",

     

       56
       56
        
           "description": "Provides a preview for upcoming AKS features"

     

       57
       57
        
         },

     

       58
       58
       -
         "akshybrid": {

     

       59
       59
       -
           "pname": "akshybrid",

     

       60
       60
       -
           "version": "0.1.2",

     

       61
       61
       -
           "url": "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/akshybrid-0.1.2-py3-none-any.whl",

     

       62
       62
       -
           "hash": "sha256-l2fNpETEIVc7wiDgHNWKZ8MKNhdc7bposEVKPG6YOo4=",

     

       63
       63
       -
           "description": "Microsoft Azure Command-Line Tools HybridContainerService Extension"

     

       64
       64
       -
         },

     

       65
       58
        
         "alb": {

     

       66
       59
        
           "pname": "alb",

     

       67
       67
       -
           "version": "2.0.0",

     

       68
       68
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-2.0.0-py3-none-any.whl",

     

       69
       69
       -
           "hash": "sha256-Z9Pbk2dkAqSyFDlpuyD7jsYidiTsUUnTF6GRtX0WqcM=",

     

       60
       60
       +
           "version": "2.0.1",

     

       61
       61
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-2.0.1-py3-none-any.whl",

     

       62
       62
       +
           "hash": "sha256-B3/01NiuZFVvTGrqQK9lBEu++7hnhHGLM6bL8gvBLx4=",

     

       70
       63
        
           "description": "Microsoft Azure Command-Line Tools ALB Extension"

     

       71
       64
        
         },

     

       72
       65
        
         "alertsmanagement": {

     
···

       78
       71
        
         },

     

       79
       72
        
         "amg": {

     

       80
       73
        
           "pname": "amg",

     

       81
       81
       -
           "version": "2.6.1",

     

       82
       82
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.6.1-py3-none-any.whl",

     

       83
       83
       -
           "hash": "sha256-ERGri8mXJtLy/acz8R2UqdmILr7JT4bTQaU6GtxhKjs=",

     

       74
       74
       +
           "version": "2.8.0",

     

       75
       75
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.0-py3-none-any.whl",

     

       76
       76
       +
           "hash": "sha256-E4Id15eoKStqeQynaHisZLcZsiApMf6uV/J8xWz/s5w=",

     

       84
       77
        
           "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"

     

       85
       78
        
         },

     

       86
       79
        
         "amlfs": {

     
···

       92
       85
        
         },

     

       93
       86
        
         "apic-extension": {

     

       94
       87
        
           "pname": "apic-extension",

     

       95
       95
       -
           "version": "1.2.0b2",

     

       96
       96
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.2.0b2-py3-none-any.whl",

     

       97
       97
       -
           "hash": "sha256-QtaiixX5daX3pOpi7jnJFH2cXe+J0+J/q9PJVZqkE28=",

     

       88
       88
       +
           "version": "1.2.0b3",

     

       89
       89
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.2.0b3-py3-none-any.whl",

     

       90
       90
       +
           "hash": "sha256-ATO7B3Dzzk8nswan5Tvym7eloe3OD9ZO+yrfkpTWZns=",

     

       98
       91
        
           "description": "Microsoft Azure Command-Line Tools ApicExtension Extension"

     

       99
       92
        
         },

     

       100
       93
        
         "appservice-kube": {

     
···

       110
       103
        
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arcgateway-1.0.0b1-py3-none-any.whl",

     

       111
       104
        
           "hash": "sha256-Mw/R8ZdL7OFtySTjU3MbHw9EA6WONuM0dwXwHb2/A9E=",

     

       112
       105
        
           "description": "Microsoft Azure Command-Line Tools Arcgateway Extension"

     

       106
       106
       +
         },

     

       107
       107
       +
         "arize-ai": {

     

       108
       108
       +
           "pname": "arize-ai",

     

       109
       109
       +
           "version": "1.0.0",

     

       110
       110
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arize_ai-1.0.0-py3-none-any.whl",

     

       111
       111
       +
           "hash": "sha256-re+iMmNO+fYl5j5oTGy4vm6OHATHytv5TIaYl2k6fVg=",

     

       112
       112
       +
           "description": "Microsoft Azure Command-Line Tools ArizeAi Extension"

     

       113
       113
        
         },

     

       114
       114
        
         "astronomer": {

     

       115
       115
        
           "pname": "astronomer",

     
···

       162
       162
        
         },

     

       163
       163
        
         "bastion": {

     

       164
       164
        
           "pname": "bastion",

     

       165
       165
       -
           "version": "1.4.1",

     

       166
       166
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.1-py3-none-any.whl",

     

       167
       167
       -
           "hash": "sha256-Zx50jU9Vmt8vNe/50g8jWaxjeuXlHlMYVNG/v8exRmU=",

     

       165
       165
       +
           "version": "1.4.2",

     

       166
       166
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.2-py3-none-any.whl",

     

       167
       167
       +
           "hash": "sha256-TTaKDFaydQ4lW+LfvEHbWX4WARj3Xwg/yeHmq9aNEoI=",

     

       168
       168
        
           "description": "Microsoft Azure Command-Line Tools Bastion Extension"

     

       169
       169
        
         },

     

       170
       170
        
         "billing-benefits": {

     
···

       225
       225
        
         },

     

       226
       226
        
         "confluent": {

     

       227
       227
        
           "pname": "confluent",

     

       228
       228
       -
           "version": "1.0.0",

     

       229
       229
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-1.0.0-py3-none-any.whl",

     

       230
       230
       -
           "hash": "sha256-CmHPSaZdVmhow/CwCb45gua03Dw2m+nP1Cu35agO7xk=",

     

       228
       228
       +
           "version": "1.1.0",

     

       229
       229
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-1.1.0-py3-none-any.whl",

     

       230
       230
       +
           "hash": "sha256-X/jWCmB/B01Z56Y/6xcl+4e2d7DDDsMHaqZ0/PtU6TU=",

     

       231
       231
        
           "description": "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension"

     

       232
       232
        
         },

     

       233
       233
        
         "connectedmachine": {

     
···

       246
       246
        
         },

     

       247
       247
        
         "cosmosdb-preview": {

     

       248
       248
        
           "pname": "cosmosdb-preview",

     

       249
       249
       -
           "version": "1.6.0",

     

       250
       250
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.0-py2.py3-none-any.whl",

     

       251
       251
       -
           "hash": "sha256-OO8IjVRhGOfsCb/Oot7Dc7PmfNsDmaXiCuG0at8Hb44=",

     

       249
       249
       +
           "version": "1.6.1",

     

       250
       250
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.1-py2.py3-none-any.whl",

     

       251
       251
       +
           "hash": "sha256-kfhttzgrlnyAoD6pe7PKjGHdKE0U6G1GYNe1a4ZA3f0=",

     

       252
       252
        
           "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"

     

       253
       253
        
         },

     

       254
       254
        
         "costmanagement": {

     
···

       258
       258
        
           "hash": "sha256-bl4FPQW61q1jBb0CT1HjVeYP3ou2oDNQ39gcJUN9LkU=",

     

       259
       259
        
           "description": "Microsoft Azure Command-Line Tools CostManagementClient Extension"

     

       260
       260
        
         },

     

       261
       261
       -
         "csvmware": {

     

       262
       262
       -
           "pname": "csvmware",

     

       263
       263
       -
           "version": "0.3.0",

     

       264
       264
       -
           "url": "https://github.com/Azure/az-csvmware-cli/releases/download/0.3.0/csvmware-0.3.0-py2.py3-none-any.whl",

     

       265
       265
       -
           "hash": "sha256-37l2fwWsE8di6p3EMnFp5jpcEYeRI1RLIA7bmiyaikI=",

     

       266
       266
       -
           "description": "Manage Azure VMware Solution by CloudSimple"

     

       267
       267
       -
         },

     

       268
       261
        
         "custom-providers": {

     

       269
       262
        
           "pname": "custom-providers",

     

       270
       263
        
           "version": "0.2.1",

     
···

       281
       274
        
         },

     

       282
       275
        
         "data-transfer": {

     

       283
       276
        
           "pname": "data-transfer",

     

       284
       284
       -
           "version": "1.0.0b1",

     

       285
       285
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/data_transfer-1.0.0b1-py3-none-any.whl",

     

       286
       286
       -
           "hash": "sha256-dnF7ZpUcGP7d3uywoXZdMmr/INH5y46glKuJwrlenfU=",

     

       277
       277
       +
           "version": "1.0.0b2",

     

       278
       278
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/data_transfer-1.0.0b2-py3-none-any.whl",

     

       279
       279
       +
           "hash": "sha256-PqiantcGNb58p+pQm0kQEPcVkY2dg64IfE9VZhOwz2U=",

     

       287
       280
        
           "description": "Microsoft Azure Command-Line Tools DataTransfer Extension"

     

       288
       281
        
         },

     

       289
       282
        
         "databox": {

     
···

       316
       309
        
         },

     

       317
       310
        
         "datamigration": {

     

       318
       311
        
           "pname": "datamigration",

     

       319
       319
       -
           "version": "1.0.0b5",

     

       320
       320
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b5-py3-none-any.whl",

     

       321
       321
       -
           "hash": "sha256-0ZcMgeoUIB5M+e3qrdnkerWj5jiRd3SDfyQJKip+SBI=",

     

       312
       312
       +
           "version": "1.0.0b6",

     

       313
       313
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b6-py3-none-any.whl",

     

       314
       314
       +
           "hash": "sha256-4YPJCSMBr+10f+FRQtOiqwbhE6POAHpYFQcdESJppzg=",

     

       322
       315
        
           "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"

     

       323
       316
        
         },

     

       324
       317
        
         "dataprotection": {

     
···

       428
       421
        
         },

     

       429
       422
        
         "elastic": {

     

       430
       423
        
           "pname": "elastic",

     

       431
       431
       -
           "version": "1.0.0b3",

     

       432
       432
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b3-py3-none-any.whl",

     

       433
       433
       -
           "hash": "sha256-LzrkMNPDTdQAfIxag3SWNWjMI1WIckZCQoEcxaJuLec=",

     

       424
       424
       +
           "version": "1.0.0b4",

     

       425
       425
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b4-py3-none-any.whl",

     

       426
       426
       +
           "hash": "sha256-+zjE4PUe1FvB7z1i4FFP3EyWBDco/dZe9DbBDMogijY=",

     

       434
       427
        
           "description": "Microsoft Azure Command-Line Tools MicrosoftElastic Extension"

     

       435
       428
        
         },

     

       436
       429
        
         "elastic-san": {

     
···

       463
       456
        
         },

     

       464
       457
        
         "fleet": {

     

       465
       458
        
           "pname": "fleet",

     

       466
       466
       -
           "version": "1.5.2",

     

       467
       467
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.5.2-py3-none-any.whl",

     

       468
       468
       -
           "hash": "sha256-oshfK8G4NECSNxucAke46csKnw4eRBvOrQG2gGLCbq8=",

     

       459
       459
       +
           "version": "1.6.2",

     

       460
       460
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.6.2-py3-none-any.whl",

     

       461
       461
       +
           "hash": "sha256-YZpmg1dWiZOerGTgotBstzYB9FgnxPKGurS7OP01Wbc=",

     

       469
       462
        
           "description": "Microsoft Azure Command-Line Tools Fleet Extension"

     

       470
       463
        
         },

     

       471
       464
        
         "fluid-relay": {

     
···

       531
       524
        
           "hash": "sha256-rEoQ4sxkpNCBjkj/vN3+tDB91WuIdbwBwCaH1HPJ/ps=",

     

       532
       525
        
           "description": "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension"

     

       533
       526
        
         },

     

       534
       534
       -
         "hdinsightonaks": {

     

       535
       535
       -
           "pname": "hdinsightonaks",

     

       536
       536
       -
           "version": "1.0.0b3",

     

       537
       537
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-1.0.0b3-py3-none-any.whl",

     

       538
       538
       -
           "hash": "sha256-9Um4UQe3uD/2T8+lyQpdfpAKXqLv527smx+BaJ5Yw2U=",

     

       539
       539
       -
           "description": "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"

     

       540
       540
       -
         },

     

       541
       527
        
         "healthbot": {

     

       542
       528
        
           "pname": "healthbot",

     

       543
       529
        
           "version": "0.1.0",

     
···

       561
       547
        
         },

     

       562
       548
        
         "image-copy-extension": {

     

       563
       549
        
           "pname": "image-copy-extension",

     

       564
       564
       -
           "version": "1.0.2",

     

       565
       565
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.2-py2.py3-none-any.whl",

     

       566
       566
       -
           "hash": "sha256-POLkBXJTiA9mZ8ezYUJDcl3/CSClNdffYBcQbJTbolY=",

     

       550
       550
       +
           "version": "1.0.3",

     

       551
       551
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.3-py2.py3-none-any.whl",

     

       552
       552
       +
           "hash": "sha256-YTQFsRYinh4Bk2p747oyMAsC3a9rKiR444woUeGTKGg=",

     

       567
       553
        
           "description": "Support for copying managed vm images between regions"

     

       568
       554
        
         },

     

       569
       555
        
         "image-gallery": {

     
···

       610
       596
        
         },

     

       611
       597
        
         "k8s-extension": {

     

       612
       598
        
           "pname": "k8s-extension",

     

       613
       613
       -
           "version": "1.6.5",

     

       614
       614
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.5-py3-none-any.whl",

     

       615
       615
       -
           "hash": "sha256-MZJr6cLtg9m1TD5aYHw2ynfI1Rin5UvaAS7k0QsmZ7k=",

     

       599
       599
       +
           "version": "1.6.7",

     

       600
       600
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.7-py3-none-any.whl",

     

       601
       601
       +
           "hash": "sha256-TU2bAc44Zpd//GyziclX7V8BU1cExK/SduKLV++FxqE=",

     

       616
       602
        
           "description": "Microsoft Azure Command-Line Tools K8s-extension Extension"

     

       617
       603
        
         },

     

       618
       604
        
         "k8s-runtime": {

     
···

       631
       617
        
         },

     

       632
       618
        
         "lambda-test": {

     

       633
       619
        
           "pname": "lambda-test",

     

       634
       634
       -
           "version": "1.0.0b1",

     

       635
       635
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/lambda_test-1.0.0b1-py3-none-any.whl",

     

       636
       636
       -
           "hash": "sha256-KnNCZsTNn4948xKiHJ6Nba3NYLHy+T5yEF55BtQ9a1Q=",

     

       620
       620
       +
           "version": "1.0.0",

     

       621
       621
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/lambda_test-1.0.0-py3-none-any.whl",

     

       622
       622
       +
           "hash": "sha256-6C2Db8ZPDRs8QY2v1RM2cyGVIM/hwtpBAj6c9V4CXxQ=",

     

       637
       623
        
           "description": "Microsoft Azure Command-Line Tools LambdaTest Extension"

     

       638
       624
        
         },

     

       639
       625
        
         "log-analytics": {

     
···

       673
       659
        
         },

     

       674
       660
        
         "managednetworkfabric": {

     

       675
       661
        
           "pname": "managednetworkfabric",

     

       676
       676
       -
           "version": "8.0.0b5",

     

       677
       677
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.0.0b5-py3-none-any.whl",

     

       678
       678
       -
           "hash": "sha256-+6ueiYJnSMnGbawqTGoKkbN9Fvl5NCJuz3RUXW6mGBk=",

     

       662
       662
       +
           "version": "8.1.0",

     

       663
       663
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.1.0-py3-none-any.whl",

     

       664
       664
       +
           "hash": "sha256-HWfTuuYq3P02F3zaK8s8HLkqRcdP7/dWwCy/nX/y4u8=",

     

       679
       665
        
           "description": "Support for managednetworkfabric commands based on 2024-06-15-preview API version"

     

       680
       666
        
         },

     

       681
       667
        
         "managementpartner": {

     
···

       722
       708
        
         },

     

       723
       709
        
         "mongo-db": {

     

       724
       710
        
           "pname": "mongo-db",

     

       725
       725
       -
           "version": "1.0.0b1",

     

       726
       726
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mongo_db-1.0.0b1-py3-none-any.whl",

     

       727
       727
       -
           "hash": "sha256-z/i+P/kx4MT8XskhqjohRL3Xpne9teLe6jmfCv6iv+0=",

     

       711
       711
       +
           "version": "1.0.0",

     

       712
       712
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mongo_db-1.0.0-py3-none-any.whl",

     

       713
       713
       +
           "hash": "sha256-kbU/GRizMppGD2OJ29awQaFUXIMLin0DJpX8Nnymqzo=",

     

       728
       714
        
           "description": "Microsoft Azure Command-Line Tools MongoDb Extension"

     

       729
       715
        
         },

     

       730
       716
        
         "monitor-control-service": {

     
···

       750
       736
        
         },

     

       751
       737
        
         "neon": {

     

       752
       738
        
           "pname": "neon",

     

       753
       753
       -
           "version": "1.0.0b4",

     

       754
       754
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b4-py3-none-any.whl",

     

       755
       755
       -
           "hash": "sha256-iak+Dt5UD+YpVO1mQzatzIYybEyVIZaRabL0Jbgr17M=",

     

       739
       739
       +
           "version": "1.0.0b6",

     

       740
       740
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b6-py3-none-any.whl",

     

       741
       741
       +
           "hash": "sha256-qCyfYQIDoZo8l1bPYDJsLTFfBQJEi7/FyNL6jmS1tTc=",

     

       756
       742
        
           "description": "Microsoft Azure Command-Line Tools Neon Extension"

     

       757
       743
        
         },

     

       758
       744
        
         "network-analytics": {

     
···

       771
       757
        
         },

     

       772
       758
        
         "new-relic": {

     

       773
       759
        
           "pname": "new-relic",

     

       774
       774
       -
           "version": "1.0.1",

     

       775
       775
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.1-py3-none-any.whl",

     

       776
       776
       -
           "hash": "sha256-VKbfg2sflMylsHcjvJ1QUhbVW3fOG+JViuCSIt4mJ2A=",

     

       760
       760
       +
           "version": "1.0.2",

     

       761
       761
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.2-py3-none-any.whl",

     

       762
       762
       +
           "hash": "sha256-/h2TeDcQyRFvcZBwNzxcPrlf638sjfZxYZ97pm7AxB4=",

     

       777
       763
        
           "description": "Microsoft Azure Command-Line Tools NewRelic Extension"

     

       778
       764
        
         },

     

       779
       765
        
         "next": {

     
···

       827
       813
        
         },

     

       828
       814
        
         "palo-alto-networks": {

     

       829
       815
        
           "pname": "palo-alto-networks",

     

       830
       830
       -
           "version": "1.1.1b1",

     

       831
       831
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.1b1-py3-none-any.whl",

     

       832
       832
       -
           "hash": "sha256-jU9qS3I2a9V3gL0VjWwls2OZnhoT6oXUkYCcyaTSlgg=",

     

       816
       816
       +
           "version": "1.1.2b2",

     

       817
       817
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.2b2-py3-none-any.whl",

     

       818
       818
       +
           "hash": "sha256-xOjYa4QakDrL4Xud0OHvJuY7Df2l2B1mnqw8aMlqiAg=",

     

       833
       819
        
           "description": "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension"

     

       834
       820
        
         },

     

       835
       821
        
         "peering": {

     
···

       867
       853
        
           "hash": "sha256-mqrXcCKvAEqWOzQZrBDSM4IO81Jduen2+fx5fhqFmtY=",

     

       868
       854
        
           "description": "Microsoft Azure Command-Line Tools ProviderHub Extension"

     

       869
       855
        
         },

     

       856
       856
       +
         "pscloud": {

     

       857
       857
       +
           "pname": "pscloud",

     

       858
       858
       +
           "version": "1.0.0b1",

     

       859
       859
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/pscloud-1.0.0b1-py3-none-any.whl",

     

       860
       860
       +
           "hash": "sha256-aIobuwrf1z72gUzYZLLIzk1mRrsbIfWlxgpfJ+1n20U=",

     

       861
       861
       +
           "description": "Microsoft Azure Command-Line Tools Pscloud Extension"

     

       862
       862
       +
         },

     

       870
       863
        
         "purview": {

     

       871
       864
        
           "pname": "purview",

     

       872
       865
        
           "version": "0.1.0",

     
···

       876
       869
        
         },

     

       877
       870
        
         "quantum": {

     

       878
       871
        
           "pname": "quantum",

     

       879
       879
       -
           "version": "1.0.0b6",

     

       880
       880
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b6-py3-none-any.whl",

     

       881
       881
       -
           "hash": "sha256-KTYDvglCzrPy4XWsPbBvKKhFI1/mxKwsyBi5/8q2+y8=",

     

       872
       872
       +
           "version": "1.0.0b9",

     

       873
       873
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b9-py3-none-any.whl",

     

       874
       874
       +
           "hash": "sha256-DYnSYOsA+nZJ9V2JIqIHB/697a9ATJLBneyrPsHGoVY=",

     

       882
       875
        
           "description": "Microsoft Azure Command-Line Tools Quantum Extension"

     

       883
       876
        
         },

     

       884
       877
        
         "qumulo": {

     
···

       974
       967
        
         },

     

       975
       968
        
         "stack-hci-vm": {

     

       976
       969
        
           "pname": "stack-hci-vm",

     

       977
       977
       -
           "version": "1.9.1",

     

       978
       978
       -
           "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.9.1-py3-none-any.whl",

     

       979
       979
       -
           "hash": "sha256-BZSQ1tVLSkQE+jQPpZWIHEoM/86RPKT5kAlmKmNa0qY=",

     

       970
       970
       +
           "version": "1.10.4",

     

       971
       971
       +
           "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.10.4-py3-none-any.whl",

     

       972
       972
       +
           "hash": "sha256-MjcpQ7a+5Rw6Z7MAVzoa/qT6HSX6uaV+kWoiMBhK/JM=",

     

       980
       973
        
           "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"

     

       981
       974
        
         },

     

       982
       975
        
         "standbypool": {

     
···

       1002
       995
        
         },

     

       1003
       996
        
         "storage-blob-preview": {

     

       1004
       997
        
           "pname": "storage-blob-preview",

     

       998
       998
       +
           "version": "1.0.0b3",

     

       999
       999
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-1.0.0b3-py2.py3-none-any.whl",

     

       1000
       1000
       +
           "hash": "sha256-88MkEV7z+bGUJXxv16lu14Xj8uRh2wWTji1O3nswYq8=",

     

       1001
       1001
       +
           "description": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension"

     

       1002
       1002
       +
         },

     

       1003
       1003
       +
         "storage-discovery": {

     

       1004
       1004
       +
           "pname": "storage-discovery",

     

       1005
       1005
        
           "version": "1.0.0b1",

     

       1006
       1006
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-1.0.0b1-py2.py3-none-any.whl",

     

       1007
       1007
       -
           "hash": "sha256-H/5FHkFlfI8ooiq+44c3HRHO3YDS5Sz8vtCtrAqRe0E=",

     

       1008
       1008
       -
           "description": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension"

     

       1006
       1006
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_discovery-1.0.0b1-py3-none-any.whl",

     

       1007
       1007
       +
           "hash": "sha256-qa4B0qEbeg09vZRN1E4J2E5LvwbrPd2OG1V/WOhfI1o=",

     

       1008
       1008
       +
           "description": "Microsoft Azure Command-Line Tools StorageDiscovery Extension"

     

       1009
       1009
        
         },

     

       1010
       1010
        
         "storage-mover": {

     

       1011
       1011
        
           "pname": "storage-mover",

     
···

       1072
       1072
        
         },

     

       1073
       1073
        
         "virtual-network-manager": {

     

       1074
       1074
        
           "pname": "virtual-network-manager",

     

       1075
       1075
       -
           "version": "2.0.0",

     

       1076
       1076
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-2.0.0-py3-none-any.whl",

     

       1077
       1077
       -
           "hash": "sha256-EbmCqrszG4PC80yCDl+IfzdKw0tO4R0SL6iD+wymu9w=",

     

       1075
       1075
       +
           "version": "2.0.1",

     

       1076
       1076
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-2.0.1-py3-none-any.whl",

     

       1077
       1077
       +
           "hash": "sha256-p/qdOH8arVdfUoslBT0Al26hMihL8VPMClfNZhwtxto=",

     

       1078
       1078
        
           "description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"

     

       1079
       1079
        
         },

     

       1080
       1080
        
         "virtual-network-tap": {

     
···

       1093
       1093
        
         },

     

       1094
       1094
        
         "vme": {

     

       1095
       1095
        
           "pname": "vme",

     

       1096
       1096
       -
           "version": "1.0.0b4",

     

       1097
       1097
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vme-1.0.0b4-py3-none-any.whl",

     

       1098
       1098
       -
           "hash": "sha256-TMOUIL/cntB9DcQubv7B1OMs+nSwv2RRcFD6KCRwFrk=",

     

       1096
       1096
       +
           "version": "1.0.0b5",

     

       1097
       1097
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vme-1.0.0b5-py3-none-any.whl",

     

       1098
       1098
       +
           "hash": "sha256-DVb8jVymvcXEEmPsz+qGh3Q3iTFVTI904VD3Kq5d3fc=",

     

       1099
       1099
        
           "description": "Microsoft Azure Command-Line Tools Vme Extension"

     

       1100
       1100
        
         },

     

       1101
       1101
        
         "vmware": {

     
···

       1114
       1114
        
         },

     

       1115
       1115
        
         "workload-orchestration": {

     

       1116
       1116
        
           "pname": "workload-orchestration",

     

       1117
       1117
       -
           "version": "1.0.0",

     

       1118
       1118
       -
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-1.0.0-py3-none-any.whl",

     

       1119
       1119
       -
           "hash": "sha256-5o0meWmZDeM45AGTTkD9weX1/tcdg7JJzW1XJRWVdkE=",

     

       1117
       1117
       +
           "version": "2.0.0",

     

       1118
       1118
       +
           "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-2.0.0-py3-none-any.whl",

     

       1119
       1119
       +
           "hash": "sha256-19yRNNBkY4h+KR4RMeu8rGox1kFKDYOdaNM/dEwSrSU=",

     

       1120
       1120
        
           "description": "Microsoft Azure Command-Line Tools WorkloadOperations Extension"

     

       1121
       1121
        
         },

     

       1122
       1122
        
         "workloads": {

pkgs/by-name/az/azure-cli/extensions-manual.nix

···

       151
       151
        
       // lib.optionalAttrs config.allowAliases {

     

       152
       152
        
         # Removed extensions

     

       153
       153
        
         adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038

     

       154
       154
       +
         akshybrid = throw "The 'akshybrid' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8955

     

       154
       155
        
         azurestackhci = throw "The 'azurestackhci' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8898

     

       155
       156
        
         blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370

     

       156
       157
        
         compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240

     

       157
       158
        
         connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194

     

       159
       159
       +
         csvmware = throw "The 'csvmware' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8931

     

       158
       160
        
         deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224

     

       161
       161
       +
         hdinsightonaks = throw "The 'hdinsightonaks' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8956

     

       159
       162
        
         logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459

     

       160
       163
        
         pinecone = throw "The 'pinecone' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8763

     

       161
       164
        
         sap-hana = throw "The 'sap-hana' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8904

pkgs/by-name/ch/chatterino2/common.nix

···

       38
       38
        
           ]

     

       39
       39
        
           ++ lib.optional enableAvifSupport libavif;

     

       40
       40
        
       

     

       41
       41
       +
         preConfigure = ''

     

       42
       42
       +
           if [[ -f "$src/GIT_HASH" ]]; then

     

       43
       43
       +
             export GIT_HASH="$(cat $src/GIT_HASH)"

     

       44
       44
       +
           fi

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       41
       47
        
         cmakeFlags = [

     

       42
       48
        
           (lib.cmakeBool "BUILD_WITH_QT6" true)

     

       43
       49
        
           (lib.cmakeBool "USE_SYSTEM_QTKEYCHAIN" true)

+6 -1

pkgs/by-name/ch/chatterino2/package.nix

···

       18
       18
        
               owner = "Chatterino";

     

       19
       19
        
               repo = "chatterino2";

     

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

     

       21
       21
       -
               hash = "sha256-W2sqlqL6aa68aQ3nE161G64x7K7p8iByX03g1dseQbs=";

     

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

     

       22
       22
        
               fetchSubmodules = true;

     

       23
       23
       +
               leaveDotGit = true;

     

       24
       24
       +
               postFetch = ''

     

       25
       25
       +
                 git -C $out rev-parse --short HEAD > $out/GIT_HASH

     

       26
       26
       +
                 find "$out" -name .git -print0 | xargs -0 rm -rf

     

       27
       27
       +
               '';

     

       23
       28
        
             };

     

       24
       29
        
       

     

       25
       30
        
             passthru = {

+6 -1

pkgs/by-name/ch/chatterino7/package.nix

···

       17
       17
        
               owner = "SevenTV";

     

       18
       18
        
               repo = "chatterino7";

     

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

     

       20
       20
       -
               hash = "sha256-KrAr3DcQDjb+LP+vIf0qLSSgII0m5rNwhncLNHlLaC8=";

     

       20
       20
       +
               hash = "sha256-tft0+vcE+LGPrlv4ZBgzmeF66Jf66iTjUr0pdF1vx24=";

     

       21
       21
        
               fetchSubmodules = true;

     

       22
       22
       +
               leaveDotGit = true;

     

       23
       23
       +
               postFetch = ''

     

       24
       24
       +
                 git -C $out rev-parse --short HEAD > $out/GIT_HASH

     

       25
       25
       +
                 find "$out" -name .git -print0 | xargs -0 rm -rf

     

       26
       26
       +
               '';

     

       22
       27
        
             };

     

       23
       28
        
       

     

       24
       29
        
             passthru.updateScript = gitUpdater {

+3 -3

pkgs/by-name/ch/chirp/package.nix

···

       11
       11
        
       

     

       12
       12
        
       python3Packages.buildPythonApplication {

     

       13
       13
        
         pname = "chirp";

     

       14
       14
       -
         version = "0.4.0-unstable-2025-08-19";

     

       14
       14
       +
         version = "0.4.0-unstable-2025-08-31";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "kk7ds";

     

       19
       19
        
           repo = "chirp";

     

       20
       20
       -
           rev = "0705a4c61e11f952ef1bcdb282f22a74dc72782f";

     

       21
       21
       -
           hash = "sha256-gUiSuulthiEC94SuXfGzuDDrf2dYTsJLsAjtjAsTIPY=";

     

       20
       20
       +
           rev = "906d7ec8b2e09f53710e1ef9616d58f8270841e2";

     

       21
       21
       +
           hash = "sha256-lsB8m9qn+pJp8tBekOo2DnQQrjF5P+NizdWaj0HaYPU=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+8 -5

pkgs/by-name/dn/dnf5/package.nix

···

       25
       25
        
         sphinx,

     

       26
       26
        
         sqlite,

     

       27
       27
        
         systemd,

     

       28
       28
       -
         testers,

     

       28
       28
       +
         versionCheckHook,

     

       29
       29
        
         toml11,

     

       30
       30
        
         zchunk,

     

       31
       31
        
         nix-update-script,

     
···

       115
       115
        
       

     

       116
       116
        
         dontFixCmake = true;

     

       117
       117
        
       

     

       118
       118
       -
         passthru = {

     

       119
       119
       -
           tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

     

       120
       120
       -
           updateScript = nix-update-script { };

     

       121
       121
       -
         };

     

       118
       118
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       119
       119
       +
         doInstallCheck = true;

     

       120
       120
       +
         preVersionCheck = ''

     

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

     

       122
       122
       +
         '';

     

       123
       123
       +
       

     

       124
       124
       +
         passthru.updateScript = nix-update-script { };

     

       122
       125
        
       

     

       123
       126
        
         meta = with lib; {

     

       124
       127
        
           description = "Next-generation RPM package management system";

+35 -9

pkgs/by-name/im/immich-cli/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         immich,

     

       4
       4
       -
         buildNpmPackage,

     

       4
       4
       +
         jq,

     

       5
       5
        
         nodejs,

     

       6
       6
        
         makeWrapper,

     

       7
       7
       +
         stdenv,

     

       7
       8
        
       }:

     

       8
       8
       -
       buildNpmPackage {

     

       9
       9
       +
       

     

       10
       10
       +
       let

     

       11
       11
       +
         inherit (immich) pnpm;

     

       12
       12
       +
       in

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       9
       14
        
         pname = "immich-cli";

     

       10
       10
       -
         src = "${immich.src}/cli";

     

       11
       11
       -
         inherit (immich.sources.components.cli) version npmDepsHash;

     

       15
       15
       +
         version = "2.2.86";

     

       16
       16
       +
         inherit (immich) src pnpmDeps;

     

       12
       17
        
       

     

       13
       13
       -
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
         postPatch = ''

     

       19
       19
       +
           local -r cli_version="$(jq -r .version cli/package.json)"

     

       20
       20
       +
           test "$cli_version" = ${version} \

     

       21
       21
       +
             || (echo "error: update immich-cli version to $cli_version" && exit 1)

     

       22
       22
       +
         '';

     

       14
       23
        
       

     

       15
       15
       -
         inherit (immich.web) preBuild;

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           jq

     

       26
       26
       +
           makeWrapper

     

       27
       27
       +
           nodejs

     

       28
       28
       +
           pnpm

     

       29
       29
       +
           pnpm.configHook

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildPhase = ''

     

       33
       33
       +
           runHook preBuild

     

       34
       34
       +
       

     

       35
       35
       +
           pnpm --filter @immich/sdk build

     

       36
       36
       +
           pnpm --filter @immich/cli build

     

       37
       37
       +
       

     

       38
       38
       +
           runHook postBuild

     

       39
       39
       +
         '';

     

       16
       40
        
       

     

       17
       41
        
         installPhase = ''

     

       18
       42
        
           runHook preInstall

     

       19
       43
        
       

     

       20
       20
       -
           mkdir -p $out

     

       21
       21
       -
           mv package.json package-lock.json node_modules dist $out/

     

       44
       44
       +
           local -r packageOut="$out/lib/node_modules/@immich/cli"

     

       45
       45
       +
       

     

       46
       46
       +
           pnpm --filter @immich/cli deploy --prod --no-optional "$packageOut"

     

       22
       47
        
       

     

       23
       23
       -
           makeWrapper ${lib.getExe nodejs} $out/bin/immich --add-flags $out/dist/index.js

     

       48
       48
       +
           makeWrapper '${lib.getExe nodejs}' "$out/bin/immich" \

     

       49
       49
       +
             --add-flags "$packageOut/dist/index.js"

     

       24
       50
        
       

     

       25
       51
        
           runHook postInstall

     

       26
       52
        
         '';

+68 -93

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         buildNpmPackage,

     

       5
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         pnpm_10,

     

       6
       6
        
         python3,

     

       7
       7
        
         nodejs,

     

       8
       8
        
         node-gyp,

     
···

       10
       10
        
         nixosTests,

     

       11
       11
        
         immich-machine-learning,

     

       12
       12
        
         # build-time deps

     

       13
       13
       -
         glib,

     

       14
       13
        
         pkg-config,

     

       15
       14
        
         makeWrapper,

     

       16
       15
        
         curl,

     
···

       32
       31
        
         pixman,

     

       33
       32
        
         vips,

     

       34
       33
        
         buildPackages,

     

       35
       35
       -
         sourcesJSON ? ./sources.json,

     

       36
       34
        
       }:

     

       37
       35
        
       let

     

       38
       38
       -
         buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };

     

       39
       39
       -
         sources = lib.importJSON sourcesJSON;

     

       40
       40
       -
         inherit (sources) version;

     

       36
       36
       +
         pnpm = pnpm_10;

     

       37
       37
       +
         version = "1.140.1";

     

       41
       38
        
       

     

       42
       39
        
         esbuild' = buildPackages.esbuild.override {

     

       43
       40
        
           buildGoModule =

     
···

       77
       74
        
         # The geodata website is not versioned, so we use the internet archive

     

       78
       75
        
         geodata =

     

       79
       76
        
           let

     

       80
       80
       -
             inherit (sources.components.geonames) timestamp;

     

       77
       77
       +
             timestamp = "20250818205425";

     

       81
       78
        
             date =

     

       82
       79
        
               "${lib.substring 0 4 timestamp}-${lib.substring 4 2 timestamp}-${lib.substring 6 2 timestamp}T"

     

       83
       80
        
               + "${lib.substring 8 2 timestamp}:${lib.substring 10 2 timestamp}:${lib.substring 12 2 timestamp}Z";

     

       84
       81
        
           in

     

       85
       82
        
           runCommand "immich-geodata"

     

       86
       83
        
             {

     

       87
       87
       -
               outputHash = sources.components.geonames.hash;

     

       84
       84
       +
               outputHash = "sha256-zZHAomW1C4qReFbhme5dkVnTiLw+jmhZhzuYvoBVBCY=";

     

       88
       85
        
               outputHashMode = "recursive";

     

       89
       86
        
               nativeBuildInputs = [

     

       90
       87
        
                 cacert

     
···

       111
       108
        
           owner = "immich-app";

     

       112
       109
        
           repo = "immich";

     

       113
       110
        
           tag = "v${version}";

     

       114
       114
       -
           inherit (sources) hash;

     

       111
       111
       +
           hash = "sha256-Bo9wFP0u39aoaNjc8K4Im3HRGZR/TLrDB7+UDAhV1xA=";

     

       115
       112
        
         };

     

       116
       113
        
       

     

       117
       117
       -
         openapi = buildNpmPackage' {

     

       118
       118
       -
           pname = "immich-openapi-sdk";

     

       119
       119
       -
           inherit version;

     

       120
       120
       -
           src = "${src}/open-api/typescript-sdk";

     

       121
       121
       -
           inherit (sources.components."open-api/typescript-sdk") npmDepsHash;

     

       122
       122
       -
       

     

       123
       123
       -
           installPhase = ''

     

       124
       124
       -
             runHook preInstall

     

       125
       125
       -
       

     

       126
       126
       -
             npm config delete cache

     

       127
       127
       -
             npm prune --omit=dev --omit=optional

     

       128
       128
       -
       

     

       129
       129
       -
             mkdir -p $out

     

       130
       130
       -
             mv package.json package-lock.json node_modules build $out/

     

       131
       131
       -
       

     

       132
       132
       -
             runHook postInstall

     

       133
       133
       -
           '';

     

       114
       114
       +
         pnpmDeps = pnpm.fetchDeps {

     

       115
       115
       +
           pname = "immich";

     

       116
       116
       +
           inherit version src;

     

       117
       117
       +
           fetcherVersion = 2;

     

       118
       118
       +
           hash = "sha256-DIcUKuU+ToRh/kSLcs4ZEHy7zhFir2nlbRx+/kMagrA=";

     

       134
       119
        
         };

     

       135
       120
        
       

     

       136
       136
       -
         web = buildNpmPackage' {

     

       121
       121
       +
         web = stdenv.mkDerivation {

     

       137
       122
        
           pname = "immich-web";

     

       138
       138
       -
           inherit version src;

     

       139
       139
       -
           sourceRoot = "${src.name}/web";

     

       140
       140
       -
           inherit (sources.components.web) npmDepsHash;

     

       123
       123
       +
           inherit version src pnpmDeps;

     

       141
       124
        
       

     

       142
       142
       -
           # prePatch is needed because npmConfigHook is a postPatch

     

       143
       143
       -
           prePatch = ''

     

       144
       144
       -
             # some part of the build wants to use un-prefixed binaries. let them.

     

       145
       145
       -
             mkdir -p $TMP/bin

     

       146
       146
       -
             ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true

     

       147
       147
       -
             ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true

     

       148
       148
       -
             ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true

     

       149
       149
       -
             export PATH="$TMP/bin:$PATH"

     

       150
       150
       -
           '';

     

       125
       125
       +
           nativeBuildInputs = [

     

       126
       126
       +
             nodejs

     

       127
       127
       +
             pnpm

     

       128
       128
       +
             pnpm.configHook

     

       129
       129
       +
           ];

     

       151
       130
        
       

     

       152
       152
       -
           preBuild = ''

     

       153
       153
       -
             rm node_modules/@immich/sdk

     

       154
       154
       -
             ln -s ${openapi} node_modules/@immich/sdk

     

       155
       155
       -
           '';

     

       131
       131
       +
           buildPhase = ''

     

       132
       132
       +
             runHook preBuild

     

       156
       133
        
       

     

       157
       157
       -
           env.npm_config_build_from_source = "true";

     

       134
       134
       +
             pnpm --filter @immich/sdk build

     

       135
       135
       +
             pnpm --filter immich-web build

     

       158
       136
        
       

     

       159
       159
       -
           nativeBuildInputs = [

     

       160
       160
       -
             pkg-config

     

       161
       161
       -
           ];

     

       162
       162
       -
       

     

       163
       163
       -
           buildInputs = [

     

       164
       164
       -
             # https://github.com/Automattic/node-canvas/blob/master/Readme.md#compiling

     

       165
       165
       -
             cairo

     

       166
       166
       -
             giflib

     

       167
       167
       -
             libjpeg

     

       168
       168
       -
             libpng

     

       169
       169
       -
             librsvg

     

       170
       170
       -
             pango

     

       171
       171
       -
             pixman

     

       172
       172
       -
           ];

     

       137
       137
       +
             runHook postBuild

     

       138
       138
       +
           '';

     

       173
       139
        
       

     

       174
       140
        
           installPhase = ''

     

       175
       141
        
             runHook preInstall

     

       176
       142
        
       

     

       143
       143
       +
             cd web

     

       177
       144
        
             cp -r build $out

     

       178
       145
        
       

     

       179
       146
        
             runHook postInstall

     
···

       184
       151
        
           mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ];

     

       185
       152
        
         });

     

       186
       153
        
       in

     

       187
       187
       -
       buildNpmPackage' {

     

       154
       154
       +
       stdenv.mkDerivation {

     

       188
       155
        
         pname = "immich";

     

       189
       189
       -
         inherit version;

     

       190
       190
       -
         src = "${src}/server";

     

       191
       191
       -
         inherit (sources.components.server) npmDepsHash;

     

       156
       156
       +
         inherit version src pnpmDeps;

     

       192
       157
        
       

     

       193
       193
       -
         # prePatch is needed because npmConfigHook is a postPatch

     

       194
       194
       -
         prePatch = ''

     

       158
       158
       +
         postPatch = ''

     

       195
       159
        
           # pg_dumpall fails without database root access

     

       196
       160
        
           # see https://github.com/immich-app/immich/issues/13971

     

       197
       197
       -
           substituteInPlace src/services/backup.service.ts \

     

       161
       161
       +
           substituteInPlace server/src/services/backup.service.ts \

     

       198
       162
        
             --replace-fail '`/usr/lib/postgresql/''${databaseMajorVersion}/bin/pg_dumpall`' '`pg_dump`'

     

       199
       199
       -
       

     

       200
       200
       -
           # some part of the build wants to use un-prefixed binaries. let them.

     

       201
       201
       -
           mkdir -p $TMP/bin

     

       202
       202
       -
           ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true

     

       203
       203
       -
           ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true

     

       204
       204
       -
           ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true

     

       205
       205
       -
           export PATH="$TMP/bin:$PATH"

     

       206
       163
        
         '';

     

       207
       164
        
       

     

       208
       165
        
         nativeBuildInputs = [

     

       166
       166
       +
           nodejs

     

       209
       167
        
           pkg-config

     

       168
       168
       +
           pnpm_10

     

       169
       169
       +
           pnpm_10.configHook

     

       210
       170
        
           python3

     

       211
       171
        
           makeWrapper

     

       212
       212
       -
           glib

     

       213
       172
        
           node-gyp # for building node_modules/sharp from source

     

       214
       173
        
         ];

     

       215
       174
        
       

     
···

       230
       189
        
           vips'

     

       231
       190
        
         ];

     

       232
       191
        
       

     

       233
       233
       -
         # Required because vips tries to write to the cache dir

     

       234
       234
       -
         makeCacheWritable = true;

     

       235
       235
       -
       

     

       236
       192
        
         env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;

     

       237
       193
        
         env.ESBUILD_BINARY_PATH = lib.getExe esbuild';

     

       194
       194
       +
         # fix for node-gyp, see https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919

     

       195
       195
       +
         env.npm_config_nodedir = nodejs;

     

       238
       196
        
       

     

       239
       239
       -
         preBuild = ''

     

       197
       197
       +
         buildPhase = ''

     

       198
       198
       +
           runHook preBuild

     

       199
       199
       +
       

     

       240
       200
        
           # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH

     

       241
       241
       -
           rm -r node_modules/exiftool-vendored.*

     

       201
       201
       +
           rm node_modules/.pnpm/node_modules/exiftool-vendored.pl

     

       202
       202
       +
       

     

       203
       203
       +
           pnpm --filter immich build

     

       204
       204
       +
       

     

       205
       205
       +
           runHook postBuild

     

       242
       206
        
         '';

     

       243
       207
        
       

     

       244
       208
        
         installPhase = ''

     

       245
       209
        
           runHook preInstall

     

       246
       210
        
       

     

       247
       247
       -
           npm config delete cache

     

       248
       248
       -
           npm prune --omit=dev

     

       211
       211
       +
           local -r packageOut="$out/lib/node_modules/immich"

     

       212
       212
       +
       

     

       213
       213
       +
           # install node_modules and built files in $out

     

       214
       214
       +
           # upstream uses pnpm deploy to build their docker images

     

       215
       215
       +
           pnpm --filter immich deploy --prod --no-optional "$packageOut"

     

       249
       216
        
       

     

       250
       217
        
           # remove build artifacts that bloat the closure

     

       251
       251
       -
           rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps}

     

       218
       218
       +
           find "$packageOut/node_modules" \( \

     

       219
       219
       +
             -name config.gypi \

     

       220
       220
       +
             -o -name .deps \

     

       221
       221
       +
             -o -name '*Makefile' \

     

       222
       222
       +
             -o -name '*.target.mk' \

     

       223
       223
       +
           \) -exec rm -r {} +

     

       252
       224
        
       

     

       253
       253
       -
           mkdir -p $out/build

     

       254
       254
       -
           mv package.json package-lock.json node_modules dist resources $out/

     

       255
       255
       -
           ln -s ${web} $out/build/www

     

       256
       256
       -
           ln -s ${geodata} $out/build/geodata

     

       225
       225
       +
           mkdir -p "$packageOut/build"

     

       226
       226
       +
           ln -s '${web}' "$packageOut/build/www"

     

       227
       227
       +
           ln -s '${geodata}' "$packageOut/build/geodata"

     

       257
       228
        
       

     

       258
       258
       -
           echo '${builtins.toJSON buildLock}' > $out/build/build-lock.json

     

       229
       229
       +
           echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"

     

       259
       230
        
       

     

       260
       260
       -
           makeWrapper ${lib.getExe nodejs} $out/bin/admin-cli --add-flags $out/dist/main --add-flags cli

     

       261
       261
       -
           makeWrapper ${lib.getExe nodejs} $out/bin/server --add-flags $out/dist/main --chdir $out \

     

       262
       262
       -
             --set IMMICH_BUILD_DATA $out/build --set NODE_ENV production \

     

       263
       263
       -
             --suffix PATH : "${

     

       231
       231
       +
           makeWrapper '${lib.getExe nodejs}' "$out/bin/admin-cli" \

     

       232
       232
       +
             --add-flags "$packageOut/dist/main" \

     

       233
       233
       +
             --add-flags cli

     

       234
       234
       +
           makeWrapper '${lib.getExe nodejs}' "$out/bin/server" \

     

       235
       235
       +
             --add-flags "$packageOut/dist/main" \

     

       236
       236
       +
             --chdir "$packageOut" \

     

       237
       237
       +
             --set IMMICH_BUILD_DATA "$packageOut/build" \

     

       238
       238
       +
             --set NODE_ENV production \

     

       239
       239
       +
             --suffix PATH : '${

     

       264
       240
        
               lib.makeBinPath [

     

       265
       241
        
                 exiftool

     

       266
       242
        
                 jellyfin-ffmpeg

     

       267
       243
        
                 perl # exiftool-vendored checks for Perl even if exiftool comes from $PATH

     

       268
       244
        
               ]

     

       269
       269
       -
             }"

     

       245
       245
       +
             }'

     

       270
       246
        
       

     

       271
       247
        
           runHook postInstall

     

       272
       248
        
         '';

     
···

       280
       256
        
       

     

       281
       257
        
           inherit

     

       282
       258
        
             src

     

       283
       283
       -
             sources

     

       284
       259
        
             web

     

       285
       260
        
             geodata

     

       261
       261
       +
             pnpm

     

       286
       262
        
             ;

     

       287
       287
       -
           updateScript = ./update.sh;

     

       288
       263
        
         };

     

       289
       264
        
       

     

       290
       265
        
         meta = {

-26

pkgs/by-name/im/immich/sources.json

···

       1
       1
       -
       {

     

       2
       2
       -
         "version": "1.138.1",

     

       3
       3
       -
         "hash": "sha256-oaZN0kF82mS25bDSTXRjYnWG9RAMSbCUhXn9t0am96U=",

     

       4
       4
       -
         "components": {

     

       5
       5
       -
           "cli": {

     

       6
       6
       -
             "npmDepsHash": "sha256-6k83QOdKh+FlVnYvA9j60115oohUMDc2YvGaj/GMukE=",

     

       7
       7
       -
             "version": "2.2.79"

     

       8
       8
       -
           },

     

       9
       9
       -
           "server": {

     

       10
       10
       -
             "npmDepsHash": "sha256-4sqWIIGQ8ZW7TvJoNjNNliriuV6Su0askAN6pAq9VFc=",

     

       11
       11
       -
             "version": "1.138.1"

     

       12
       12
       -
           },

     

       13
       13
       -
           "web": {

     

       14
       14
       -
             "npmDepsHash": "sha256-+W8cDgy3qe6RDen8SEdHPNADkKb4zZH8C/Am/bdU42c=",

     

       15
       15
       -
             "version": "1.138.1"

     

       16
       16
       -
           },

     

       17
       17
       -
           "open-api/typescript-sdk": {

     

       18
       18
       -
             "npmDepsHash": "sha256-GfmFPsnFu7l4EsnPDv4nj5KLkOz8nEJvMT1BE7zIQ3k=",

     

       19
       19
       -
             "version": "1.138.1"

     

       20
       20
       -
           },

     

       21
       21
       -
           "geonames": {

     

       22
       22
       -
             "timestamp": "20250818205425",

     

       23
       23
       -
             "hash": "sha256-zZHAomW1C4qReFbhme5dkVnTiLw+jmhZhzuYvoBVBCY="

     

       24
       24
       -
           }

     

       25
       25
       -
         }

     

       26
       26
       -
       }

-62

pkgs/by-name/im/immich/update.sh

···

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

     

       2
       2
       -
       #!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils ripgrep

     

       3
       3
       -
       

     

       4
       4
       -
       set -euo pipefail

     

       5
       5
       -
       cd "$(dirname "${BASH_SOURCE[0]}")"

     

       6
       6
       -
       

     

       7
       7
       -
       old_version=$(jq -r ".version" sources.json || echo -n "0.0.1")

     

       8
       8
       -
       version=$(curl -s "https://api.github.com/repos/immich-app/immich/releases/latest" | jq -r ".tag_name")

     

       9
       9
       -
       version="${version#v}"

     

       10
       10
       -
       

     

       11
       11
       -
       echo "Updating to $version"

     

       12
       12
       -
       

     

       13
       13
       -
       if [[ "$old_version" == "$version" ]]; then

     

       14
       14
       -
           echo "Already up to date!"

     

       15
       15
       -
           exit 0

     

       16
       16
       -
       fi

     

       17
       17
       -
       

     

       18
       18
       -
       echo "Fetching src"

     

       19
       19
       -
       src_hash=$(nix-prefetch-github immich-app immich --rev "v${version}" | jq -r .hash)

     

       20
       20
       -
       upstream_src="https://raw.githubusercontent.com/immich-app/immich/v$version"

     

       21
       21
       -
       

     

       22
       22
       -
       sources_tmp="$(mktemp)"

     

       23
       23
       -
       cat <<EOF > "$sources_tmp"

     

       24
       24
       -
       {

     

       25
       25
       -
         "version": "$version",

     

       26
       26
       -
         "hash": "$src_hash",

     

       27
       27
       -
         "components": {}

     

       28
       28
       -
       }

     

       29
       29
       -
       EOF

     

       30
       30
       -
       

     

       31
       31
       -
       lock=$(mktemp)

     

       32
       32
       -
       for npm_component in cli server web "open-api/typescript-sdk"; do

     

       33
       33
       -
           echo "fetching $npm_component"

     

       34
       34
       -
           curl -s -o "$lock" "$upstream_src/$npm_component/package-lock.json"

     

       35
       35
       -
           hash=$(prefetch-npm-deps "$lock")

     

       36
       36
       -
           echo "$(jq --arg npm_component "$npm_component" \

     

       37
       37
       -
             --arg hash "$hash" \

     

       38
       38
       -
             --arg version "$(jq -r '.version' <"$lock")" \

     

       39
       39
       -
             '.components += {($npm_component): {npmDepsHash: $hash, version: $version}}' \

     

       40
       40
       -
             "$sources_tmp")" > "$sources_tmp"

     

       41
       41
       -
       done

     

       42
       42
       -
       rm "$lock"

     

       43
       43
       -
       

     

       44
       44
       -
       url="http://download.geonames.org/export/dump"

     

       45
       45
       -
       curl -s "http://web.archive.org/save/$url/cities500.zip"

     

       46
       46
       -
       curl -s "http://web.archive.org/save/$url/admin1CodesASCII.txt"

     

       47
       47
       -
       curl -s "http://web.archive.org/save/$url/admin1Codes.txt"

     

       48
       48
       -
       timestamp=$(curl -s \

     

       49
       49
       -
           "http://archive.org/wayback/available?url=$url/cities500.zip" \

     

       50
       50
       -
           | jq -r ".archived_snapshots.closest.timestamp")

     

       51
       51
       -
       echo "$(jq --arg timestamp "$timestamp" --arg hash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" \

     

       52
       52
       -
           '.components += {geonames: {timestamp: $timestamp, hash: $hash}}' \

     

       53
       53
       -
           "$sources_tmp")" > "$sources_tmp"

     

       54
       54
       -
       

     

       55
       55
       -
       cp "$sources_tmp" sources.json

     

       56
       56
       -
       set +o pipefail

     

       57
       57
       -
       output="$(nix-build ../../../.. -A immich.geodata 2>&1 || true)"

     

       58
       58
       -
       set -o pipefail

     

       59
       59
       -
       hash=$(echo "$output" | rg 'got:\s+(sha256-.*)$' -or '$1')

     

       60
       60
       -
       echo "$(jq --arg hash "$hash" '.components.geonames.hash = $hash' "$sources_tmp")" > "$sources_tmp"

     

       61
       61
       -
       

     

       62
       62
       -
       mv "$sources_tmp" sources.json

+4 -1

pkgs/by-name/kc/kcc/package.nix

···

       30
       30
        
           copyDesktopItems

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       -
         buildInputs = [ qt6.qtbase ];

     

       33
       33
       +
         buildInputs = [

     

       34
       34
       +
           qt6.qtbase

     

       35
       35
       +
           qt6.qtwayland

     

       36
       36
       +
         ];

     

       34
       37
        
       

     

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

     

       36
       39

+3 -3

pkgs/by-name/me/mergiraf/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       13
       13
        
         pname = "mergiraf";

     

       14
       14
       -
         version = "0.13.0";

     

       14
       14
       +
         version = "0.14.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitea {

     

       17
       17
        
           domain = "codeberg.org";

     

       18
       18
        
           owner = "mergiraf";

     

       19
       19
        
           repo = "mergiraf";

     

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

     

       21
       21
       -
           hash = "sha256-MPmpS4iLur05jkSUrGl6NCtzRO/8Pch9pRNuT6psNRo=";

     

       21
       21
       +
           hash = "sha256-ad5A3d/E1PyfI1/vKdHmiVcDokPSiGoMfg1eXKCbhtA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoHash = "sha256-nT9HsG9eRBf4mRr7fqmRSQVI+yz+yr7wKCSQHG5JtD4=";

     

       24
       24
       +
         cargoHash = "sha256-8zOEFGkrlyaZMRbTzFVk3CujC1LlAxKqGslwZyjXoKw=";

     

       25
       25
        
       

     

       26
       26
        
         nativeCheckInputs = [ git ];

     

       27
       27

+2 -2

pkgs/by-name/op/openapv/package.nix

···

       11
       11
        
       in

     

       12
       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
        
         pname = "openapv";

     

       14
       14
       -
         version = "0.2.0.1";

     

       14
       14
       +
         version = "0.2.0.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "AcademySoftwareFoundation";

     

       18
       18
        
           repo = "openapv";

     

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

     

       20
       20
       -
           hash = "sha256-Edj3xQ7AcHcdIbg4o2FidAGZ06fUBltW+1ojJPoIktA=";

     

       20
       20
       +
           hash = "sha256-Eam53Fc0oYOE2YH+Q1Cx6TxClMoUaDZuRhrC8LX6S7g=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         postPatch = ''

+1 -1

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

···

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
        
         meta = with lib; {

     

       43
       43
       -
           homepage = "https://www.upperbounds.net";

     

       43
       43
       +
           homepage = "https://github.com/bluescan/proggyfonts";

     

       44
       44
        
           description = "Set of fixed-width screen fonts that are designed for code listings";

     

       45
       45
        
           license = licenses.mit;

     

       46
       46
        
           platforms = platforms.all;

+3 -3

pkgs/by-name/re/release-plz/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "release-plz";

     

       14
       14
       -
         version = "0.3.140";

     

       14
       14
       +
         version = "0.3.142";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "MarcoIeni";

     

       18
       18
        
           repo = "release-plz";

     

       19
       19
        
           rev = "release-plz-v${version}";

     

       20
       20
       -
           hash = "sha256-pJHyf1aSn4YqzFYW6otuRY+gJ6TBCKFGQuH2Py5uWlE=";

     

       20
       20
       +
           hash = "sha256-e+EafNBXHUAE4UjJJ7ujfd4QVxQ6AAYTpH6TmNot6jk=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoHash = "sha256-LfadgdrGD9g/PNeFs/XNUk2x0h1i3znzMhIV+w1DjMk=";

     

       23
       23
       +
         cargoHash = "sha256-TE2l9Mk41RBaHo/fRdXSLHc8UGiMDIY6LXc33iIDjvA=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     

       26
       26
        
           installShellFiles

+2 -2

pkgs/by-name/se/sentry-native/package.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "sentry-native";

     

       13
       13
       -
         version = "0.10.0";

     

       13
       13
       +
         version = "0.10.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "getsentry";

     

       17
       17
        
           repo = "sentry-native";

     

       18
       18
        
           tag = version;

     

       19
       19
       -
           hash = "sha256-65Eylc0l3R0bQeKyb7JgULbZCldaR7TZmMvYB9wz/1M=";

     

       19
       19
       +
           hash = "sha256-99C4Nd2YdUElMpbKrNIBjicaWHR2MVqHUu5KryYAT/I=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+28 -28

pkgs/by-name/sm/smtp4dev/deps.json

···

       211
       211
        
         },

     

       212
       212
        
         {

     

       213
       213
        
           "pname": "Microsoft.Extensions.ApiDescription.Server",

     

       214
       214
       -
           "version": "6.0.3",

     

       215
       215
       -
           "hash": "sha256-1G+68E/fg89Vkgo4V7pCGqWlDdBErZMFfW+AV1q5brA="

     

       214
       214
       +
           "version": "8.0.14",

     

       215
       215
       +
           "hash": "sha256-mfNB1+5kcIr8burRrsr5LR5pVEAISQ8o9m8FrCtye3M="

     

       216
       216
        
         },

     

       217
       217
        
         {

     

       218
       218
        
           "pname": "Microsoft.Extensions.Caching.Abstractions",

     
···

       581
       581
        
         },

     

       582
       582
        
         {

     

       583
       583
        
           "pname": "Microsoft.TypeScript.MSBuild",

     

       584
       584
       -
           "version": "5.8.1",

     

       585
       585
       -
           "hash": "sha256-5x81TEhXaEEYnBeosK8zmBwPLKPifMf4JUFrGsk/IxA="

     

       584
       584
       +
           "version": "5.8.3",

     

       585
       585
       +
           "hash": "sha256-zL02BnZRCc5v1GUmzhaL1TnUq9+8Vkz5rGDPt+7CkD8="

     

       586
       586
        
         },

     

       587
       587
        
         {

     

       588
       588
        
           "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts",

     
···

       636
       636
        
         },

     

       637
       637
        
         {

     

       638
       638
        
           "pname": "Namotion.Reflection",

     

       639
       639
       -
           "version": "3.3.0",

     

       640
       640
       -
           "hash": "sha256-YBYWLYmnCZrKfiJWQo7tofiz2A7ROpxFfAYdYLa5cgI="

     

       639
       639
       +
           "version": "3.4.2",

     

       640
       640
       +
           "hash": "sha256-iaQrE5VwRHqXOyzym4vY3+4aDw6eswN5P3LDd3FoFZk="

     

       641
       641
        
         },

     

       642
       642
        
         {

     

       643
       643
        
           "pname": "NETStandard.Library",

     
···

       666
       666
        
         },

     

       667
       667
        
         {

     

       668
       668
        
           "pname": "NJsonSchema",

     

       669
       669
       -
           "version": "11.2.0",

     

       670
       670
       -
           "hash": "sha256-Y1FggfzRf54+ioMKvyyzMW30psrHF7hmAwnYom/Ud8s="

     

       669
       669
       +
           "version": "11.3.2",

     

       670
       670
       +
           "hash": "sha256-x+vNknToh2X1qk7NmsQEUWCoEJ5CGc1b9XNOrIbCOLc="

     

       671
       671
        
         },

     

       672
       672
        
         {

     

       673
       673
        
           "pname": "NJsonSchema.Annotations",

     

       674
       674
       -
           "version": "11.2.0",

     

       675
       675
       -
           "hash": "sha256-uQYU/NuAbz+HlImemuv1Yi4ODKoaQ38BSrWONOR9jFs="

     

       674
       674
       +
           "version": "11.3.2",

     

       675
       675
       +
           "hash": "sha256-MWC0Hvd6knCAjViSKOY7lugxGbVEcn3lyzEUO5unphQ="

     

       676
       676
        
         },

     

       677
       677
        
         {

     

       678
       678
        
           "pname": "NJsonSchema.NewtonsoftJson",

     

       679
       679
       -
           "version": "11.2.0",

     

       680
       680
       -
           "hash": "sha256-NyXB3rcdPpjaZq0CAZy5xMmvLqqzPGyddeTVtowqaBU="

     

       679
       679
       +
           "version": "11.3.2",

     

       680
       680
       +
           "hash": "sha256-jIRsXWHVNmWgz2WlmiJnfyXNofwrrdkLVlx4x3PPPlM="

     

       681
       681
        
         },

     

       682
       682
        
         {

     

       683
       683
        
           "pname": "NJsonSchema.Yaml",

     

       684
       684
       -
           "version": "11.2.0",

     

       685
       685
       -
           "hash": "sha256-NtlUldW5D0VSj10XqfMvxDMVULdw99owTS1zGYg4aKg="

     

       684
       684
       +
           "version": "11.3.2",

     

       685
       685
       +
           "hash": "sha256-7IzmfufXlhTZoESAIsd5zqBZ/x30tAAZl9Bx/m3QaxA="

     

       686
       686
        
         },

     

       687
       687
        
         {

     

       688
       688
        
           "pname": "NSwag.Annotations",

     

       689
       689
       -
           "version": "14.3.0",

     

       690
       690
       -
           "hash": "sha256-kz+fEwUlEjsPsOiFCTcXYHAAYCJa2cepDRIY4mkye4U="

     

       689
       689
       +
           "version": "14.4.0",

     

       690
       690
       +
           "hash": "sha256-NbAAQ+tlgi+/766JeEsD+W6SQMEHy2qyTsoMlxvuuo8="

     

       691
       691
        
         },

     

       692
       692
        
         {

     

       693
       693
        
           "pname": "NSwag.AspNetCore",

     

       694
       694
       -
           "version": "14.3.0",

     

       695
       695
       -
           "hash": "sha256-lGeH27yzj5fXPpBMqtoFOTRiu+gve8oSgugW2u4tMAk="

     

       694
       694
       +
           "version": "14.4.0",

     

       695
       695
       +
           "hash": "sha256-3nMNWDrr6k6q5vaskxWc6oioUkLoyJciZ4ocyW5oN+w="

     

       696
       696
        
         },

     

       697
       697
        
         {

     

       698
       698
        
           "pname": "NSwag.Core",

     

       699
       699
       -
           "version": "14.3.0",

     

       700
       700
       -
           "hash": "sha256-FjWms/V5+j4ut1TShKWDsTr1LuBsHxRQIFs1fwD0jGw="

     

       699
       699
       +
           "version": "14.4.0",

     

       700
       700
       +
           "hash": "sha256-l1nBCyf/ed2Xm8Yk5TL3ni8kQxQSAf0ajAfwaAL3/6I="

     

       701
       701
        
         },

     

       702
       702
        
         {

     

       703
       703
        
           "pname": "NSwag.Core.Yaml",

     

       704
       704
       -
           "version": "14.3.0",

     

       705
       705
       -
           "hash": "sha256-CcGXuyNUvF/e3f9K3wZY+h0RIbzoLOLLguUcj+VVFXI="

     

       704
       704
       +
           "version": "14.4.0",

     

       705
       705
       +
           "hash": "sha256-YBlNeIqgZgcYvf/VvJXelTIxDCRqyPJPo7ZzTIo16ak="

     

       706
       706
        
         },

     

       707
       707
        
         {

     

       708
       708
        
           "pname": "NSwag.Generation",

     

       709
       709
       -
           "version": "14.3.0",

     

       710
       710
       -
           "hash": "sha256-M487C7OsnZnURcAN90DGIhZTnxlToaIskkztCKkXzQc="

     

       709
       709
       +
           "version": "14.4.0",

     

       710
       710
       +
           "hash": "sha256-DH7C00KVAiv6i8lJxNAzkDtuNHykyGQAfgT6MAbeBko="

     

       711
       711
        
         },

     

       712
       712
        
         {

     

       713
       713
        
           "pname": "NSwag.Generation.AspNetCore",

     

       714
       714
       -
           "version": "14.3.0",

     

       715
       715
       -
           "hash": "sha256-DvjSjbM2ug0AvjAE8CwVUej2hZbLWopmZMbOx4Oy2IU="

     

       714
       714
       +
           "version": "14.4.0",

     

       715
       715
       +
           "hash": "sha256-YT2v9ddGAFk8gMj1aQ2yHOK3UWX3mcIoGYWBl+OsJ2s="

     

       716
       716
        
         },

     

       717
       717
        
         {

     

       718
       718
        
           "pname": "NuGet.Frameworks",

     
···

       1396
       1396
        
         },

     

       1397
       1397
        
         {

     

       1398
       1398
        
           "pname": "System.Linq.Dynamic.Core",

     

       1399
       1399
       -
           "version": "1.6.0.2",

     

       1400
       1400
       -
           "hash": "sha256-5qzEVm+33ATR+SQljwe/LcP5o0MNjv49nHfXIVG27dw="

     

       1399
       1399
       +
           "version": "1.6.4",

     

       1400
       1400
       +
           "hash": "sha256-Mpp+3UYARo+Hnh3ybtHtdN0LI5HQV07CBZP7jRnVk10="

     

       1401
       1401
        
         },

     

       1402
       1402
        
         {

     

       1403
       1403
        
           "pname": "System.Linq.Expressions",

+12 -3

pkgs/by-name/sm/smtp4dev/package.nix

···

       11
       11
        
       

     

       12
       12
        
       buildDotnetModule (finalAttrs: {

     

       13
       13
        
         pname = "smtp4dev";

     

       14
       14
       -
         version = "3.8.6";

     

       14
       14
       +
         version = "3.9.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "rnwood";

     

       18
       18
        
           repo = "smtp4dev";

     

       19
       19
        
           tag = finalAttrs.version;

     

       20
       20
       -
           hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k=";

     

       20
       20
       +
           hash = "sha256-LGhx+i4PIExC6GbBwDOLi/g1TxNoMFMZomdnbtc/wNc=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         patches = [ ./smtp4dev-npm-packages.patch ];

     
···

       33
       33
        
       

     

       34
       34
        
         npmDeps = fetchNpmDeps {

     

       35
       35
        
           inherit (finalAttrs) src patches;

     

       36
       36
       -
           hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA=";

     

       36
       36
       +
           hash = "sha256-Xjx3V5FH72D+CXBRZgmlkbp5evnp6F4zaHMWQB5o61w=";

     

       37
       37
        
           postPatch = "cd ${finalAttrs.npmRoot}";

     

       38
       38
        
         };

     

       39
       39
        
       

     
···

       45
       45
        
       

     

       46
       46
        
         postFixup = ''

     

       47
       47
        
           mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev

     

       48
       48
       +
         '';

     

       49
       49
       +
       

     

       50
       50
       +
         doInstallCheck = true;

     

       51
       51
       +
         installCheckPhase = ''

     

       52
       52
       +
           runHook preInstallCheck

     

       53
       53
       +
       

     

       54
       54
       +
           $out/bin/smtp4dev --help | head -1 | grep -F "smtp4dev version ${finalAttrs.version}"

     

       55
       55
       +
       

     

       56
       56
       +
           runHook postInstallCheck

     

       48
       57
        
         '';

     

       49
       58
        
       

     

       50
       59
        
         passthru.updateScript = ./update.sh;

+236 -427

pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch

···

       1
       1
        
       diff --git a/Rnwood.Smtp4dev/ClientApp/package-lock.json b/Rnwood.Smtp4dev/ClientApp/package-lock.json

     

       2
       2
       -
       index be143b7..6e8b0b4 100644

     

       2
       2
       +
       index c25a9ca..59acfb5 100644

     

       3
       3
        
       --- a/Rnwood.Smtp4dev/ClientApp/package-lock.json

     

       4
       4
        
       +++ b/Rnwood.Smtp4dev/ClientApp/package-lock.json

     

       5
       5
       -
       @@ -20,7 +20,8 @@

     

       5
       5
       +
       @@ -21,7 +21,7 @@

     

       6
       6
        
                "@microsoft/signalr": "^8.0.0",

     

       7
       7
        
                "@types/jest": "^29.5.12",

     

       8
       8
        
                "@types/sanitize-html": "^2.11.0",

     

       9
       9
        
       -        "@typescript-eslint/parser": "^8.0.0",

     

       10
       10
       -
       +        "@typescript-eslint/eslint-plugin": "^8.31.1",

     

       11
       11
       -
       +        "@typescript-eslint/parser": "^8.31.1",

     

       10
       10
       +
       +        "@typescript-eslint/parser": "^8.32.1",

     

       12
       11
        
                "@vitejs/plugin-vue": "^5.0.4",

     

       13
       12
        
                "@vue/eslint-config-typescript": "^13.0.0",

     

       14
       13
        
                "@vue/vue3-jest": "^29.2.6",

     

       15
       15
       -
       @@ -2937,7 +2938,8 @@

     

       14
       14
       +
       @@ -2938,7 +2938,8 @@

     

       16
       15
        
              "version": "7.0.15",

     

       17
       16
        
              "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",

     

       18
       17
        
              "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",

     
···

       22
       21
        
            },

     

       23
       22
        
            "node_modules/@types/lodash": {

     

       24
       23
        
              "version": "4.17.0",

     

       25
       25
       -
       @@ -2993,12 +2995,6 @@

     

       24
       24
       +
       @@ -2994,12 +2995,6 @@

     

       26
       25
        
                "entities": "^4.4.0"

     

       27
       26
        
              }

     

       28
       27
        
            },

     
···

       35
       34
        
            "node_modules/@types/stack-utils": {

     

       36
       35
        
              "version": "2.0.3",

     

       37
       36
        
              "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",

     

       38
       38
       -
       @@ -3039,84 +3035,59 @@

     

       37
       37
       +
       @@ -3039,74 +3034,6 @@

     

       38
       38
       +
              "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",

     

       39
       39
        
              "dev": true

     

       40
       40
        
            },

     

       41
       41
       -
            "node_modules/@typescript-eslint/eslint-plugin": {

     

       41
       41
       +
       -    "node_modules/@typescript-eslint/eslint-plugin": {

     

       42
       42
        
       -      "version": "7.6.0",

     

       43
       43
        
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.6.0.tgz",

     

       44
       44
        
       -      "integrity": "sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==",

     

       45
       45
       -
       +      "version": "8.31.1",

     

       46
       46
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz",

     

       47
       47
       -
       +      "integrity": "sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==",

     

       48
       48
       -
              "dev": true,

     

       49
       49
       -
       +      "license": "MIT",

     

       50
       50
       -
              "dependencies": {

     

       51
       51
       -
                "@eslint-community/regexpp": "^4.10.0",

     

       45
       45
       +
       -      "dev": true,

     

       46
       46
       +
       -      "dependencies": {

     

       47
       47
       +
       -        "@eslint-community/regexpp": "^4.10.0",

     

       52
       48
        
       -        "@typescript-eslint/scope-manager": "7.6.0",

     

       53
       49
        
       -        "@typescript-eslint/type-utils": "7.6.0",

     

       54
       50
        
       -        "@typescript-eslint/utils": "7.6.0",

     

       55
       51
        
       -        "@typescript-eslint/visitor-keys": "7.6.0",

     

       56
       52
        
       -        "debug": "^4.3.4",

     

       57
       57
       -
       +        "@typescript-eslint/scope-manager": "8.31.1",

     

       58
       58
       -
       +        "@typescript-eslint/type-utils": "8.31.1",

     

       59
       59
       -
       +        "@typescript-eslint/utils": "8.31.1",

     

       60
       60
       -
       +        "@typescript-eslint/visitor-keys": "8.31.1",

     

       61
       61
       -
                "graphemer": "^1.4.0",

     

       62
       62
       -
                "ignore": "^5.3.1",

     

       63
       63
       -
                "natural-compare": "^1.4.0",

     

       53
       53
       +
       -        "graphemer": "^1.4.0",

     

       54
       54
       +
       -        "ignore": "^5.3.1",

     

       55
       55
       +
       -        "natural-compare": "^1.4.0",

     

       64
       56
        
       -        "semver": "^7.6.0",

     

       65
       57
        
       -        "ts-api-utils": "^1.3.0"

     

       66
       66
       -
       +        "ts-api-utils": "^2.0.1"

     

       67
       67
       -
              },

     

       68
       68
       -
              "engines": {

     

       58
       58
       +
       -      },

     

       59
       59
       +
       -      "engines": {

     

       69
       60
        
       -        "node": "^18.18.0 || >=20.0.0"

     

       70
       70
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       71
       71
       -
              },

     

       72
       72
       -
              "funding": {

     

       73
       73
       -
                "type": "opencollective",

     

       74
       74
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       75
       75
       -
              },

     

       76
       76
       -
              "peerDependencies": {

     

       61
       61
       +
       -      },

     

       62
       62
       +
       -      "funding": {

     

       63
       63
       +
       -        "type": "opencollective",

     

       64
       64
       +
       -        "url": "https://opencollective.com/typescript-eslint"

     

       65
       65
       +
       -      },

     

       66
       66
       +
       -      "peerDependencies": {

     

       77
       67
        
       -        "@typescript-eslint/parser": "^7.0.0",

     

       78
       68
        
       -        "eslint": "^8.56.0"

     

       79
       69
        
       -      },

     
···

       81
       71
        
       -        "typescript": {

     

       82
       72
        
       -          "optional": true

     

       83
       73
        
       -        }

     

       84
       84
       -
       +        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",

     

       85
       85
       -
       +        "eslint": "^8.57.0 || ^9.0.0",

     

       86
       86
       -
       +        "typescript": ">=4.8.4 <5.9.0"

     

       87
       87
       -
              }

     

       88
       88
       -
            },

     

       74
       74
       +
       -      }

     

       75
       75
       +
       -    },

     

       89
       76
        
       -    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {

     

       90
       77
        
       -      "version": "6.0.0",

     

       91
       78
        
       -      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",

     

       92
       79
        
       -      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",

     

       93
       93
       -
       +    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {

     

       94
       94
       -
       +      "version": "2.1.0",

     

       95
       95
       -
       +      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",

     

       96
       96
       -
       +      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",

     

       97
       97
       -
              "dev": true,

     

       80
       80
       +
       -      "dev": true,

     

       98
       81
        
       -      "dependencies": {

     

       99
       82
        
       -        "yallist": "^4.0.0"

     

       100
       83
        
       -      },

     

       101
       101
       -
       +      "license": "MIT",

     

       102
       102
       -
              "engines": {

     

       84
       84
       +
       -      "engines": {

     

       103
       85
        
       -        "node": ">=10"

     

       104
       86
        
       -      }

     

       105
       87
        
       -    },

     
···

       113
       95
        
       -      },

     

       114
       96
        
       -      "bin": {

     

       115
       97
        
       -        "semver": "bin/semver.js"

     

       116
       116
       -
       +        "node": ">=18.12"

     

       117
       117
       -
              },

     

       98
       98
       +
       -      },

     

       118
       99
        
       -      "engines": {

     

       119
       100
        
       -        "node": ">=10"

     

       120
       120
       -
       +      "peerDependencies": {

     

       121
       121
       -
       +        "typescript": ">=4.8.4"

     

       122
       122
       -
              }

     

       123
       123
       -
            },

     

       101
       101
       +
       -      }

     

       102
       102
       +
       -    },

     

       124
       103
        
       -    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {

     

       125
       104
        
       -      "version": "4.0.0",

     

       126
       105
        
       -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

     
···

       128
       107
        
       -      "dev": true

     

       129
       108
        
       -    },

     

       130
       109
        
            "node_modules/@typescript-eslint/parser": {

     

       131
       131
       -
       -      "version": "8.31.0",

     

       132
       132
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",

     

       133
       133
       -
       -      "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",

     

       134
       134
       -
       +      "version": "8.31.1",

     

       135
       135
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.1.tgz",

     

       136
       136
       -
       +      "integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==",

     

       137
       137
       -
              "dev": true,

     

       138
       138
       -
              "license": "MIT",

     

       139
       139
       -
              "dependencies": {

     

       140
       140
       -
       -        "@typescript-eslint/scope-manager": "8.31.0",

     

       141
       141
       -
       -        "@typescript-eslint/types": "8.31.0",

     

       142
       142
       -
       -        "@typescript-eslint/typescript-estree": "8.31.0",

     

       143
       143
       -
       -        "@typescript-eslint/visitor-keys": "8.31.0",

     

       144
       144
       -
       +        "@typescript-eslint/scope-manager": "8.31.1",

     

       145
       145
       -
       +        "@typescript-eslint/types": "8.31.1",

     

       146
       146
       -
       +        "@typescript-eslint/typescript-estree": "8.31.1",

     

       147
       147
       -
       +        "@typescript-eslint/visitor-keys": "8.31.1",

     

       148
       148
       -
                "debug": "^4.3.4"

     

       149
       149
       -
              },

     

       150
       150
       -
              "engines": {

     

       151
       151
       -
       @@ -3131,15 +3102,15 @@

     

       152
       152
       -
                "typescript": ">=4.8.4 <5.9.0"

     

       110
       110
       +
              "version": "8.32.1",

     

       111
       111
       +
              "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",

     

       112
       112
       +
       @@ -3275,13 +3202,14 @@

     

       153
       113
        
              }

     

       154
       114
        
            },

     

       155
       155
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {

     

       156
       156
       -
       -      "version": "8.31.0",

     

       157
       157
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",

     

       158
       158
       -
       -      "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",

     

       159
       159
       -
       +    "node_modules/@typescript-eslint/scope-manager": {

     

       160
       160
       -
       +      "version": "8.31.1",

     

       161
       161
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz",

     

       162
       162
       -
       +      "integrity": "sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==",

     

       115
       115
       +
            "node_modules/@typescript-eslint/scope-manager": {

     

       116
       116
       +
       -      "version": "7.6.0",

     

       117
       117
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz",

     

       118
       118
       +
       -      "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==",

     

       119
       119
       +
       +      "version": "7.18.0",

     

       120
       120
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",

     

       121
       121
       +
       +      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",

     

       163
       122
        
              "dev": true,

     

       164
       164
       -
              "license": "MIT",

     

       123
       123
       +
       +      "license": "MIT",

     

       165
       124
        
              "dependencies": {

     

       166
       166
       -
       -        "@typescript-eslint/types": "8.31.0",

     

       167
       167
       -
       -        "@typescript-eslint/visitor-keys": "8.31.0"

     

       168
       168
       -
       +        "@typescript-eslint/types": "8.31.1",

     

       169
       169
       -
       +        "@typescript-eslint/visitor-keys": "8.31.1"

     

       125
       125
       +
       -        "@typescript-eslint/types": "7.6.0",

     

       126
       126
       +
       -        "@typescript-eslint/visitor-keys": "7.6.0"

     

       127
       127
       +
       +        "@typescript-eslint/types": "7.18.0",

     

       128
       128
       +
       +        "@typescript-eslint/visitor-keys": "7.18.0"

     

       170
       129
        
              },

     

       171
       130
        
              "engines": {

     

       172
       172
       -
                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       173
       173
       -
       @@ -3149,34 +3120,16 @@

     

       174
       174
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       131
       131
       +
                "node": "^18.18.0 || >=20.0.0"

     

       132
       132
       +
       @@ -3292,13 +3220,14 @@

     

       175
       133
        
              }

     

       176
       134
        
            },

     

       177
       177
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {

     

       178
       178
       -
       -      "version": "8.31.0",

     

       179
       179
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",

     

       180
       180
       -
       -      "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",

     

       181
       181
       -
       -      "dev": true,

     

       182
       182
       -
       -      "license": "MIT",

     

       183
       183
       -
       -      "engines": {

     

       184
       184
       -
       -        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       185
       185
       -
       -      },

     

       186
       186
       -
       -      "funding": {

     

       187
       187
       -
       -        "type": "opencollective",

     

       188
       188
       -
       -        "url": "https://opencollective.com/typescript-eslint"

     

       189
       189
       -
       -      }

     

       190
       190
       -
       -    },

     

       191
       191
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {

     

       192
       192
       -
       -      "version": "8.31.0",

     

       193
       193
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",

     

       194
       194
       -
       -      "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",

     

       195
       195
       -
       +    "node_modules/@typescript-eslint/type-utils": {

     

       196
       196
       -
       +      "version": "8.31.1",

     

       197
       197
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz",

     

       198
       198
       -
       +      "integrity": "sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==",

     

       135
       135
       +
            "node_modules/@typescript-eslint/type-utils": {

     

       136
       136
       +
       -      "version": "7.6.0",

     

       137
       137
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz",

     

       138
       138
       +
       -      "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==",

     

       139
       139
       +
       +      "version": "7.18.0",

     

       140
       140
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",

     

       141
       141
       +
       +      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",

     

       199
       142
        
              "dev": true,

     

       200
       200
       -
              "license": "MIT",

     

       143
       143
       +
       +      "license": "MIT",

     

       201
       144
        
              "dependencies": {

     

       202
       202
       -
       -        "@typescript-eslint/types": "8.31.0",

     

       203
       203
       -
       -        "@typescript-eslint/visitor-keys": "8.31.0",

     

       204
       204
       -
       +        "@typescript-eslint/typescript-estree": "8.31.1",

     

       205
       205
       -
       +        "@typescript-eslint/utils": "8.31.1",

     

       145
       145
       +
       -        "@typescript-eslint/typescript-estree": "7.6.0",

     

       146
       146
       +
       -        "@typescript-eslint/utils": "7.6.0",

     

       147
       147
       +
       +        "@typescript-eslint/typescript-estree": "7.18.0",

     

       148
       148
       +
       +        "@typescript-eslint/utils": "7.18.0",

     

       206
       149
        
                "debug": "^4.3.4",

     

       207
       207
       -
       -        "fast-glob": "^3.3.2",

     

       208
       208
       -
       -        "is-glob": "^4.0.3",

     

       209
       209
       -
       -        "minimatch": "^9.0.4",

     

       210
       210
       -
       -        "semver": "^7.6.0",

     

       211
       211
       -
                "ts-api-utils": "^2.0.1"

     

       150
       150
       +
                "ts-api-utils": "^1.3.0"

     

       212
       151
        
              },

     

       213
       213
       -
              "engines": {

     

       214
       214
       -
       @@ -3187,80 +3140,11 @@

     

       215
       215
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       216
       216
       -
              },

     

       217
       217
       -
              "peerDependencies": {

     

       218
       218
       -
       +        "eslint": "^8.57.0 || ^9.0.0",

     

       219
       219
       -
                "typescript": ">=4.8.4 <5.9.0"

     

       220
       220
       -
              }

     

       221
       221
       -
            },

     

       222
       222
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {

     

       223
       223
       -
       -      "version": "8.31.0",

     

       224
       224
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",

     

       225
       225
       -
       -      "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",

     

       226
       226
       -
       -      "dev": true,

     

       227
       227
       -
       -      "license": "MIT",

     

       228
       228
       -
       -      "dependencies": {

     

       229
       229
       -
       -        "@typescript-eslint/types": "8.31.0",

     

       230
       230
       -
       -        "eslint-visitor-keys": "^4.2.0"

     

       231
       231
       -
       -      },

     

       232
       232
       -
       -      "engines": {

     

       233
       233
       -
       -        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       234
       234
       -
       -      },

     

       235
       235
       -
       -      "funding": {

     

       236
       236
       -
       -        "type": "opencollective",

     

       237
       237
       -
       -        "url": "https://opencollective.com/typescript-eslint"

     

       238
       238
       -
       -      }

     

       239
       239
       -
       -    },

     

       240
       240
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {

     

       241
       241
       -
       -      "version": "2.0.1",

     

       242
       242
       -
       -      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",

     

       243
       243
       -
       -      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",

     

       244
       244
       -
       -      "dev": true,

     

       245
       245
       -
       -      "license": "MIT",

     

       246
       246
       -
       -      "dependencies": {

     

       247
       247
       -
       -        "balanced-match": "^1.0.0"

     

       248
       248
       -
       -      }

     

       249
       249
       -
       -    },

     

       250
       250
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {

     

       251
       251
       -
       -      "version": "4.2.0",

     

       252
       252
       -
       -      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",

     

       253
       253
       -
       -      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",

     

       254
       254
       -
       -      "dev": true,

     

       255
       255
       -
       -      "license": "Apache-2.0",

     

       256
       256
       -
       -      "engines": {

     

       257
       257
       -
       -        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       258
       258
       -
       -      },

     

       259
       259
       -
       -      "funding": {

     

       260
       260
       -
       -        "url": "https://opencollective.com/eslint"

     

       261
       261
       -
       -      }

     

       262
       262
       -
       -    },

     

       263
       263
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {

     

       264
       264
       -
       -      "version": "9.0.5",

     

       265
       265
       -
       -      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",

     

       266
       266
       -
       -      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",

     

       267
       267
       -
       -      "dev": true,

     

       268
       268
       -
       -      "license": "ISC",

     

       269
       269
       -
       -      "dependencies": {

     

       270
       270
       -
       -        "brace-expansion": "^2.0.1"

     

       271
       271
       -
       -      },

     

       272
       272
       -
       -      "engines": {

     

       273
       273
       -
       -        "node": ">=16 || 14 >=14.17"

     

       274
       274
       -
       -      },

     

       275
       275
       -
       -      "funding": {

     

       276
       276
       -
       -        "url": "https://github.com/sponsors/isaacs"

     

       277
       277
       -
       -      }

     

       278
       278
       -
       -    },

     

       279
       279
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/semver": {

     

       280
       280
       -
       -      "version": "7.7.1",

     

       281
       281
       -
       -      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",

     

       282
       282
       -
       -      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",

     

       283
       283
       -
       -      "dev": true,

     

       284
       284
       -
       -      "license": "ISC",

     

       285
       285
       -
       -      "bin": {

     

       286
       286
       -
       -        "semver": "bin/semver.js"

     

       287
       287
       -
       -      },

     

       288
       288
       -
       -      "engines": {

     

       289
       289
       -
       -        "node": ">=10"

     

       290
       290
       -
       -      }

     

       291
       291
       -
       -    },

     

       292
       292
       -
       -    "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {

     

       293
       293
       -
       +    "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": {

     

       294
       294
       -
              "version": "2.1.0",

     

       295
       295
       -
              "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",

     

       296
       296
       -
              "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",

     

       297
       297
       -
       @@ -3273,57 +3157,14 @@

     

       298
       298
       -
                "typescript": ">=4.8.4"

     

       152
       152
       +
       @@ -3319,10 +3248,11 @@

     

       299
       153
        
              }

     

       300
       154
        
            },

     

       301
       301
       -
       -    "node_modules/@typescript-eslint/scope-manager": {

     

       302
       302
       -
       -      "version": "7.6.0",

     

       303
       303
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz",

     

       304
       304
       -
       -      "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==",

     

       305
       305
       -
       -      "dev": true,

     

       306
       306
       -
       -      "dependencies": {

     

       307
       307
       -
       -        "@typescript-eslint/types": "7.6.0",

     

       308
       308
       -
       -        "@typescript-eslint/visitor-keys": "7.6.0"

     

       309
       309
       -
       -      },

     

       310
       310
       -
       -      "engines": {

     

       311
       311
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       312
       312
       -
       -      },

     

       313
       313
       -
       -      "funding": {

     

       314
       314
       -
       -        "type": "opencollective",

     

       315
       315
       -
       -        "url": "https://opencollective.com/typescript-eslint"

     

       316
       316
       -
       -      }

     

       317
       317
       -
       -    },

     

       318
       318
       -
       -    "node_modules/@typescript-eslint/type-utils": {

     

       319
       319
       -
       -      "version": "7.6.0",

     

       320
       320
       -
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz",

     

       321
       321
       -
       -      "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==",

     

       322
       322
       -
       -      "dev": true,

     

       323
       323
       -
       -      "dependencies": {

     

       324
       324
       -
       -        "@typescript-eslint/typescript-estree": "7.6.0",

     

       325
       325
       -
       -        "@typescript-eslint/utils": "7.6.0",

     

       326
       326
       -
       -        "debug": "^4.3.4",

     

       327
       327
       -
       -        "ts-api-utils": "^1.3.0"

     

       328
       328
       -
       -      },

     

       329
       329
       -
       -      "engines": {

     

       330
       330
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       331
       331
       -
       -      },

     

       332
       332
       -
       -      "funding": {

     

       333
       333
       -
       -        "type": "opencollective",

     

       334
       334
       -
       -        "url": "https://opencollective.com/typescript-eslint"

     

       335
       335
       -
       -      },

     

       336
       336
       -
       -      "peerDependencies": {

     

       337
       337
       -
       -        "eslint": "^8.56.0"

     

       338
       338
       -
       -      },

     

       339
       339
       -
       -      "peerDependenciesMeta": {

     

       340
       340
       -
       -        "typescript": {

     

       341
       341
       -
       -          "optional": true

     

       342
       342
       -
       -        }

     

       343
       343
       -
       -      }

     

       344
       344
       -
       -    },

     

       345
       155
        
            "node_modules/@typescript-eslint/types": {

     

       346
       156
        
       -      "version": "7.6.0",

     

       347
       157
        
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.6.0.tgz",

     

       348
       158
        
       -      "integrity": "sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==",

     

       349
       349
       -
       +      "version": "8.31.1",

     

       350
       350
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.1.tgz",

     

       351
       351
       -
       +      "integrity": "sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==",

     

       159
       159
       +
       +      "version": "7.18.0",

     

       160
       160
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",

     

       161
       161
       +
       +      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",

     

       352
       162
        
              "dev": true,

     

       353
       163
        
       +      "license": "MIT",

     

       354
       164
        
              "engines": {

     

       355
       355
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       356
       356
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       165
       165
       +
                "node": "^18.18.0 || >=20.0.0"

     

       357
       166
        
              },

     

       358
       358
       -
              "funding": {

     

       359
       359
       -
                "type": "opencollective",

     

       360
       360
       -
       @@ -3331,31 +3172,30 @@

     

       167
       167
       +
       @@ -3332,13 +3262,14 @@

     

       361
       168
        
              }

     

       362
       169
        
            },

     

       363
       170
        
            "node_modules/@typescript-eslint/typescript-estree": {

     

       364
       171
        
       -      "version": "7.6.0",

     

       365
       172
        
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.6.0.tgz",

     

       366
       173
        
       -      "integrity": "sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==",

     

       367
       367
       -
       +      "version": "8.31.1",

     

       368
       368
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz",

     

       369
       369
       -
       +      "integrity": "sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==",

     

       174
       174
       +
       +      "version": "7.18.0",

     

       175
       175
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",

     

       176
       176
       +
       +      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",

     

       370
       177
        
              "dev": true,

     

       371
       371
       -
       +      "license": "MIT",

     

       178
       178
       +
       +      "license": "BSD-2-Clause",

     

       372
       179
        
              "dependencies": {

     

       373
       180
        
       -        "@typescript-eslint/types": "7.6.0",

     

       374
       181
        
       -        "@typescript-eslint/visitor-keys": "7.6.0",

     

       375
       375
       -
       +        "@typescript-eslint/types": "8.31.1",

     

       376
       376
       -
       +        "@typescript-eslint/visitor-keys": "8.31.1",

     

       182
       182
       +
       +        "@typescript-eslint/types": "7.18.0",

     

       183
       183
       +
       +        "@typescript-eslint/visitor-keys": "7.18.0",

     

       377
       184
        
                "debug": "^4.3.4",

     

       378
       378
       -
       -        "globby": "^11.1.0",

     

       379
       379
       -
       +        "fast-glob": "^3.3.2",

     

       185
       185
       +
                "globby": "^11.1.0",

     

       380
       186
        
                "is-glob": "^4.0.3",

     

       381
       381
       -
                "minimatch": "^9.0.4",

     

       382
       382
       -
                "semver": "^7.6.0",

     

       383
       383
       -
       -        "ts-api-utils": "^1.3.0"

     

       384
       384
       -
       +        "ts-api-utils": "^2.0.1"

     

       385
       385
       -
              },

     

       386
       386
       -
              "engines": {

     

       387
       387
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       388
       388
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       389
       389
       -
              },

     

       390
       390
       -
              "funding": {

     

       391
       391
       -
                "type": "opencollective",

     

       392
       392
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       393
       393
       -
              },

     

       394
       394
       -
       -      "peerDependenciesMeta": {

     

       395
       395
       -
       -        "typescript": {

     

       396
       396
       -
       -          "optional": true

     

       397
       397
       -
       -        }

     

       398
       398
       -
       +      "peerDependencies": {

     

       399
       399
       -
       +        "typescript": ">=4.8.4 <5.9.0"

     

       187
       187
       +
       @@ -3360,31 +3291,21 @@

     

       400
       188
        
              }

     

       401
       189
        
            },

     

       402
       190
        
            "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {

     

       403
       403
       -
       @@ -3363,27 +3203,17 @@

     

       404
       404
       -
              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",

     

       405
       405
       -
              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",

     

       191
       191
       +
       -      "version": "2.0.1",

     

       192
       192
       +
       -      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",

     

       193
       193
       +
       -      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",

     

       194
       194
       +
       +      "version": "2.0.2",

     

       195
       195
       +
       +      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",

     

       196
       196
       +
       +      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",

     

       406
       197
        
              "dev": true,

     

       407
       198
        
       +      "license": "MIT",

     

       408
       199
        
              "dependencies": {

     
···

       433
       224
        
              "dependencies": {

     

       434
       225
        
                "brace-expansion": "^2.0.1"

     

       435
       226
        
              },

     

       436
       436
       -
       @@ -3395,13 +3225,11 @@

     

       227
       227
       +
       @@ -3396,13 +3317,11 @@

     

       437
       228
        
              }

     

       438
       229
        
            },

     

       439
       230
        
            "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {

     

       440
       231
        
       -      "version": "7.6.0",

     

       441
       232
        
       -      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",

     

       442
       233
        
       -      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",

     

       443
       443
       -
       +      "version": "7.7.1",

     

       444
       444
       -
       +      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",

     

       445
       445
       -
       +      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",

     

       234
       234
       +
       +      "version": "7.7.2",

     

       235
       235
       +
       +      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",

     

       236
       236
       +
       +      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",

     

       446
       237
        
              "dev": true,

     

       447
       238
        
       -      "dependencies": {

     

       448
       239
        
       -        "lru-cache": "^6.0.0"

     
···

       451
       242
        
              "bin": {

     

       452
       243
        
                "semver": "bin/semver.js"

     

       453
       244
        
              },

     

       454
       454
       -
       @@ -3409,85 +3237,72 @@

     

       245
       245
       +
       @@ -3410,25 +3329,17 @@

     

       455
       246
        
                "node": ">=10"

     

       456
       247
        
              }

     

       457
       248
        
            },

     
···

       460
       251
        
       -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

     

       461
       252
        
       -      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",

     

       462
       253
        
       -      "dev": true

     

       463
       463
       -
       +    "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {

     

       464
       464
       -
       +      "version": "2.1.0",

     

       465
       465
       -
       +      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",

     

       466
       466
       -
       +      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",

     

       467
       467
       -
       +      "dev": true,

     

       468
       468
       -
       +      "license": "MIT",

     

       469
       469
       -
       +      "engines": {

     

       470
       470
       -
       +        "node": ">=18.12"

     

       471
       471
       -
       +      },

     

       472
       472
       -
       +      "peerDependencies": {

     

       473
       473
       -
       +        "typescript": ">=4.8.4"

     

       474
       474
       -
       +      }

     

       475
       475
       -
            },

     

       254
       254
       +
       -    },

     

       476
       255
        
            "node_modules/@typescript-eslint/utils": {

     

       477
       256
        
       -      "version": "7.6.0",

     

       478
       257
        
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.6.0.tgz",

     

       479
       258
        
       -      "integrity": "sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==",

     

       480
       480
       -
       +      "version": "8.31.1",

     

       481
       481
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.1.tgz",

     

       482
       482
       -
       +      "integrity": "sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==",

     

       259
       259
       +
       +      "version": "7.18.0",

     

       260
       260
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",

     

       261
       261
       +
       +      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",

     

       483
       262
        
              "dev": true,

     

       484
       263
        
       +      "license": "MIT",

     

       485
       264
        
              "dependencies": {

     
···

       490
       269
        
       -        "@typescript-eslint/types": "7.6.0",

     

       491
       270
        
       -        "@typescript-eslint/typescript-estree": "7.6.0",

     

       492
       271
        
       -        "semver": "^7.6.0"

     

       493
       493
       -
       +        "@typescript-eslint/scope-manager": "8.31.1",

     

       494
       494
       -
       +        "@typescript-eslint/types": "8.31.1",

     

       495
       495
       -
       +        "@typescript-eslint/typescript-estree": "8.31.1"

     

       272
       272
       +
       +        "@typescript-eslint/scope-manager": "7.18.0",

     

       273
       273
       +
       +        "@typescript-eslint/types": "7.18.0",

     

       274
       274
       +
       +        "@typescript-eslint/typescript-estree": "7.18.0"

     

       496
       275
        
              },

     

       497
       276
        
              "engines": {

     

       498
       498
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       499
       499
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       500
       500
       -
              },

     

       501
       501
       -
              "funding": {

     

       502
       502
       -
                "type": "opencollective",

     

       503
       503
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       504
       504
       -
              },

     

       505
       505
       -
              "peerDependencies": {

     

       506
       506
       -
       -        "eslint": "^8.56.0"

     

       507
       507
       -
       +        "eslint": "^8.57.0 || ^9.0.0",

     

       508
       508
       -
       +        "typescript": ">=4.8.4 <5.9.0"

     

       277
       277
       +
                "node": "^18.18.0 || >=20.0.0"

     

       278
       278
       +
       @@ -3441,46 +3352,14 @@

     

       279
       279
       +
                "eslint": "^8.56.0"

     

       509
       280
        
              }

     

       510
       281
        
            },

     

       511
       282
        
       -    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {

     

       512
       283
        
       -      "version": "6.0.0",

     

       513
       284
        
       -      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",

     

       514
       285
        
       -      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",

     

       515
       515
       -
       +    "node_modules/@typescript-eslint/visitor-keys": {

     

       516
       516
       -
       +      "version": "8.31.1",

     

       517
       517
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz",

     

       518
       518
       -
       +      "integrity": "sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==",

     

       519
       519
       -
              "dev": true,

     

       520
       520
       -
       +      "license": "MIT",

     

       521
       521
       -
              "dependencies": {

     

       286
       286
       +
       -      "dev": true,

     

       287
       287
       +
       -      "dependencies": {

     

       522
       288
        
       -        "yallist": "^4.0.0"

     

       523
       523
       -
       +        "@typescript-eslint/types": "8.31.1",

     

       524
       524
       -
       +        "eslint-visitor-keys": "^4.2.0"

     

       525
       525
       -
              },

     

       526
       526
       -
              "engines": {

     

       289
       289
       +
       -      },

     

       290
       290
       +
       -      "engines": {

     

       527
       291
        
       -        "node": ">=10"

     

       528
       292
        
       -      }

     

       529
       293
        
       -    },

     
···

       537
       301
        
       -      },

     

       538
       302
        
       -      "bin": {

     

       539
       303
        
       -        "semver": "bin/semver.js"

     

       540
       540
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       541
       541
       -
              },

     

       304
       304
       +
       -      },

     

       542
       305
        
       -      "engines": {

     

       543
       306
        
       -        "node": ">=10"

     

       544
       544
       -
       +      "funding": {

     

       545
       545
       -
       +        "type": "opencollective",

     

       546
       546
       -
       +        "url": "https://opencollective.com/typescript-eslint"

     

       547
       547
       -
              }

     

       548
       548
       -
            },

     

       307
       307
       +
       -      }

     

       308
       308
       +
       -    },

     

       549
       309
        
       -    "node_modules/@typescript-eslint/utils/node_modules/yallist": {

     

       550
       310
        
       -      "version": "4.0.0",

     

       551
       311
        
       -      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

     

       552
       312
        
       -      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",

     

       553
       313
        
       -      "dev": true

     

       554
       314
        
       -    },

     

       555
       555
       -
       -    "node_modules/@typescript-eslint/visitor-keys": {

     

       315
       315
       +
            "node_modules/@typescript-eslint/visitor-keys": {

     

       556
       316
        
       -      "version": "7.6.0",

     

       557
       317
        
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.6.0.tgz",

     

       558
       318
        
       -      "integrity": "sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==",

     

       559
       559
       -
       +    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {

     

       560
       560
       -
       +      "version": "4.2.0",

     

       561
       561
       -
       +      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",

     

       562
       562
       -
       +      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",

     

       319
       319
       +
       +      "version": "7.18.0",

     

       320
       320
       +
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",

     

       321
       321
       +
       +      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",

     

       563
       322
        
              "dev": true,

     

       564
       564
       -
       -      "dependencies": {

     

       323
       323
       +
       +      "license": "MIT",

     

       324
       324
       +
              "dependencies": {

     

       565
       325
        
       -        "@typescript-eslint/types": "7.6.0",

     

       566
       566
       -
       -        "eslint-visitor-keys": "^3.4.3"

     

       567
       567
       -
       -      },

     

       568
       568
       -
       +      "license": "Apache-2.0",

     

       326
       326
       +
       +        "@typescript-eslint/types": "7.18.0",

     

       327
       327
       +
                "eslint-visitor-keys": "^3.4.3"

     

       328
       328
       +
              },

     

       569
       329
        
              "engines": {

     

       570
       570
       -
       -        "node": "^18.18.0 || >=20.0.0"

     

       571
       571
       -
       +        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

     

       572
       572
       -
              },

     

       573
       573
       -
              "funding": {

     

       574
       574
       -
       -        "type": "opencollective",

     

       575
       575
       -
       -        "url": "https://opencollective.com/typescript-eslint"

     

       576
       576
       -
       +        "url": "https://opencollective.com/eslint"

     

       577
       577
       -
              }

     

       578
       578
       -
            },

     

       579
       579
       -
            "node_modules/@ungap/structured-clone": {

     

       580
       580
       -
       @@ -3591,6 +3406,40 @@

     

       330
       330
       +
       @@ -3592,6 +3471,40 @@

     

       581
       331
        
                }

     

       582
       332
        
              }

     

       583
       333
        
            },

     
···

       618
       368
        
            "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": {

     

       619
       369
        
              "version": "7.18.0",

     

       620
       370
        
              "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",

     

       621
       621
       -
       @@ -3638,6 +3487,34 @@

     

       622
       622
       -
                "url": "https://opencollective.com/typescript-eslint"

     

       623
       623
       -
              }

     

       624
       624
       -
            },

     

       625
       625
       -
       +    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": {

     

       626
       626
       -
       +      "version": "7.18.0",

     

       627
       627
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",

     

       628
       628
       -
       +      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",

     

       629
       629
       -
       +      "dev": true,

     

       630
       630
       -
       +      "license": "MIT",

     

       631
       631
       -
       +      "dependencies": {

     

       632
       632
       -
       +        "@typescript-eslint/typescript-estree": "7.18.0",

     

       633
       633
       -
       +        "@typescript-eslint/utils": "7.18.0",

     

       634
       634
       -
       +        "debug": "^4.3.4",

     

       635
       635
       -
       +        "ts-api-utils": "^1.3.0"

     

       636
       636
       -
       +      },

     

       637
       637
       -
       +      "engines": {

     

       638
       638
       -
       +        "node": "^18.18.0 || >=20.0.0"

     

       639
       639
       -
       +      },

     

       640
       640
       -
       +      "funding": {

     

       641
       641
       -
       +        "type": "opencollective",

     

       642
       642
       -
       +        "url": "https://opencollective.com/typescript-eslint"

     

       643
       643
       -
       +      },

     

       644
       644
       -
       +      "peerDependencies": {

     

       645
       645
       -
       +        "eslint": "^8.56.0"

     

       646
       646
       -
       +      },

     

       647
       647
       -
       +      "peerDependenciesMeta": {

     

       648
       648
       -
       +        "typescript": {

     

       649
       649
       -
       +          "optional": true

     

       650
       650
       -
       +        }

     

       651
       651
       -
       +      }

     

       652
       652
       -
       +    },

     

       653
       653
       -
            "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {

     

       654
       654
       -
              "version": "7.18.0",

     

       655
       655
       -
              "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",

     

       656
       656
       -
       @@ -3681,6 +3558,29 @@

     

       371
       371
       +
       @@ -3621,124 +3534,6 @@

     

       657
       372
        
                }

     

       658
       373
        
              }

     

       659
       374
        
            },

     

       660
       660
       -
       +    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": {

     

       661
       661
       -
       +      "version": "7.18.0",

     

       662
       662
       -
       +      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",

     

       663
       663
       -
       +      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",

     

       664
       664
       -
       +      "dev": true,

     

       665
       665
       -
       +      "license": "MIT",

     

       666
       666
       -
       +      "dependencies": {

     

       667
       667
       -
       +        "@eslint-community/eslint-utils": "^4.4.0",

     

       668
       668
       -
       +        "@typescript-eslint/scope-manager": "7.18.0",

     

       669
       669
       -
       +        "@typescript-eslint/types": "7.18.0",

     

       670
       670
       -
       +        "@typescript-eslint/typescript-estree": "7.18.0"

     

       671
       671
       -
       +      },

     

       672
       672
       -
       +      "engines": {

     

       673
       673
       -
       +        "node": "^18.18.0 || >=20.0.0"

     

       674
       674
       -
       +      },

     

       675
       675
       -
       +      "funding": {

     

       676
       676
       -
       +        "type": "opencollective",

     

       677
       677
       -
       +        "url": "https://opencollective.com/typescript-eslint"

     

       678
       678
       -
       +      },

     

       679
       679
       -
       +      "peerDependencies": {

     

       680
       680
       -
       +        "eslint": "^8.56.0"

     

       681
       681
       -
       +      }

     

       682
       682
       -
       +    },

     

       683
       683
       -
            "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {

     

       684
       684
       -
              "version": "7.18.0",

     

       685
       685
       -
              "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",

     

       375
       375
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/scope-manager": {

     

       376
       376
       +
       -      "version": "7.18.0",

     

       377
       377
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",

     

       378
       378
       +
       -      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",

     

       379
       379
       +
       -      "dev": true,

     

       380
       380
       +
       -      "license": "MIT",

     

       381
       381
       +
       -      "dependencies": {

     

       382
       382
       +
       -        "@typescript-eslint/types": "7.18.0",

     

       383
       383
       +
       -        "@typescript-eslint/visitor-keys": "7.18.0"

     

       384
       384
       +
       -      },

     

       385
       385
       +
       -      "engines": {

     

       386
       386
       +
       -        "node": "^18.18.0 || >=20.0.0"

     

       387
       387
       +
       -      },

     

       388
       388
       +
       -      "funding": {

     

       389
       389
       +
       -        "type": "opencollective",

     

       390
       390
       +
       -        "url": "https://opencollective.com/typescript-eslint"

     

       391
       391
       +
       -      }

     

       392
       392
       +
       -    },

     

       393
       393
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {

     

       394
       394
       +
       -      "version": "7.18.0",

     

       395
       395
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",

     

       396
       396
       +
       -      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",

     

       397
       397
       +
       -      "dev": true,

     

       398
       398
       +
       -      "license": "MIT",

     

       399
       399
       +
       -      "engines": {

     

       400
       400
       +
       -        "node": "^18.18.0 || >=20.0.0"

     

       401
       401
       +
       -      },

     

       402
       402
       +
       -      "funding": {

     

       403
       403
       +
       -        "type": "opencollective",

     

       404
       404
       +
       -        "url": "https://opencollective.com/typescript-eslint"

     

       405
       405
       +
       -      }

     

       406
       406
       +
       -    },

     

       407
       407
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/typescript-estree": {

     

       408
       408
       +
       -      "version": "7.18.0",

     

       409
       409
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",

     

       410
       410
       +
       -      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",

     

       411
       411
       +
       -      "dev": true,

     

       412
       412
       +
       -      "license": "BSD-2-Clause",

     

       413
       413
       +
       -      "dependencies": {

     

       414
       414
       +
       -        "@typescript-eslint/types": "7.18.0",

     

       415
       415
       +
       -        "@typescript-eslint/visitor-keys": "7.18.0",

     

       416
       416
       +
       -        "debug": "^4.3.4",

     

       417
       417
       +
       -        "globby": "^11.1.0",

     

       418
       418
       +
       -        "is-glob": "^4.0.3",

     

       419
       419
       +
       -        "minimatch": "^9.0.4",

     

       420
       420
       +
       -        "semver": "^7.6.0",

     

       421
       421
       +
       -        "ts-api-utils": "^1.3.0"

     

       422
       422
       +
       -      },

     

       423
       423
       +
       -      "engines": {

     

       424
       424
       +
       -        "node": "^18.18.0 || >=20.0.0"

     

       425
       425
       +
       -      },

     

       426
       426
       +
       -      "funding": {

     

       427
       427
       +
       -        "type": "opencollective",

     

       428
       428
       +
       -        "url": "https://opencollective.com/typescript-eslint"

     

       429
       429
       +
       -      },

     

       430
       430
       +
       -      "peerDependenciesMeta": {

     

       431
       431
       +
       -        "typescript": {

     

       432
       432
       +
       -          "optional": true

     

       433
       433
       +
       -        }

     

       434
       434
       +
       -      }

     

       435
       435
       +
       -    },

     

       436
       436
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {

     

       437
       437
       +
       -      "version": "7.18.0",

     

       438
       438
       +
       -      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",

     

       439
       439
       +
       -      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",

     

       440
       440
       +
       -      "dev": true,

     

       441
       441
       +
       -      "license": "MIT",

     

       442
       442
       +
       -      "dependencies": {

     

       443
       443
       +
       -        "@typescript-eslint/types": "7.18.0",

     

       444
       444
       +
       -        "eslint-visitor-keys": "^3.4.3"

     

       445
       445
       +
       -      },

     

       446
       446
       +
       -      "engines": {

     

       447
       447
       +
       -        "node": "^18.18.0 || >=20.0.0"

     

       448
       448
       +
       -      },

     

       449
       449
       +
       -      "funding": {

     

       450
       450
       +
       -        "type": "opencollective",

     

       451
       451
       +
       -        "url": "https://opencollective.com/typescript-eslint"

     

       452
       452
       +
       -      }

     

       453
       453
       +
       -    },

     

       454
       454
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/brace-expansion": {

     

       455
       455
       +
       -      "version": "2.0.1",

     

       456
       456
       +
       -      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",

     

       457
       457
       +
       -      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",

     

       458
       458
       +
       -      "dev": true,

     

       459
       459
       +
       -      "license": "MIT",

     

       460
       460
       +
       -      "dependencies": {

     

       461
       461
       +
       -        "balanced-match": "^1.0.0"

     

       462
       462
       +
       -      }

     

       463
       463
       +
       -    },

     

       464
       464
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/minimatch": {

     

       465
       465
       +
       -      "version": "9.0.5",

     

       466
       466
       +
       -      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",

     

       467
       467
       +
       -      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",

     

       468
       468
       +
       -      "dev": true,

     

       469
       469
       +
       -      "license": "ISC",

     

       470
       470
       +
       -      "dependencies": {

     

       471
       471
       +
       -        "brace-expansion": "^2.0.1"

     

       472
       472
       +
       -      },

     

       473
       473
       +
       -      "engines": {

     

       474
       474
       +
       -        "node": ">=16 || 14 >=14.17"

     

       475
       475
       +
       -      },

     

       476
       476
       +
       -      "funding": {

     

       477
       477
       +
       -        "url": "https://github.com/sponsors/isaacs"

     

       478
       478
       +
       -      }

     

       479
       479
       +
       -    },

     

       480
       480
       +
       -    "node_modules/@vue/eslint-config-typescript/node_modules/semver": {

     

       481
       481
       +
       -      "version": "7.6.3",

     

       482
       482
       +
       -      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",

     

       483
       483
       +
       -      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",

     

       484
       484
       +
       -      "dev": true,

     

       485
       485
       +
       -      "license": "ISC",

     

       486
       486
       +
       -      "bin": {

     

       487
       487
       +
       -        "semver": "bin/semver.js"

     

       488
       488
       +
       -      },

     

       489
       489
       +
       -      "engines": {

     

       490
       490
       +
       -        "node": ">=10"

     

       491
       491
       +
       -      }

     

       492
       492
       +
       -    },

     

       493
       493
       +
            "node_modules/@vue/reactivity": {

     

       494
       494
       +
              "version": "3.5.13",

     

       495
       495
       +
              "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",

     

       686
       496
        
       diff --git a/Rnwood.Smtp4dev/ClientApp/package.json b/Rnwood.Smtp4dev/ClientApp/package.json

     

       687
       687
       -
       index a9e301a..619e55b 100644

     

       497
       497
       +
       index 46c7a6f..75a3a4a 100644

     

       688
       498
        
       --- a/Rnwood.Smtp4dev/ClientApp/package.json

     

       689
       499
        
       +++ b/Rnwood.Smtp4dev/ClientApp/package.json

     

       690
       690
       -
       @@ -19,7 +19,8 @@

     

       500
       500
       +
       @@ -19,7 +19,7 @@

     

       691
       501
        
            "@microsoft/signalr": "^8.0.0",

     

       692
       502
        
            "@types/jest": "^29.5.12",

     

       693
       503
        
            "@types/sanitize-html": "^2.11.0",

     

       694
       504
        
       -    "@typescript-eslint/parser": "^8.0.0",

     

       695
       695
       -
       +    "@typescript-eslint/eslint-plugin": "^8.31.1",

     

       696
       696
       -
       +    "@typescript-eslint/parser": "^8.31.1",

     

       505
       505
       +
       +    "@typescript-eslint/parser": "^8.32.1",

     

       697
       506
        
            "@vitejs/plugin-vue": "^5.0.4",

     

       698
       507
        
            "@vue/eslint-config-typescript": "^13.0.0",

     

       699
       508
        
            "@vue/vue3-jest": "^29.2.6",

+3 -3

pkgs/by-name/tl/tlsinfo/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "tlsinfo";

     

       10
       10
       -
         version = "0.1.48";

     

       10
       10
       +
         version = "0.1.49";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "paepckehh";

     

       14
       14
        
           repo = "tlsinfo";

     

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

     

       16
       16
       -
           hash = "sha256-1483Y1SoAVsXIjpa1CbOvVQsOol6adoQD9PCxHgSgU4=";

     

       16
       16
       +
           hash = "sha256-Lp1RTyQMkYSMS+qdr0R8zkBI/68zzltq3F4pjyrKfFo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-wHCHj7/DBzW0m16aXdQBjPRKjIlf2iab1345ud+ulVQ=";

     

       19
       19
       +
         vendorHash = "sha256-RB/EoSRbWPYNFg73+nWuxf7i+kMAUQsJk0KQAZyJgj0=";

     

       20
       20
        
       

     

       21
       21
        
         ldflags = [

     

       22
       22
        
           "-s"

+2 -2

pkgs/by-name/uw/uwsm/package.nix

···

       28
       28
        
       in

     

       29
       29
        
       stdenv.mkDerivation (finalAttrs: {

     

       30
       30
        
         pname = "uwsm";

     

       31
       31
       -
         version = "0.23.2";

     

       31
       31
       +
         version = "0.23.3";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "Vladimir-csp";

     

       35
       35
        
           repo = "uwsm";

     

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

     

       37
       37
       -
           hash = "sha256-lKPCtlTfIAb7axthl/PUU82cULafYIhZ5xJolFKSOno=";

     

       37
       37
       +
           hash = "sha256-UP9Ztps5oWl0bdXhSlE4SCxHFprUf74DWygJy6GvO4k=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         nativeBuildInputs = [

+9 -10

pkgs/by-name/yu/yubikey-manager/package.nix

···

       9
       9
        
       

     

       10
       10
        
       python3Packages.buildPythonPackage rec {

     

       11
       11
        
         pname = "yubikey-manager";

     

       12
       12
       -
         version = "5.7.2";

     

       12
       12
       +
         version = "5.8.0";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Yubico";

     

       17
       17
        
           repo = "yubikey-manager";

     

       18
       18
        
           tag = version;

     

       19
       19
       -
           hash = "sha256-dgOi9gJ7jO3+EjZQjHfx+KDsBtj6b4JWR3Bp9xWM6FI=";

     

       19
       19
       +
           hash = "sha256-Z3krdKP6hhhIxN7nl/k5r30jFVC0kZK9Z6Aqllp/KrA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     

       23
       23
        
           substituteInPlace "ykman/pcsc/__init__.py" \

     

       24
       24
       -
             --replace 'pkill' '${if stdenv.hostPlatform.isLinux then procps else "/usr"}/bin/pkill'

     

       24
       24
       +
             --replace-fail 'pkill' '${if stdenv.hostPlatform.isLinux then procps else "/usr"}/bin/pkill'

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         nativeBuildInputs = with python3Packages; [

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           installShellFiles

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         build-system = with python3Packages; [

     

       28
       32
        
           poetry-core

     

       29
       29
       -
           installShellFiles

     

       30
       33
        
         ];

     

       31
       34
        
       

     

       32
       32
       -
         propagatedBuildInputs = with python3Packages; [

     

       35
       35
       +
         dependencies = with python3Packages; [

     

       33
       36
        
           cryptography

     

       34
       37
        
           pyscard

     

       35
       38
        
           fido2

     

       36
       39
        
           click

     

       37
       40
        
           keyring

     

       38
       38
       -
         ];

     

       39
       39
       -
       

     

       40
       40
       -
         pythonRelaxDeps = [

     

       41
       41
       -
           "keyring"

     

       42
       41
        
         ];

     

       43
       42
        
       

     

       44
       43
        
         postInstall = ''

+2 -2

pkgs/desktops/lomiri/development/cmake-extras/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "cmake-extras";

     

       11
       11
       -
         version = "1.8";

     

       11
       11
       +
         version = "1.9";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitLab {

     

       14
       14
        
           owner = "ubports";

     

       15
       15
        
           repo = "development/core/cmake-extras";

     

       16
       16
        
           tag = finalAttrs.version;

     

       17
       17
       -
           hash = "sha256-4KPk8GrpmrrwN6epmzGVh0fCBgP765xR3Im5mMmE9vw=";

     

       17
       17
       +
           hash = "sha256-7dIuQ2SdtpG93cPZTmoxXUCwFhsq11gmg4OJlGTQ3VY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         postPatch = ''

+2 -2

pkgs/desktops/pantheon/apps/elementary-music/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "elementary-music";

     

       22
       22
       -
         version = "8.0.0";

     

       22
       22
       +
         version = "8.1.0";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "elementary";

     

       26
       26
        
           repo = "music";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko=";

     

       28
       28
       +
           sha256 = "sha256-ALAQh+iFhRhAMCwYDM0Bcww1K/xJ/AajZu/52baI3gQ=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

pkgs/development/compilers/crystal/default.nix

···

       328
       328
        
           doCheck = false;

     

       329
       329
        
         };

     

       330
       330
        
       

     

       331
       331
       +
         crystal_1_17 = generic {

     

       332
       332
       +
           version = "1.17.1";

     

       333
       333
       +
           sha256 = "sha256-+wHhozPhpIsfQy1Lw+V48zvuWCfXzT4IC9KA1AU/DLw=";

     

       334
       334
       +
           binary = binaryCrystal_1_10;

     

       335
       335
       +
           llvmPackages = llvmPackages_18;

     

       336
       336
       +
           doCheck = false;

     

       337
       337
       +
         };

     

       338
       338
       +
       

     

       331
       339
        
         crystal = crystal_1_16;

     

       332
       340
        
       }

+79 -19

pkgs/development/compilers/swift/compiler/default.nix

···

       111
       111
        
           "swift-remote-mirror-headers"

     

       112
       112
        
         ];

     

       113
       113
        
       

     

       114
       114
       +
         clangForWrappers = clang.override (prev: {

     

       115
       115
       +
           extraBuildCommands =

     

       116
       116
       +
             prev.extraBuildCommands

     

       117
       117
       +
             # We need to use the resource directory corresponding to Swift’s

     

       118
       118
       +
             # version of Clang instead of passing along the one from the

     

       119
       119
       +
             # `cc-wrapper` flags.

     

       120
       120
       +
             + ''

     

       121
       121
       +
               substituteInPlace $out/nix-support/cc-cflags \

     

       122
       122
       +
                 --replace-fail " -resource-dir=$out/resource-root" ""

     

       123
       123
       +
             '';

     

       124
       124
       +
         });

     

       125
       125
       +
       

     

       114
       126
        
         # Build a tool used during the build to create a custom clang wrapper, with

     

       115
       127
        
         # which we wrap the clang produced by the swift build.

     

       116
       128
        
         #

     
···

       130
       142
        
           unwrappedClang="$targetFile-unwrapped"

     

       131
       143
        
       

     

       132
       144
        
           mv "$targetFile" "$unwrappedClang"

     

       133
       133
       -
           sed < '${clang}/bin/clang' > "$targetFile" \

     

       145
       145
       +
           sed < '${clangForWrappers}/bin/clang' > "$targetFile" \

     

       134
       146
        
             -e 's|^\s*exec|exec -a "$0"|g' \

     

       135
       147
        
             -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \

     

       136
       148
        
             -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" \

     

       137
       137
       -
             -e "s|^\(\s*\)\($unwrappedClang\) \"@\\\$responseFile\"|\1argv0=\$0\n\1${bash}/bin/bash -c \"exec -a '\$argv0' \2 '@\$responseFile'\"|"

     

       149
       149
       +
             -e "s|^\(\s*\)\($unwrappedClang\) \"@\\\$responseFile\"|\1argv0=\$0\n\1${bash}/bin/bash -c \"exec -a '\$argv0' \2 '@\$responseFile'\"|" \

     

       150
       150
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       151
       151
       +
             -e 's|$NIX_CXXSTDLIB_COMPILE_${clang.suffixSalt}|-isystem '$SWIFT_BUILD_ROOT'/libcxx/include/c++/v1|g'

     

       152
       152
       +
           ''}

     

       138
       153
        
           chmod a+x "$targetFile"

     

       139
       154
        
         '';

     

       140
       155
        
       

     
···

       146
       161
        
         # executable uses $0 to detect what tool is called.

     

       147
       162
        
         wrapperParams = {

     

       148
       163
        
           inherit bintools;

     

       149
       149
       -
           default_cc_wrapper = clang; # Instead of `@out@` in the original.

     

       150
       164
        
           coreutils_bin = lib.getBin coreutils;

     

       151
       165
        
           gnugrep_bin = gnugrep;

     

       152
       166
        
           suffixSalt = lib.replaceStrings [ "-" "." ] [ "_" "_" ] targetPlatform.config;

     

       153
       167
        
           use_response_file_by_default = 1;

     

       154
       168
        
           swiftDriver = "";

     

       155
       155
       -
           # NOTE: @prog@ needs to be filled elsewhere.

     

       169
       169
       +
           # NOTE: @cc_wrapper@ and @prog@ need to be filled elsewhere.

     

       156
       170
        
         };

     

       157
       171
        
         swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams ''

     

       158
       172
        
           # Make empty to avoid adding the SDK’s modules in the bootstrap wrapper. Otherwise, the SDK conflicts with the

     
···

       168
       182
        
           mv "$targetFile" "$unwrappedSwift"

     

       169
       183
        
           sed < '${swiftWrapper}' > "$targetFile" \

     

       170
       184
        
             -e "s|@prog@|'$unwrappedSwift'|g" \

     

       171
       171
       -
             -e 's|exec "$prog"|exec -a "$0" "$prog"|g'

     

       185
       185
       +
             -e 's|@cc_wrapper@|${clangForWrappers}|g' \

     

       186
       186
       +
             -e 's|exec "$prog"|exec -a "$0" "$prog"|g' \

     

       187
       187
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       188
       188
       +
             -e 's|$NIX_CXXSTDLIB_COMPILE_${clang.suffixSalt}|-isystem '$SWIFT_BUILD_ROOT'/libcxx/include/c++/v1|g'

     

       189
       189
       +
           ''}

     

       172
       190
        
           chmod a+x "$targetFile"

     

       173
       191
        
         '';

     

       174
       192
        
       

     
···

       308
       326
        
       

     

       309
       327
        
            patch -p1 -d swift -i ${./patches/swift-cmake-3.25-compat.patch}

     

       310
       328
        
            patch -p1 -d swift -i ${./patches/swift-wrap.patch}

     

       311
       311
       -
            patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch}

     

       312
       329
        
            patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch}

     

       313
       313
       -
            patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch}

     

       314
       314
       -
            patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch}

     

       330
       330
       +
            patch -p1 -d swift -i ${

     

       331
       331
       +
              replaceVars ./patches/swift-linux-fix-linking.patch {

     

       332
       332
       +
                inherit clang;

     

       333
       333
       +
              }

     

       334
       334
       +
            }

     

       315
       335
        
            patch -p1 -d swift -i ${

     

       316
       336
        
              replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch {

     

       317
       337
        
                inherit swiftArch;

     
···

       353
       373
        
                  url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";

     

       354
       374
        
                  stripLen = 1;

     

       355
       375
        
                  hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";

     

       376
       376
       +
                })

     

       377
       377
       +
       

     

       378
       378
       +
                # Fix the build with modern libc++.

     

       379
       379
       +
                (fetchpatch {

     

       380
       380
       +
                  name = "add-cstdio.patch";

     

       381
       381
       +
                  url = "https://github.com/llvm/llvm-project/commit/73e15b5edb4fa4a77e68c299a6e3b21e610d351f.patch";

     

       382
       382
       +
                  stripLen = 1;

     

       383
       383
       +
                  hash = "sha256-eFcvxZaAuBsY/bda1h9212QevrXyvCHw8Cr9ngetDr0=";

     

       384
       384
       +
                })

     

       385
       385
       +
                (fetchpatch {

     

       386
       386
       +
                  url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch";

     

       387
       387
       +
                  stripLen = 1;

     

       388
       388
       +
                  hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc=";

     

       356
       389
        
                })

     

       357
       390
        
              ]

     

       358
       391
        
            }; do

     
···

       361
       394
        
       

     

       362
       395
        
            patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch}

     

       363
       396
        
            patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch}

     

       364
       364
       -
            patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch}

     

       397
       397
       +
            patch -p1 -d llvm-project/clang -i ${./patches/clang-purity.patch}

     

       365
       398
        
            patch -p2 -d llvm-project/clang -i ${

     

       366
       399
        
              fetchpatch {

     

       367
       400
        
                name = "clang-cmake-fix-interpreter.patch";

     
···

       419
       452
        
            patchShebangs .

     

       420
       453
        
       

     

       421
       454
        
            ${lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

     

       455
       455
       +
              patch -p1 -d swift-corelibs-libdispatch -i ${

     

       456
       456
       +
                # Fix the build with modern Clang.

     

       457
       457
       +
                fetchpatch {

     

       458
       458
       +
                  url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/30bb8019ba79cdae0eb1dc0c967c17996dd5cc0a.patch";

     

       459
       459
       +
                  hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";

     

       460
       460
       +
                }

     

       461
       461
       +
              }

     

       462
       462
       +
       

     

       422
       463
        
              # NOTE: This interferes with ABI stability on Darwin, which uses the system

     

       423
       464
        
              # libraries in the hardcoded path /usr/lib/swift.

     

       424
       465
        
              fixCmakeFiles .

     
···

       426
       467
        
         '';

     

       427
       468
        
       

     

       428
       469
        
         # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0'

     

       429
       429
       -
         hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs";

     

       470
       470
       +
         # > clang-15-unwrapped: error: argument unused during compilation: '-fstack-clash-protection' [-Werror,-Wunused-command-line-argument]

     

       471
       471
       +
         hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [

     

       472
       472
       +
           "zerocallusedregs"

     

       473
       473
       +
           "stackclashprotection"

     

       474
       474
       +
         ];

     

       430
       475
        
       

     

       431
       476
        
         configurePhase = ''

     

       432
       477
        
           export SWIFT_SOURCE_ROOT="$PWD"

     
···

       469
       514
        
           cmakeFlags="-GNinja"

     

       470
       515
        
           buildProject swift-cmark

     

       471
       516
        
       

     

       517
       517
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       518
       518
       +
             # Install the libc++ headers corresponding to the LLVM version of

     

       519
       519
       +
             # Swift’s Clang.

     

       520
       520
       +
             cmakeFlags="

     

       521
       521
       +
               -GNinja

     

       522
       522
       +
               -DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi

     

       523
       523
       +
               -DLIBCXXABI_INSTALL_INCLUDE_DIR=$dev/include/c++/v1

     

       524
       524
       +
             "

     

       525
       525
       +
             ninjaFlags="install-cxx-headers install-cxxabi-headers"

     

       526
       526
       +
             buildProject libcxx llvm-project/runtimes

     

       527
       527
       +
             unset ninjaFlags

     

       528
       528
       +
           ''}

     

       529
       529
       +
       

     

       472
       530
        
           # Some notes:

     

       473
       531
        
           # - The Swift build just needs Clang.

     

       474
       532
        
           # - We can further reduce targets to just our targetPlatform.

     
···

       485
       543
        
             }

     

       486
       544
        
           "

     

       487
       545
        
           buildProject llvm llvm-project/llvm

     

       546
       546
       +
       

     

       547
       547
       +
           # Ensure that the built Clang can find the runtime libraries by

     

       548
       548
       +
           # copying the symlinks from the main wrapper.

     

       549
       549
       +
           cp -P ${clang}/resource-root/{lib,share} $SWIFT_BUILD_ROOT/llvm/lib/clang/15.0.0/

     

       488
       550
        
       

     

       489
       551
        
         ''

     

       490
       552
        
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

     
···

       658
       720
        
           mv llvm/bin/clang-15{-unwrapped,}

     

       659
       721
        
           mv swift/bin/swift-frontend{-unwrapped,}

     

       660
       722
        
       

     

       661
       661
       -
           mkdir $out $lib

     

       723
       723
       +
           mkdir $lib

     

       662
       724
        
       

     

       663
       725
        
           # Install clang binaries only. We hide these with the wrapper, so they are

     

       664
       726
        
           # for private use by Swift only.

     
···

       693
       755
        
           ln -s $lib/lib/swift $out/lib/swift

     

       694
       756
        
       

     

       695
       757
        
           # Swift has a separate resource root from Clang, but locates the Clang

     

       696
       696
       -
           # resource root via subdir or symlink. Provide a default here, but we also

     

       697
       697
       -
           # patch Swift to prefer NIX_CC if set.

     

       698
       698
       -
           #

     

       699
       699
       -
           # NOTE: We don't symlink directly here, because that'd add a run-time dep

     

       700
       700
       -
           # on the full Clang compiler to every Swift executable. The copy here is

     

       701
       701
       -
           # just copying the 3 symlinks inside to smaller closures.

     

       702
       702
       -
           mkdir $lib/lib/swift/clang

     

       703
       703
       -
           cp -P ${clang}/resource-root/* $lib/lib/swift/clang/

     

       758
       758
       +
           # resource root via subdir or symlink.

     

       759
       759
       +
           mv $SWIFT_BUILD_ROOT/llvm/lib/clang/15.0.0 $lib/lib/swift/clang

     

       704
       760
        
         '';

     

       705
       761
        
       

     

       706
       762
        
         preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''

     
···

       755
       811
        
             swiftStaticModuleSubdir

     

       756
       812
        
             swiftStaticLibSubdir

     

       757
       813
        
             ;

     

       814
       814
       +
       

     

       815
       815
       +
           tests = {

     

       816
       816
       +
             cxx-interop-test = callPackage ../cxx-interop-test { };

     

       817
       817
       +
           };

     

       758
       818
        
       

     

       759
       819
        
           # Internal attr for the wrapper.

     

       760
       820
        
           _wrapperParams = wrapperParams;

+28

pkgs/development/compilers/swift/compiler/patches/clang-purity.patch

···

       1
       1
       +
       From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       +
       Date: Thu, 18 May 2017 11:56:12 -0500

     

       4
       4
       +
       Subject: [PATCH] "purity" patch for 5.0

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        lib/Driver/ToolChains/Gnu.cpp | 7 -------

     

       8
       8
       +
        1 file changed, 7 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

     

       11
       11
       +
       index fe3c0191bb..c6a482bece 100644

     

       12
       12
       +
       --- a/lib/Driver/ToolChains/Gnu.cpp

     

       13
       13
       +
       +++ b/lib/Driver/ToolChains/Gnu.cpp

     

       14
       14
       +
       @@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

     

       15
       15
       +
          if (!IsStatic) {

     

       16
       16
       +
            if (Args.hasArg(options::OPT_rdynamic))

     

       17
       17
       +
              CmdArgs.push_back("-export-dynamic");

     

       18
       18
       +
       -

     

       19
       19
       +
       -    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {

     

       20
       20
       +
       -      CmdArgs.push_back("-dynamic-linker");

     

       21
       21
       +
       -      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

     

       22
       22
       +
       -                                           ToolChain.getDynamicLinker(Args)));

     

       23
       23
       +
       -    }

     

       24
       24
       +
          }

     

       25
       25
       +
        

     

       26
       26
       +
          CmdArgs.push_back("-o");

     

       27
       27
       +
       -- 

     

       28
       28
       +
       2.11.0

-63

pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch

···

       1
       1
       -
       On Darwin, the SDK is a directory of stubs, and libc++ lives separately. We

     

       2
       2
       -
       need to patch the CMake files in several places to make the build for C++

     

       3
       3
       -
       interop succeed. The required flags can be read from cc-wrapper support files.

     

       4
       4
       -
       

     

       5
       5
       -
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       6
       6
       -
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       7
       7
       -
       @@ -105,18 +105,11 @@ function(add_swift_compiler_modules_library name)

     

       8
       8
       -
              get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       9
       9
       -
              set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../bootstrapping0/lib/swift")

     

       10
       10
       -
            endif()

     

       11
       11
       -
       -    if(NOT EXISTS "${sdk_path}/usr/include/c++")

     

       12
       12
       -
       -      # Darwin SDKs in Xcode 12 or older do not include libc++, which prevents clang from finding libc++ when invoked

     

       13
       13
       -
       -      # from ClangImporter. This results in build errors. To workaround this, let's explicitly pass the path to libc++

     

       14
       14
       -
       -      # to clang.

     

       15
       15
       -
       -      message(WARNING "Building with an outdated Darwin SDK: libc++ missing from the ${SWIFT_HOST_VARIANT_SDK} SDK. Will use libc++ from the toolchain.")

     

       16
       16
       -
       -      get_filename_component(absolute_libcxx_path "${CMAKE_C_COMPILER}/../../include/c++/v1" REALPATH)

     

       17
       17
       -
       -      if (EXISTS "${absolute_libcxx_path}")

     

       18
       18
       -
       -        set(sdk_option ${sdk_option} "-Xcc" "-isystem" "-Xcc" "${absolute_libcxx_path}")

     

       19
       19
       -
       -      else()

     

       20
       20
       -
       -        message(ERROR "libc++ not found in the toolchain.")

     

       21
       21
       -
       -      endif()

     

       22
       22
       -
       -    endif()

     

       23
       23
       -
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       24
       24
       -
       +    separate_arguments(nix_libcxx_cxxflags)

     

       25
       25
       -
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       26
       26
       -
       +      set(sdk_option ${sdk_option} "-Xcc" "${nix_libcxx_cxxflag}")

     

       27
       27
       -
       +    endforeach()

     

       28
       28
       -
          elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

       29
       29
       -
            set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       30
       30
       -
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       31
       31
       -
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       32
       32
       -
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       33
       33
       -
       @@ -270,6 +270,18 @@ macro(configure_sdk_darwin

     

       34
       34
       -
          # Add this to the list of known SDKs.

     

       35
       35
       -
          list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")

     

       36
       36
       -
        

     

       37
       37
       -
       +  set(cxx_overlay_opt "")

     

       38
       38
       -
       +  if("${prefix}" STREQUAL "OSX")

     

       39
       39
       -
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       40
       40
       -
       +    separate_arguments(nix_libcxx_cxxflags)

     

       41
       41
       -
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       42
       42
       -
       +      set(cxx_overlay_opt ${cxx_overlay_opt} "-Xcc" "${nix_libcxx_cxxflag}")

     

       43
       43
       -
       +    endforeach()

     

       44
       44
       -
       +  endif()

     

       45
       45
       -
       +  set(SWIFT_SDK_${prefix}_CXX_OVERLAY_SWIFT_COMPILE_FLAGS

     

       46
       46
       -
       +      ${cxx_overlay_opt}

     

       47
       47
       -
       +    CACHE STRING "Extra flags for compiling the C++ overlay")

     

       48
       48
       -
       +

     

       49
       49
       -
          _report_sdk("${prefix}")

     

       50
       50
       -
        endmacro()

     

       51
       51
       -
        

     

       52
       52
       -
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       53
       53
       -
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       54
       54
       -
       @@ -145,6 +145,9 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB

     

       55
       55
       -
            SWIFT_COMPILE_FLAGS_LINUX

     

       56
       56
       -
            ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       57
       57
       -
        

     

       58
       58
       -
       +    SWIFT_COMPILE_FLAGS_OSX

     

       59
       59
       -
       +    ${SWIFT_SDK_OSX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       60
       60
       -
       +

     

       61
       61
       -
            LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

     

       62
       62
       -
            TARGET_SDKS ALL_APPLE_PLATFORMS LINUX

     

       63
       63
       -
            INSTALL_IN_COMPONENT compiler

+11 -15

pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch

···

       1
       1
       +
       diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp

     

       2
       2
       +
       index c0ee9217e8..bf7737d6fa 100644

     

       1
       3
        
       --- a/lib/Driver/ToolChains.cpp

     

       2
       4
        
       +++ b/lib/Driver/ToolChains.cpp

     

       3
       3
       -
       @@ -1475,7 +1475,17 @@ const char *ToolChain::getClangLinkerDriver(

     

       5
       5
       +
       @@ -1489,6 +1489,12 @@

     

       6
       6
       +
              LinkerDriver = Args.MakeArgString(tool.get());

     

       7
       7
       +
          }

     

       4
       8
        
        

     

       5
       5
       -
            // If there is a linker driver in the toolchain folder, use that instead.

     

       6
       6
       -
            if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {toolchainPath}))

     

       7
       7
       -
       -      LinkerDriver = Args.MakeArgString(tool.get());

     

       8
       8
       -
       +      return Args.MakeArgString(tool.get());

     

       9
       9
       -
       +  }

     

       10
       10
       -
       +

     

       11
       11
       -
       +  // For Nix, prefer linking using the wrapped system clang, instead of using

     

       9
       9
       +
       +  // For Nix, prefer linking using the wrapped Nixpkgs clang, instead of using

     

       12
       10
        
       +  // the unwrapped clang packaged with swift. The latter is unable to link, but

     

       13
       11
        
       +  // we still want to use it for other purposes (clang importer).

     

       14
       14
       -
       +  if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) {

     

       15
       15
       -
       +    llvm::SmallString<128> binDir(nixCC.getValue());

     

       16
       16
       -
       +    llvm::sys::path::append(binDir, "bin");

     

       17
       17
       -
       +    if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {binDir.str()}))

     

       18
       18
       -
       +      return Args.MakeArgString(tool.get());

     

       19
       19
       -
          }

     

       12
       12
       +
       +  if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {"@clang@/bin"}))

     

       13
       13
       +
       +    return Args.MakeArgString(tool.get());

     

       14
       14
       +
       +

     

       15
       15
       +
          return LinkerDriver;

     

       16
       16
       +
        }

     

       20
       17
        
        

     

       21
       21
       -
          return LinkerDriver;

-67

pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch

···

       1
       1
       -
       Swift normally looks for the Clang resource dir in a subdir/symlink of its own

     

       2
       2
       -
       resource dir. We provide a symlink to the Swift build-time Clang as a default

     

       3
       3
       -
       there, but we also here patch two checks to try locate it via NIX_CC.

     

       4
       4
       -
       

     

       5
       5
       -
       The first (ClangImporter.cpp) happens when Swift code imports C modules. The

     

       6
       6
       -
       second (ToolChains.cpp) happens when Swift is used to link the final product.

     

       7
       7
       -
       

     

       8
       8
       -
       --- a/lib/ClangImporter/ClangImporter.cpp

     

       9
       9
       -
       +++ b/lib/ClangImporter/ClangImporter.cpp

     

       10
       10
       -
       @@ -73,6 +73,7 @@

     

       11
       11
       -
        #include "llvm/Support/FileSystem.h"

     

       12
       12
       -
        #include "llvm/Support/Memory.h"

     

       13
       13
       -
        #include "llvm/Support/Path.h"

     

       14
       14
       -
       +#include "llvm/Support/Process.h"

     

       15
       15
       -
        #include "llvm/Support/VirtualFileSystem.h"

     

       16
       16
       -
        #include "llvm/Support/YAMLParser.h"

     

       17
       17
       -
        #include <algorithm>

     

       18
       18
       -
       @@ -786,6 +787,17 @@ importer::addCommonInvocationArguments(

     

       19
       19
       -
        

     

       20
       20
       -
          const std::string &overrideResourceDir = importerOpts.OverrideResourceDir;

     

       21
       21
       -
          if (overrideResourceDir.empty()) {

     

       22
       22
       -
       +    // Prefer the Clang resource directory from NIX_CC, to allow swapping in a

     

       23
       23
       -
       +    // different stdenv.

     

       24
       24
       -
       +    // TODO: Figure out how to provide a user override for this. Probably a

     

       25
       25
       -
       +    // niche use case, though, and for now a user can unset NIX_CC to work

     

       26
       26
       -
       +    // around it if necessary.

     

       27
       27
       -
       +    if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) {

     

       28
       28
       -
       +      llvm::SmallString<128> resourceDir(nixCC.getValue());

     

       29
       29
       -
       +      llvm::sys::path::append(resourceDir, "resource-root");

     

       30
       30
       -
       +      invocationArgStrs.push_back("-resource-dir");

     

       31
       31
       -
       +      invocationArgStrs.push_back(std::string(resourceDir.str()));

     

       32
       32
       -
       +    } else {

     

       33
       33
       -
            llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath);

     

       34
       34
       -
        

     

       35
       35
       -
            // Adjust the path to refer to our copy of the Clang resource directory

     

       36
       36
       -
       @@ -801,6 +813,7 @@ importer::addCommonInvocationArguments(

     

       37
       37
       -
            // Set the Clang resource directory to the path we computed.

     

       38
       38
       -
            invocationArgStrs.push_back("-resource-dir");

     

       39
       39
       -
            invocationArgStrs.push_back(std::string(resourceDir.str()));

     

       40
       40
       -
       +    } // nixCC

     

       41
       41
       -
          } else {

     

       42
       42
       -
            invocationArgStrs.push_back("-resource-dir");

     

       43
       43
       -
            invocationArgStrs.push_back(overrideResourceDir);

     

       44
       44
       -
       --- a/lib/Driver/ToolChains.cpp

     

       45
       45
       -
       +++ b/lib/Driver/ToolChains.cpp

     

       46
       46
       -
       @@ -1393,10 +1393,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args,

     

       47
       47
       -
                                            SmallString<128> &LibPath) const {

     

       48
       48
       -
          const llvm::Triple &T = getTriple();

     

       49
       49
       -
        

     

       50
       50
       -
       +  // Nix: We provide a `clang` symlink in the default Swift resource root, but

     

       51
       51
       -
       +  // prefer detecting the Clang resource root via NIX_CC, to allow swapping in

     

       52
       52
       -
       +  // a different stdenv. However, always honor a user-provided `-resource-dir`.

     

       53
       53
       -
       +  auto nixCC = llvm::sys::Process::GetEnv("NIX_CC");

     

       54
       54
       -
       +  if (nixCC && !Args.hasArgNoClaim(options::OPT_resource_dir)) {

     

       55
       55
       -
       +    LibPath.assign(nixCC.getValue());

     

       56
       56
       -
       +    llvm::sys::path::append(LibPath, "resource-root");

     

       57
       57
       -
       +  } else {

     

       58
       58
       -
          getResourceDirPath(LibPath, Args, /*Shared=*/true);

     

       59
       59
       -
          // Remove platform name.

     

       60
       60
       -
          llvm::sys::path::remove_filename(LibPath);

     

       61
       61
       -
       -  llvm::sys::path::append(LibPath, "clang", "lib",

     

       62
       62
       -
       +  llvm::sys::path::append(LibPath, "clang");

     

       63
       63
       -
       +  } // nixCC

     

       64
       64
       -
       +  llvm::sys::path::append(LibPath, "lib",

     

       65
       65
       -
                                  T.isOSDarwin() ? "darwin"

     

       66
       66
       -
                                                 : getPlatformNameForTriple(T));

     

       67
       67
       -
        }

+57

pkgs/development/compilers/swift/cxx-interop-test/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         swift,

     

       5
       5
       +
         swiftpm,

     

       6
       6
       +
         swiftPackages,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       swiftPackages.stdenv.mkDerivation (finalAttrs: {

     

       10
       10
       +
         name = "swift-cxx-interop-test";

     

       11
       11
       +
       

     

       12
       12
       +
         src = ./src;

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           swift

     

       16
       16
       +
           swiftpm

     

       17
       17
       +
         ];

     

       18
       18
       +
       

     

       19
       19
       +
         installPhase = ''

     

       20
       20
       +
           runHook preInstall

     

       21
       21
       +
       

     

       22
       22
       +
           binPath="$(swiftpmBinPath)"

     

       23
       23
       +
           mkdir -p -- "$out/bin"

     

       24
       24
       +
           cp -- "$binPath/${finalAttrs.meta.mainProgram}" "$out/bin"

     

       25
       25
       +
       

     

       26
       26
       +
           runHook postInstall

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         installCheckPhase = ''

     

       30
       30
       +
           runHook preInstallCheck

     

       31
       31
       +
       

     

       32
       32
       +
           "$out/bin/${finalAttrs.meta.mainProgram}" | grep 'Hello, world!'

     

       33
       33
       +
       

     

       34
       34
       +
           runHook postInstallCheck

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         doInstallCheck = true;

     

       38
       38
       +
       

     

       39
       39
       +
         env = {

     

       40
       40
       +
           # Gross hack copied from `protoc-gen-swift` :(

     

       41
       41
       +
           LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux (

     

       42
       42
       +
             lib.makeLibraryPath [

     

       43
       43
       +
               swiftPackages.Dispatch

     

       44
       44
       +
             ]

     

       45
       45
       +
           );

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         meta = {

     

       49
       49
       +
           inherit (swift.meta)

     

       50
       50
       +
             team

     

       51
       51
       +
             platforms

     

       52
       52
       +
             badPlatforms

     

       53
       53
       +
             ;

     

       54
       54
       +
           license = lib.licenses.mit;

     

       55
       55
       +
           mainProgram = "CxxInteropTest";

     

       56
       56
       +
         };

     

       57
       57
       +
       })

pkgs/development/compilers/swift/cxx-interop-test/src/.gitignore

···

       1
       1
       +
       .DS_Store

     

       2
       2
       +
       /.build

     

       3
       3
       +
       /Packages

     

       4
       4
       +
       /*.xcodeproj

     

       5
       5
       +
       xcuserdata/

     

       6
       6
       +
       DerivedData/

     

       7
       7
       +
       .swiftpm/config/registries.json

     

       8
       8
       +
       .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

     

       9
       9
       +
       .netrc

+16

pkgs/development/compilers/swift/cxx-interop-test/src/Package.swift

···

       1
       1
       +
       // swift-tools-version: 5.8

     

       2
       2
       +
       

     

       3
       3
       +
       import PackageDescription

     

       4
       4
       +
       

     

       5
       5
       +
       let package = Package(

     

       6
       6
       +
           name: "CxxInteropTest",

     

       7
       7
       +
           targets: [

     

       8
       8
       +
               .executableTarget(

     

       9
       9
       +
                   name: "CxxInteropTest",

     

       10
       10
       +
                   path: "Sources",

     

       11
       11
       +
                   swiftSettings: [

     

       12
       12
       +
                       .unsafeFlags(["-enable-experimental-cxx-interop"])

     

       13
       13
       +
                   ]

     

       14
       14
       +
               )

     

       15
       15
       +
           ]

     

       16
       16
       +
       )

pkgs/development/compilers/swift/cxx-interop-test/src/Sources/main.swift

···

       1
       1
       +
       import CxxStdlib

     

       2
       2
       +
       

     

       3
       3
       +
       print(String(cxxString: std.string("Hello, world!")))

+24 -33

pkgs/development/compilers/swift/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         pkgs,

     

       4
       3
        
         newScope,

     

       5
       5
       -
         darwin,

     

       4
       4
       +
         stdenv,

     

       6
       5
        
         llvmPackages,

     

       7
       7
       -
         llvmPackages_15,

     

       8
       8
       -
         overrideCC,

     

       9
       9
       -
         overrideLibcxx,

     

       6
       6
       +
         darwin,

     

       10
       7
        
       }:

     

       11
       8
        
       

     

       12
       9
        
       let

     

       13
       13
       -
         swiftLlvmPackages = llvmPackages_15;

     

       14
       14
       -
       

     

       15
       10
        
         self = rec {

     

       16
       11
        
       

     

       17
       12
        
           callPackage = newScope self;

     

       18
       13
        
       

     

       19
       19
       -
           # Swift builds its own Clang for internal use. We wrap that clang with a

     

       20
       20
       -
           # cc-wrapper derived from the clang configured below. Because cc-wrapper

     

       21
       21
       -
           # applies a specific resource-root, the two versions are best matched, or

     

       22
       22
       -
           # we'll often run into compilation errors.

     

       23
       23
       -
           #

     

       24
       24
       -
           # The following selects the correct Clang version, matching the version

     

       25
       25
       -
           # used in Swift.

     

       26
       26
       -
           inherit (swiftLlvmPackages) clang;

     

       27
       27
       -
       

     

       28
       28
       -
           # Overrides that create a useful environment for swift packages, allowing

     

       29
       29
       -
           # packaging with `swiftPackages.callPackage`.

     

       30
       30
       -
           inherit (clang) bintools;

     

       31
       31
       -
           stdenv =

     

       32
       32
       -
             let

     

       33
       33
       -
               stdenv' = overrideCC pkgs.stdenv clang;

     

       34
       34
       -
             in

     

       35
       35
       -
             # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the

     

       36
       36
       -
             # default clang’s stdenv. Using the default libc++ avoids issues (such as crashes)

     

       37
       37
       -
             # that can happen when a Swift application dynamically links different versions

     

       38
       38
       -
             # of libc++ and libc++abi than libraries it links are using.

     

       39
       39
       -
             if stdenv'.cc.libcxx != null then overrideLibcxx stdenv' else stdenv';

     

       14
       14
       +
           # Provided for backwards compatibility.

     

       15
       15
       +
           inherit stdenv;

     

       40
       16
        
       

     

       41
       17
        
           swift-unwrapped = callPackage ./compiler {

     

       18
       18
       +
             inherit (llvmPackages) stdenv;

     

       42
       19
        
             inherit (darwin) DarwinTools sigtool;

     

       43
       20
        
           };

     

       44
       21
        
       

     
···

       51
       28
        
             if stdenv.hostPlatform.isDarwin then

     

       52
       29
        
               null # part of apple-sdk

     

       53
       30
        
             else

     

       54
       54
       -
               callPackage ./libdispatch { swift = swiftNoSwiftDriver; };

     

       31
       31
       +
               callPackage ./libdispatch {

     

       32
       32
       +
                 inherit (llvmPackages) stdenv;

     

       33
       33
       +
                 swift = swiftNoSwiftDriver;

     

       34
       34
       +
               };

     

       55
       35
        
       

     

       56
       36
        
           Foundation =

     

       57
       37
        
             if stdenv.hostPlatform.isDarwin then

     

       58
       38
        
               null # part of apple-sdk

     

       59
       39
        
             else

     

       60
       60
       -
               callPackage ./foundation { swift = swiftNoSwiftDriver; };

     

       40
       40
       +
               callPackage ./foundation {

     

       41
       41
       +
                 inherit (llvmPackages) stdenv;

     

       42
       42
       +
                 swift = swiftNoSwiftDriver;

     

       43
       43
       +
               };

     

       61
       44
        
       

     

       62
       45
        
           # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of

     

       63
       46
        
           # CLTools (or SUS), so would have to figure out how to fetch it. The binary

     
···

       68
       51
        
           };

     

       69
       52
        
       

     

       70
       53
        
           swiftpm = callPackage ./swiftpm {

     

       54
       54
       +
             inherit (llvmPackages) stdenv;

     

       71
       55
        
             inherit (darwin) DarwinTools;

     

       72
       56
        
             swift = swiftNoSwiftDriver;

     

       73
       57
        
           };

     

       74
       58
        
       

     

       75
       59
        
           swift-driver = callPackage ./swift-driver {

     

       60
       60
       +
             inherit (llvmPackages) stdenv;

     

       76
       61
        
             swift = swiftNoSwiftDriver;

     

       77
       62
        
           };

     

       78
       63
        
       

     
···

       80
       65
        
             swift = swift-unwrapped;

     

       81
       66
        
           };

     

       82
       67
        
       

     

       83
       83
       -
           sourcekit-lsp = callPackage ./sourcekit-lsp { };

     

       68
       68
       +
           sourcekit-lsp = callPackage ./sourcekit-lsp {

     

       69
       69
       +
             inherit (llvmPackages) stdenv;

     

       70
       70
       +
           };

     

       84
       71
        
       

     

       85
       85
       -
           swift-docc = callPackage ./swift-docc { };

     

       72
       72
       +
           swift-docc = callPackage ./swift-docc {

     

       73
       73
       +
             inherit (llvmPackages) stdenv;

     

       74
       74
       +
           };

     

       86
       75
        
       

     

       87
       87
       -
           swift-format = callPackage ./swift-format { };

     

       76
       76
       +
           swift-format = callPackage ./swift-format {

     

       77
       77
       +
             inherit (llvmPackages) stdenv;

     

       78
       78
       +
           };

     

       88
       79
        
       

     

       89
       80
        
           swiftpm2nix = callPackage ./swiftpm2nix { };

     

       90
       81

+10

pkgs/development/compilers/swift/foundation/default.nix

···

       28
       28
        
             url = "https://github.com/apple/swift-corelibs-foundation/commit/47260803a108c6e0d639adcebeed3ac6a76e8bcd.patch";

     

       29
       29
        
             hash = "sha256-1JUSQW86IHKkBZqxvpk0P8zcSKntzOTNlMoGBfgeT4c=";

     

       30
       30
        
           })

     

       31
       31
       +
       

     

       32
       32
       +
           # Fix the build with modern Clang.

     

       33
       33
       +
           (fetchpatch {

     

       34
       34
       +
             url = "https://github.com/swiftlang/swift-corelibs-foundation/commit/76058114e5f5b47e02dd4441a6389858bb599bd6.patch";

     

       35
       35
       +
             hash = "sha256-N/hdTGCWMz092xh3AI28v3b+zjQHRmsb1F/2Q2u/jik=";

     

       36
       36
       +
           })

     

       37
       37
       +
           (fetchpatch {

     

       38
       38
       +
             url = "https://github.com/swiftlang/swift-corelibs-foundation/commit/5f3e896e522ff364780e6330df867e20e26269b4.patch";

     

       39
       39
       +
             hash = "sha256-AaBWSysNpZ7NV10RGD4TehZqE0k8Sn+TlhlGw1PiRdI=";

     

       40
       40
       +
           })

     

       31
       41
        
         ];

     

       32
       42
        
       

     

       33
       43
        
         outputs = [

+10 -1

pkgs/development/compilers/swift/libdispatch/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         cmake,

     

       6
       7
        
         ninja,

     

       7
       8
        
         useSwift ? true,

     
···

       31
       32
        
           swift

     

       32
       33
        
         ];

     

       33
       34
        
       

     

       34
       34
       -
         patches = [ ./disable-swift-overlay.patch ];

     

       35
       35
       +
         patches = [

     

       36
       36
       +
           # Fix the build with modern Clang.

     

       37
       37
       +
           (fetchpatch {

     

       38
       38
       +
             url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/30bb8019ba79cdae0eb1dc0c967c17996dd5cc0a.patch";

     

       39
       39
       +
             hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";

     

       40
       40
       +
           })

     

       41
       41
       +
       

     

       42
       42
       +
           ./disable-swift-overlay.patch

     

       43
       43
       +
         ];

     

       35
       44
        
       

     

       36
       45
        
         cmakeFlags = lib.optional useSwift "-DENABLE_SWIFT=ON";

     

       37
       46

pkgs/development/compilers/swift/sourcekit-lsp/default.nix

···

       43
       43
        
         configurePhase = generated.configure + ''

     

       44
       44
        
           swiftpmMakeMutable indexstore-db

     

       45
       45
        
           patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch}

     

       46
       46
       +
           patch -p1 -d .build/checkouts/indexstore-db -i ${

     

       47
       47
       +
             # Fix the build with modern Clang.

     

       48
       48
       +
             fetchpatch {

     

       49
       49
       +
               url = "https://github.com/swiftlang/indexstore-db/commit/6120b53b1e8774ef4e2ad83438d4d94961331e72.patch";

     

       50
       50
       +
               hash = "sha256-tMAfTIa3RKiA/jDtP02mHcpPaF2s9a+3q/PLJxqn30M=";

     

       51
       51
       +
             }

     

       52
       52
       +
           }

     

       46
       53
        
       

     

       47
       54
        
           swiftpmMakeMutable swift-tools-support-core

     

       48
       55
        
           patch -p1 -d .build/checkouts/swift-tools-support-core -i ${

+10 -1

pkgs/development/compilers/swift/swift-docc/default.nix

···

       30
       30
        
           XCTest

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       -
         configurePhase = generated.configure;

     

       33
       33
       +
         configurePhase =

     

       34
       34
       +
           generated.configure

     

       35
       35
       +
           # Fix the build with modern Clang.

     

       36
       36
       +
           #

     

       37
       37
       +
           # Based on the upstream fix for Musl:

     

       38
       38
       +
           # <https://github.com/apple/swift-nio/commit/fc6e3c0eefb28adf641531180b81aaf41b02ed20>

     

       39
       39
       +
           + ''

     

       40
       40
       +
             swiftpmMakeMutable swift-nio

     

       41
       41
       +
             patch -p1 -d .build/checkouts/swift-nio -i ${./fix-swift-nio.patch}

     

       42
       42
       +
           '';

     

       34
       43
        
       

     

       35
       44
        
         # We only install the docc binary, so don't need the other products.

     

       36
       45
        
         # This works around a failure building generate-symbol-graph:

+13

pkgs/development/compilers/swift/swift-docc/fix-swift-nio.patch

···

       1
       1
       +
       diff --git a/Package.swift b/Package.swift

     

       2
       2
       +
       index 39c6fb4b2f..02c08b898d 100644

     

       3
       3
       +
       --- a/Package.swift

     

       4
       4
       +
       +++ b/Package.swift

     

       5
       5
       +
       @@ -26,7 +26,7 @@

     

       6
       6
       +
            .target(name: "NIOFoundationCompat", dependencies: ["NIO"]),

     

       7
       7
       +
            .target(name: "CNIOAtomics", dependencies: []),

     

       8
       8
       +
            .target(name: "CNIOSHA1", dependencies: []),

     

       9
       9
       +
       -    .target(name: "CNIOLinux", dependencies: []),

     

       10
       10
       +
       +    .target(name: "CNIOLinux", dependencies: [], cSettings: [.define("_GNU_SOURCE")]),

     

       11
       11
       +
            .target(name: "CNIODarwin", dependencies: [], cSettings: [.define("__APPLE_USE_RFC_3542")]),

     

       12
       12
       +
            .target(name: "CNIOWindows", dependencies: []),

     

       13
       13
       +
            .target(name: "NIOConcurrencyHelpers",

+4 -2

pkgs/development/compilers/swift/swift-driver/default.nix

···

       10
       10
        
         XCTest,

     

       11
       11
        
         sqlite,

     

       12
       12
        
         ncurses,

     

       13
       13
       +
         clang,

     

       13
       14
        
         replaceVars,

     

       14
       15
        
       }:

     

       15
       16
        
       let

     
···

       40
       41
        
         ];

     

       41
       42
        
       

     

       42
       43
        
         patches = [

     

       43
       43
       -
           ./patches/nix-resource-root.patch

     

       44
       44
        
           ./patches/disable-catalyst.patch

     

       45
       45
       -
           ./patches/linux-fix-linking.patch

     

       45
       45
       +
           (replaceVars ./patches/linux-fix-linking.patch {

     

       46
       46
       +
             inherit clang;

     

       47
       47
       +
           })

     

       46
       48
        
           # TODO: Replace with branch patch once merged:

     

       47
       49
        
           # https://github.com/apple/swift-driver/pull/1197

     

       48
       50
        
           (fetchpatch {

+7 -7

pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch

···

       1
       1
       +
       diff --git a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       2
       2
       +
       index a4a735f498..381522cc1f 100644

     

       1
       3
        
       --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       2
       4
        
       +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       3
       5
        
       @@ -10,6 +10,7 @@

     
···

       8
       10
        
        import SwiftOptions

     

       9
       11
        
        

     

       10
       12
        
        import func TSCBasic.lookupExecutablePath

     

       11
       11
       -
       @@ -120,7 +121,20 @@ extension GenericUnixToolchain {

     

       13
       13
       +
       @@ -120,7 +121,18 @@

     

       12
       14
        
              // just using `clang` and avoid a dependency on the C++ runtime.

     

       13
       15
        
              let clangTool: Tool =

     

       14
       16
        
                parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang

     

       15
       17
        
       -      var clangPath = try getToolPath(clangTool)

     

       16
       18
        
       +

     

       17
       17
       -
       +      // For Nix, prefer linking using the wrapped system clang, instead of using

     

       19
       19
       +
       +      // For Nix, prefer linking using the wrapped Nixpkgs clang, instead of using

     

       18
       20
        
       +      // the unwrapped clang packaged with swift. The latter is unable to link, but

     

       19
       21
        
       +      // we still want to use it for other purposes (clang importer).

     

       20
       22
        
       +      var clangPath: AbsolutePath

     

       21
       21
       -
       +      let env = ProcessInfo.processInfo.environment

     

       22
       22
       -
       +      if let nixCC = env["NIX_CC"],

     

       23
       23
       -
       +         let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"),

     

       23
       23
       +
       +      if let binPath = try? AbsolutePath(validating: "@clang@/bin"),

     

       24
       24
        
       +         let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop)

     

       25
       25
        
       +                                                        ? "clang++" : "clang",

     

       26
       26
        
       +                                         searchPaths: [binPath]) {

     
···

       30
       30
        
              if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) {

     

       31
       31
        
                // FIXME: What if this isn't an absolute path?

     

       32
       32
        
                let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle)

     

       33
       33
       -
       @@ -136,6 +150,7 @@ extension GenericUnixToolchain {

     

       33
       33
       +
       @@ -136,6 +148,7 @@

     

       34
       34
        
                commandLine.appendFlag("-B")

     

       35
       35
        
                commandLine.appendPath(toolsDir)

     

       36
       36
        
              }

     

       37
       37
       -
       +      } // nixCC

     

       37
       37
       +
       +      } // Nix

     

       38
       38
        
        

     

       39
       39
        
              // Executables on Linux get -pie

     

       40
       40
        
              if targetTriple.os == .linux && linkerOutputType == .executable {

-28

pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch

···

       1
       1
       -
       Swift normally looks for the Clang resource dir in a subdir/symlink of its own

     

       2
       2
       -
       resource dir. We provide a symlink to the Swift build-time Clang as a default

     

       3
       3
       -
       there, but we also here patch a check to try locate it via NIX_CC.

     

       4
       4
       -
       

     

       5
       5
       -
       --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       6
       6
       -
       +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       7
       7
       -
       @@ -10,6 +10,7 @@

     

       8
       8
       -
        //

     

       9
       9
       -
        //===----------------------------------------------------------------------===//

     

       10
       10
       -
        

     

       11
       11
       -
       +import Foundation

     

       12
       12
       -
        import SwiftOptions

     

       13
       13
       -
        

     

       14
       14
       -
        import protocol TSCBasic.FileSystem

     

       15
       15
       -
       @@ -26,6 +27,13 @@ extension Toolchain {

     

       16
       16
       -
            for targetInfo: FrontendTargetInfo,

     

       17
       17
       -
            parsedOptions: inout ParsedOptions

     

       18
       18
       -
          ) throws -> VirtualPath {

     

       19
       19
       -
       +    let env = ProcessInfo.processInfo.environment

     

       20
       20
       -
       +    if let nixCC = env["NIX_CC"] {

     

       21
       21
       -
       +      return try VirtualPath(path: nixCC)

     

       22
       22
       -
       +        .appending(components: "resource-root", "lib",

     

       23
       23
       -
       +                   targetInfo.target.triple.platformName(conflatingDarwin: true)!)

     

       24
       24
       -
       +    }

     

       25
       25
       -
       +

     

       26
       26
       -
            return VirtualPath.lookup(targetInfo.runtimeResourcePath.path)

     

       27
       27
       -
              .appending(components: "clang", "lib",

     

       28
       28
       -
                         targetInfo.target.triple.platformName(conflatingDarwin: true)!)

+21

pkgs/development/compilers/swift/wrapper/default.nix

···

       4
       4
        
         swift,

     

       5
       5
        
         useSwiftDriver ? true,

     

       6
       6
        
         swift-driver,

     

       7
       7
       +
         clang,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       stdenv.mkDerivation (

     
···

       28
       29
        
             swiftStaticLibSubdir

     

       29
       30
        
             ;

     

       30
       31
        
           swiftDriver = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver";

     

       32
       32
       +
           cc_wrapper = clang.override (prev: {

     

       33
       33
       +
             extraBuildCommands =

     

       34
       34
       +
               prev.extraBuildCommands

     

       35
       35
       +
               # We need to use the resource directory corresponding to Swift’s

     

       36
       36
       +
               # version of Clang instead of passing along the one from the

     

       37
       37
       +
               # `cc-wrapper` flags.

     

       38
       38
       +
               + ''

     

       39
       39
       +
                 rm -r $out/resource-root

     

       40
       40
       +
                 substituteInPlace $out/nix-support/cc-cflags \

     

       41
       41
       +
                   --replace-fail \

     

       42
       42
       +
                     "-resource-dir=$out/resource-root" \

     

       43
       43
       +
                     "-resource-dir=${lib.getLib swift}/lib/swift/clang"

     

       44
       44
       +
               ''

     

       45
       45
       +
               # We need the libc++ headers corresponding to the LLVM version of

     

       46
       46
       +
               # Swift’s Clang.

     

       47
       47
       +
               + lib.optionalString (clang.libcxx != null) ''

     

       48
       48
       +
                 include -isystem "${lib.getDev swift}/include/c++/v1" > $out/nix-support/libcxx-cxxflags

     

       49
       49
       +
               '';

     

       50
       50
       +
           });

     

       31
       51
        
       

     

       32
       52
        
           env.darwinMinVersion = lib.optionalString stdenv.targetPlatform.isDarwin (

     

       33
       53
        
             stdenv.targetPlatform.darwinMinVersion

     
···

       79
       99
        
               swiftArch

     

       80
       100
        
               swiftModuleSubdir

     

       81
       101
        
               swiftLibSubdir

     

       102
       102
       +
               tests

     

       82
       103
        
               ;

     

       83
       104
        
           };

     

       84
       105
        
         }

+1 -1

pkgs/development/compilers/swift/wrapper/wrapper.sh

···

       8
       8
        
           set -x

     

       9
       9
        
       fi

     

       10
       10
        
       

     

       11
       11
       -
       cc_wrapper="${NIX_CC:-@default_cc_wrapper@}"

     

       11
       11
       +
       cc_wrapper="@cc_wrapper@"

     

       12
       12
        
       

     

       13
       13
        
       source $cc_wrapper/nix-support/utils.bash

     

       14
       14

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "aiohomematic";

     

       19
       19
       -
         version = "2025.8.6";

     

       19
       19
       +
         version = "2025.8.10";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "SukramJ";

     

       24
       24
        
           repo = "aiohomematic";

     

       25
       25
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-HmcBl+uFjEeyZdilqqTxQ8wrFbDr/8tsh/l0yoVfYJg=";

     

       26
       26
       +
           hash = "sha256-ii+fvjn54IT376YzwljPz2tkx2bv8jojI4rNracCgwA=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         postPatch = ''

+2 -2

pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix

···

       9
       9
        
       buildHomeAssistantComponent rec {

     

       10
       10
        
         owner = "SukramJ";

     

       11
       11
        
         domain = "homematicip_local";

     

       12
       12
       -
         version = "1.85.2";

     

       12
       12
       +
         version = "1.86.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "SukramJ";

     

       16
       16
        
           repo = "custom_homematic";

     

       17
       17
        
           tag = version;

     

       18
       18
       -
           hash = "sha256-uhSpWD7L1T345PjfAgywdscbHKVLKlzUVCG88HaKAac=";

     

       18
       18
       +
           hash = "sha256-QGQVSx6yPfT178GAPPbfiOMuEJ6aPFc0SUp5vO9AYUQ=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+1 -3

pkgs/test/default.nix

···

       154
       154
        
       

     

       155
       155
        
         go = recurseIntoAttrs (callPackage ../build-support/go/tests.nix { });

     

       156
       156
        
       

     

       157
       157
       -
         pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // {

     

       158
       158
       -
           __recurseIntoDerivationForReleaseJobs = true;

     

       159
       159
       -
         };

     

       157
       157
       +
         pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { });

     

       160
       158
        
       

     

       161
       159
        
         buildRustCrate = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });

     

       162
       160
        
         importCargoLock = recurseIntoAttrs (callPackage ../build-support/rust/test/import-cargo-lock { });

+2 -2

pkgs/tools/package-management/nix/default.nix

···

       131
       131
        
         (

     

       132
       132
        
           {

     

       133
       133
        
             nix_2_28 = commonMeson {

     

       134
       134
       -
               version = "2.28.4";

     

       135
       135
       -
               hash = "sha256-V1tPrBkPteqF8VWUgpotNFYJ2Xm6WmB3aMPexuEHl9I=";

     

       134
       134
       +
               version = "2.28.5";

     

       135
       135
       +
               hash = "sha256-oIfAHxO+BCtHXJXLHBnsKkGl1Pw+Uuq1PwNxl+lZ+Oc=";

     

       136
       136
        
               self_attribute_name = "nix_2_28";

     

       137
       137
        
             };

     

       138
       138

+1 -1

pkgs/tools/virtualization/mkosi/default.nix

···

       58
       58
        
       in

     

       59
       59
        
       python3Packages.buildPythonApplication rec {

     

       60
       60
        
         pname = "mkosi";

     

       61
       61
       -
         version = "25.3-unstable-2025-04-01";

     

       61
       61
       +
         version = "25.3";

     

       62
       62
        
         format = "pyproject";

     

       63
       63
        
       

     

       64
       64
        
         outputs = [

+15 -20

pkgs/top-level/all-packages.nix

···

       4723
       4723
        
           crystal_1_11

     

       4724
       4724
        
           crystal_1_14

     

       4725
       4725
        
           crystal_1_15

     

       4726
       4726
       +
           crystal_1_16

     

       4727
       4727
       +
           crystal_1_17

     

       4726
       4728
        
           crystal

     

       4727
       4729
        
           ;

     

       4728
       4730
        
       

     
···

       5156
       5158
        
                 haskell.packages.ghc96

     

       5157
       5159
        
               else

     

       5158
       5160
        
                 haskell.packages.ghc98

     

       5159
       5159
       -
             )

     

       5160
       5160
       -
           // {

     

       5161
       5161
       -
             __recurseIntoDerivationForReleaseJobs = true;

     

       5162
       5162
       -
           };

     

       5161
       5161
       +
             );

     

       5163
       5162
        
       

     

       5164
       5163
        
         # haskellPackages.ghc is build->host (it exposes the compiler used to build the

     

       5165
       5164
        
         # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more

     
···

       8802
       8801
        
           }

     

       8803
       8802
        
         );

     

       8804
       8803
        
       

     

       8805
       8805
       -
         libsForQt5 =

     

       8806
       8806
       -
           (recurseIntoAttrs (

     

       8807
       8807
       -
             import ./qt5-packages.nix {

     

       8808
       8808
       -
               inherit

     

       8809
       8809
       -
                 lib

     

       8810
       8810
       -
                 config

     

       8811
       8811
       -
                 __splicedPackages

     

       8812
       8812
       -
                 makeScopeWithSplicing'

     

       8813
       8813
       -
                 generateSplicesForMkScope

     

       8814
       8814
       -
                 pkgsHostTarget

     

       8815
       8815
       -
                 ;

     

       8816
       8816
       -
             }

     

       8817
       8817
       -
           ))

     

       8818
       8818
       -
           // {

     

       8819
       8819
       -
             __recurseIntoDerivationForReleaseJobs = true;

     

       8820
       8820
       -
           };

     

       8804
       8804
       +
         libsForQt5 = recurseIntoAttrs (

     

       8805
       8805
       +
           import ./qt5-packages.nix {

     

       8806
       8806
       +
             inherit

     

       8807
       8807
       +
               lib

     

       8808
       8808
       +
               config

     

       8809
       8809
       +
               __splicedPackages

     

       8810
       8810
       +
               makeScopeWithSplicing'

     

       8811
       8811
       +
               generateSplicesForMkScope

     

       8812
       8812
       +
               pkgsHostTarget

     

       8813
       8813
       +
               ;

     

       8814
       8814
       +
           }

     

       8815
       8815
       +
         );

     

       8821
       8816
        
       

     

       8822
       8817
        
         # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop

     

       8823
       8818
        
         plasma5Packages = libsForQt5;

-1

pkgs/top-level/linux-kernels.nix

···

       781
       781
        
             linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);

     

       782
       782
        
       

     

       783
       783
        
             linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);

     

       784
       784
       -
             __recurseIntoDerivationForReleaseJobs = true;

     

       785
       784
        
           }

     

       786
       785
        
           // lib.optionalAttrs config.allowAliases {

     

       787
       786

+1 -3

pkgs/top-level/pkg-config/tests.nix

···

       22
       22
        
         };

     

       23
       23
        
       in

     

       24
       24
        
       lib.recurseIntoAttrs {

     

       25
       25
       -
         defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { } // {

     

       26
       26
       -
           __recurseIntoDerivationForReleaseJobs = true;

     

       27
       27
       -
         };

     

       25
       25
       +
         defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { };

     

       28
       26
        
       }

-114

pkgs/top-level/release-attrpaths-superset.nix

···

       1
       1
       -
       # This expression will, as efficiently as possible, dump a

     

       2
       2
       -
       # *superset* of all attrpaths of derivations which might be

     

       3
       3
       -
       # part of a release on *any* platform.

     

       4
       4
       -
       #

     

       5
       5
       -
       # Both this expression and what ofborg uses (release-outpaths.nix)

     

       6
       6
       -
       # are essentially single-threaded (under the current cppnix

     

       7
       7
       -
       # implementation).

     

       8
       8
       -
       #

     

       9
       9
       -
       # This expression runs much, much, much faster and uses much, much

     

       10
       10
       -
       # less memory than the ofborg script by skipping the

     

       11
       11
       -
       # platform-relevance checks.  The ofborg outpaths.nix script takes

     

       12
       12
       -
       # half an hour on a 3ghz core and peaks at 60gbytes of memory; this

     

       13
       13
       -
       # expression runs on the same machine in 44 seconds with peak memory

     

       14
       14
       -
       # usage of 5gbytes.

     

       15
       15
       -
       #

     

       16
       16
       -
       # Once you have the list of attrnames you can split it up into

     

       17
       17
       -
       # $NUM_CORES batches and run the platform checks separately for each

     

       18
       18
       -
       # batch, in parallel.

     

       19
       19
       -
       #

     

       20
       20
       -
       # To dump the attrnames:

     

       21
       21
       -
       #

     

       22
       22
       -
       #   nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names

     

       23
       23
       -
       #

     

       24
       24
       -
       {

     

       25
       25
       -
         lib ? import (path + "/lib"),

     

       26
       26
       -
         trace ? false,

     

       27
       27
       -
         checkMeta ? true,

     

       28
       28
       -
         path ? ./../..,

     

       29
       29
       -
       }:

     

       30
       30
       -
       let

     

       31
       31
       -
       

     

       32
       32
       -
         # The intended semantics are that an attrpath rooted at pkgs is

     

       33
       33
       -
         # part of the (unfiltered) release jobset iff both of the following

     

       34
       34
       -
         # are true:

     

       35
       35
       -
         #

     

       36
       36
       -
         # 1. The attrpath leads to a value for which lib.isDerivation is true

     

       37
       37
       -
         #

     

       38
       38
       -
         # 2. Any proper prefix of the attrpath at which lib.isDerivation

     

       39
       39
       -
         #    is true also has __recurseIntoDerivationForReleaseJobs=true.

     

       40
       40
       -
         #

     

       41
       41
       -
         # The second condition is unfortunately necessary because there are

     

       42
       42
       -
         # Hydra release jobnames which have proper prefixes which are

     

       43
       43
       -
         # attrnames of derivations (!).  We should probably restructure

     

       44
       44
       -
         # the job tree so that this is not the case.

     

       45
       45
       -
         #

     

       46
       46
       -
         justAttrNames =

     

       47
       47
       -
           path: value:

     

       48
       48
       -
           let

     

       49
       49
       -
             result =

     

       50
       50
       -
               if path == [ "AAAAAASomeThingsFailToEvaluate" ] then

     

       51
       51
       -
                 [ ]

     

       52
       52
       -
               else if

     

       53
       53
       -
                 lib.isDerivation value

     

       54
       54
       -
                 &&

     

       55
       55
       -
                   # in some places we have *derivations* with jobsets as subattributes, ugh

     

       56
       56
       -
                   !(value.__recurseIntoDerivationForReleaseJobs or false)

     

       57
       57
       -
               then

     

       58
       58
       -
                 [ path ]

     

       59
       59
       -
       

     

       60
       60
       -
               # Even wackier case: we have meta.broken==true jobs with

     

       61
       61
       -
               # !meta.broken jobs as subattributes with license=unfree, and

     

       62
       62
       -
               # check-meta.nix won't throw an "unfree" failure because the

     

       63
       63
       -
               # enclosing derivation is marked broken.  Yeah.  Bonkers.

     

       64
       64
       -
               # We should just forbid jobsets enclosed by derivations.

     

       65
       65
       -
               else if lib.isDerivation value && !value.meta.available then

     

       66
       66
       -
                 [ ]

     

       67
       67
       -
       

     

       68
       68
       -
               else if !(lib.isAttrs value) then

     

       69
       69
       -
                 [ ]

     

       70
       70
       -
               else

     

       71
       71
       -
                 lib.pipe value [

     

       72
       72
       -
                   (builtins.mapAttrs (

     

       73
       73
       -
                     name: value:

     

       74
       74
       -
                     builtins.addErrorContext "while evaluating package set attribute path '${

     

       75
       75
       -
                       lib.showAttrPath (path ++ [ name ])

     

       76
       76
       -
                     }'" (justAttrNames (path ++ [ name ]) value)

     

       77
       77
       -
                   ))

     

       78
       78
       -
                   builtins.attrValues

     

       79
       79
       -
                   builtins.concatLists

     

       80
       80
       -
                 ];

     

       81
       81
       -
           in

     

       82
       82
       -
           if !trace then result else lib.trace "** ${lib.concatStringsSep "." path}" result;

     

       83
       83
       -
       

     

       84
       84
       -
         releaseOutpaths = import ./release-outpaths.nix {

     

       85
       85
       -
           inherit checkMeta;

     

       86
       86
       -
           attrNamesOnly = true;

     

       87
       87
       -
           inherit path;

     

       88
       88
       -
         };

     

       89
       89
       -
       

     

       90
       90
       -
         paths = [

     

       91
       91
       -
           # I am not entirely sure why these three packages end up in

     

       92
       92
       -
           # the Hydra jobset.  But they do, and they don't meet the

     

       93
       93
       -
           # criteria above, so at the moment they are special-cased.

     

       94
       94
       -
           [

     

       95
       95
       -
             "pkgsLLVM"

     

       96
       96
       -
             "stdenv"

     

       97
       97
       -
           ]

     

       98
       98
       -
           [

     

       99
       99
       -
             "pkgsStatic"

     

       100
       100
       -
             "stdenv"

     

       101
       101
       -
           ]

     

       102
       102
       -
           [

     

       103
       103
       -
             "pkgsMusl"

     

       104
       104
       -
             "stdenv"

     

       105
       105
       -
           ]

     

       106
       106
       -
         ]

     

       107
       107
       -
         ++ justAttrNames [ ] releaseOutpaths;

     

       108
       108
       -
       

     

       109
       109
       -
         names = map (path: (lib.concatStringsSep "." path)) paths;

     

       110
       110
       -
       

     

       111
       111
       -
       in

     

       112
       112
       -
       {

     

       113
       113
       -
         inherit paths names;

     

       114
       114
       -
       }

+3 -5

pkgs/top-level/release-outpaths-parallel.nix ci/eval/chunk.nix

···

       1
       1
       -
       # This file works in tandem with ../../ci/eval/default.nix

     

       2
       2
       -
       # It turns ./release-outpaths.nix into chunks of a fixed size

     

       1
       1
       +
       # This turns ./outpaths.nix into chunks of a fixed size.

     

       3
       2
        
       {

     

       4
       3
        
         lib ? import ../../lib,

     

       5
       4
        
         path ? ../..,

     
···

       7
       6
        
         attrpathFile,

     

       8
       7
        
         chunkSize,

     

       9
       8
        
         myChunk,

     

       10
       10
       -
         checkMeta,

     

       11
       9
        
         includeBroken,

     

       12
       10
        
         systems,

     

       13
       11
        
       }:

     
···

       16
       14
        
         attrpaths = lib.importJSON attrpathFile;

     

       17
       15
        
         myAttrpaths = lib.sublist (chunkSize * myChunk) chunkSize attrpaths;

     

       18
       16
        
       

     

       19
       19
       -
         unfiltered = import ./release-outpaths.nix {

     

       17
       17
       +
         unfiltered = import ./outpaths.nix {

     

       20
       18
        
           inherit path;

     

       21
       21
       -
           inherit checkMeta includeBroken systems;

     

       19
       19
       +
           inherit includeBroken systems;

     

       22
       20
        
         };

     

       23
       21
        
       

     

       24
       22
        
         # Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths

+4 -7

pkgs/top-level/release-outpaths.nix ci/eval/outpaths.nix

···

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

     

       2
       2
        
       # When using as a callable script, passing `--argstr path some/path` overrides $PWD.

     

       3
       3
       -
       #!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f pkgs/top-level/release-outpaths.nix"

     

       3
       3
       +
       #!nix-shell -p nix -i "nix-env -qaP --no-name --out-path -f ci/eval/outpaths.nix"

     

       4
       4
        
       

     

       5
       5
       -
       # Vendored from:

     

       6
       6
       -
       #   https://raw.githubusercontent.com/NixOS/ofborg/74f38efa7ef6f0e8e71ec3bfc675ae4fb57d7491/ofborg/src/outpaths.nix

     

       7
       5
        
       {

     

       8
       8
       -
         checkMeta,

     

       9
       6
        
         includeBroken ? true, # set this to false to exclude meta.broken packages from the output

     

       10
       7
        
         path ? ./../..,

     

       11
       8
        
       

     

       12
       12
       -
         # used by pkgs/top-level/release-attrnames-superset.nix

     

       9
       9
       +
         # used by ./attrpaths.nix

     

       13
       10
        
         attrNamesOnly ? false,

     

       14
       11
        
       

     

       15
       12
        
         # Set this to `null` to build for builtins.currentSystem only

     

       16
       16
       -
         systems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),

     

       13
       13
       +
         systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),

     

       17
       14
        
       }:

     

       18
       15
        
       let

     

       19
       16
        
         lib = import (path + "/lib");

     
···

       30
       27
        
                   allowUnfree = true;

     

       31
       28
        
                   allowInsecurePredicate = x: true;

     

       32
       29
        
                   allowVariants = !attrNamesOnly;

     

       33
       33
       -
                   checkMeta = checkMeta;

     

       30
       30
       +
                   checkMeta = true;

     

       34
       31
        
       

     

       35
       32
        
                   handleEvalIssue =

     

       36
       33
        
                     reason: errormsg:

+1 -5

pkgs/top-level/release-python.nix

···

       36
       36
        
             res = builtins.tryEval (

     

       37
       37
        
               if isDerivation value then

     

       38
       38
        
                 value.meta.isBuildPythonPackage or [ ]

     

       39
       39
       -
               else if

     

       40
       40
       -
                 value.recurseForDerivations or false

     

       41
       41
       -
                 || value.recurseForRelease or false

     

       42
       42
       -
                 || value.__recurseIntoDerivationForReleaseJobs or false

     

       43
       43
       -
               then

     

       39
       39
       +
               else if value.recurseForDerivations or false || value.recurseForRelease or false then

     

       44
       40
        
                 packagePython value

     

       45
       41
        
               else

     

       46
       42
        
                 [ ]

+1 -5

pkgs/top-level/release-unfree-redistributable.nix

···

       69
       69
        
                     value.meta.hydraPlatforms

     

       70
       70
        
                       or (lib.subtractLists (value.meta.badPlatforms or [ ]) (value.meta.platforms or [ "x86_64-linux" ]))

     

       71
       71
        
                   )

     

       72
       72
       -
                 else if

     

       73
       73
       -
                   value.recurseForDerivations or false

     

       74
       74
       -
                   || value.recurseForRelease or false

     

       75
       75
       -
                   || value.__recurseIntoDerivationForReleaseJobs or false

     

       76
       76
       -
                 then

     

       72
       72
       +
                 else if value.recurseForDerivations or false || value.recurseForRelease or false then

     

       77
       73
        
                   # Recurse

     

       78
       74
        
                   packagesWith attrPath cond value

     

       79
       75
        
                 else

+4 -6

pkgs/top-level/release.nix

···

       57
       57
        
         # resulting tree of attributes to *not* have a ".${system}"

     

       58
       58
        
         # suffixed upon every job name like Hydra expects.

     

       59
       59
        
         #

     

       60
       60
       -
         # This flag exists mainly for use by

     

       61
       61
       -
         # pkgs/top-level/release-attrnames-superset.nix; see that file for

     

       62
       62
       -
         # full details.  The exact behavior of this flag may change; it

     

       63
       63
       -
         # should be considered an internal implementation detail of

     

       64
       64
       -
         # pkgs/top-level/.

     

       65
       65
       -
         #

     

       60
       60
       +
         # This flag exists mainly for use by ci/eval/attrpaths.nix; see

     

       61
       61
       +
         # that file for full details.  The exact behavior of this flag

     

       62
       62
       +
         # may change; it should be considered an internal implementation

     

       63
       63
       +
         # detail of ci/eval.

     

       66
       64
        
         attrNamesOnly ? false,

     

       67
       65
        
       }:

     

       68
       66