diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e7b2f6df34fe..1628e3c257ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11084,7 +11084,7 @@ name = "Hugo Tavares Reis"; }; httprafa = { - email = "rafael.kienitz@gmail.com"; + email = "rafa.kienitz@proton.me"; github = "HttpRafa"; githubId = 60099368; name = "Rafael Kienitz"; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 801b598233ae..a0d4256c3c0f 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -532,6 +532,17 @@ def install_bootloader(args: argparse.Namespace) -> None: for profile in get_profiles(): gens += get_generations(profile) + if not gens: + # With zero generations we would garbage-collect every kernel, + # initrd and loader entry off the ESP, leaving the system + # unbootable. + print( + "error: no system generations found in /nix/var/nix/profiles, " + "refusing to remove all boot loader entries", + file=sys.stderr, + ) + sys.exit(1) + boot_files: BootFileList = [] critical_paths: set[Path] = set() diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index df5f9ded9da4..cf7d518059c7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -942,7 +942,7 @@ in lomiri-system-settings = runTest ./lomiri-system-settings.nix; lorri = handleTest ./lorri/default.nix { }; luks = runTest ./luks.nix; - lvm2 = handleTest ./lvm2 { }; + lvm2 = import ./lvm2 { inherit pkgs runTest; }; lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc; lxd-image-server = runTest ./lxd-image-server.nix; lxqt = runTest ./lxqt.nix; @@ -1850,7 +1850,7 @@ in zammad = runTest ./zammad.nix; zenohd = runTest ./zenohd.nix; zeronet-conservancy = runTest ./zeronet-conservancy.nix; - zfs = handleTest ./zfs.nix { }; + zfs = import ./zfs.nix { inherit system pkgs runTest; }; zigbee2mqtt = runTest ./zigbee2mqtt.nix; zipline = runTest ./zipline.nix; zoneminder = runTest ./zoneminder.nix; diff --git a/nixos/tests/chhoto-url.nix b/nixos/tests/chhoto-url.nix index 01572b3c3216..a2f443e9b0da 100644 --- a/nixos/tests/chhoto-url.nix +++ b/nixos/tests/chhoto-url.nix @@ -38,7 +38,7 @@ resp = json.loads(machine.succeed("curl localhost:8000/api/getconfig")) assert resp["success"] is False - assert resp["reason"] == "No valid authentication was found" + assert resp["reason"] == "No valid authentication." resp = json.loads(machine.succeed("curl -H 'X-API-Key: api_key' localhost:8000/api/getconfig")) expected_version = "${config.nodes.machine.services.chhoto-url.package.version}" diff --git a/nixos/tests/gocryptfs.nix b/nixos/tests/gocryptfs.nix index 548f8b424e16..d0e5df5e40b5 100644 --- a/nixos/tests/gocryptfs.nix +++ b/nixos/tests/gocryptfs.nix @@ -44,6 +44,9 @@ # Wait for mounts machine.wait_for_unit("local-fs.target") + # Sometimes gocryptfs files are slow to appear + machine.wait_for_file("/plain/data.txt") + # Ensure the canary is alive machine.succeed("grep -q success /plain/data.txt") diff --git a/nixos/tests/initrd-luks-empty-passphrase.nix b/nixos/tests/initrd-luks-empty-passphrase.nix index 56a92a827ff4..2153e2dfab55 100644 --- a/nixos/tests/initrd-luks-empty-passphrase.nix +++ b/nixos/tests/initrd-luks-empty-passphrase.nix @@ -61,47 +61,63 @@ in }; }; - testScript = '' - # Encrypt key with empty key so boot should try keyfile and then fallback to empty passphrase + testScript = + { nodes, ... }: + let + toplevel = nodes.machine.system.build.toplevel; + boot-luks-missing-keyfile = + nodes.machine.specialisation.boot-luks-missing-keyfile.configuration.system.build.toplevel; + boot-luks-wrong-keyfile = + nodes.machine.specialisation.boot-luks-wrong-keyfile.configuration.system.build.toplevel; + in + # python + '' + # Encrypt key with empty key so boot should try keyfile and then fallback to empty passphrase - def grub_select_boot_luks_wrong_key_file(): - """ - Selects "boot-luks" from the GRUB menu - to trigger a login request. - """ - machine.send_monitor_command("sendkey down") - machine.send_monitor_command("sendkey down") - machine.send_monitor_command("sendkey ret") + def grub_select_boot_luks_wrong_key_file(): + """ + Selects "boot-luks" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") - def grub_select_boot_luks_missing_key_file(): - """ - Selects "boot-luks" from the GRUB menu - to trigger a login request. - """ - machine.send_monitor_command("sendkey down") - machine.send_monitor_command("sendkey ret") + def grub_select_boot_luks_missing_key_file(): + """ + Selects "boot-luks" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") - # Create encrypted volume - machine.wait_for_unit("multi-user.target") - machine.succeed("echo "" | cryptsetup luksFormat /dev/vdb --batch-mode") - machine.succeed("echo "" | cryptsetup luksOpen /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-wrong-keyfile.conf") - machine.succeed("sync") - machine.crash() + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo "" | cryptsetup luksFormat /dev/vdb --batch-mode") + machine.succeed("echo "" | cryptsetup luksOpen /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + machine.succeed("${boot-luks-wrong-keyfile}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Check if rootfs is on /dev/mapper/cryptroot - machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + # Check if rootfs is on /dev/mapper/cryptroot + machine.wait_for_unit("multi-user.target") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - # Choose boot-luks-missing-keyfile specialisation - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-missing-keyfile.conf") - machine.succeed("sync") - machine.crash() + # Choose boot-luks-missing-keyfile specialisation + machine.succeed( + "mkdir -p /nix/var/nix/profiles", + "ln -sfn ${toplevel} /nix/var/nix/profiles/system-1-link", + "ln -sfn system-1-link /nix/var/nix/profiles/system", + ) - # Check if rootfs is on /dev/mapper/cryptroot - machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - ''; + machine.succeed("${boot-luks-missing-keyfile}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() + + # Check if rootfs is on /dev/mapper/cryptroot + machine.wait_for_unit("multi-user.target") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/luks.nix b/nixos/tests/luks.nix index db2672eefdc0..08f465c006d1 100644 --- a/nixos/tests/luks.nix +++ b/nixos/tests/luks.nix @@ -1,6 +1,6 @@ # Tests LUKS specifically with scripted stage 1. Remove in 26.11. -{ lib, pkgs, ... }: +{ lib, ... }: { name = "luks"; @@ -47,41 +47,59 @@ enableOCR = true; - testScript = '' - # Create encrypted volume - machine.wait_for_unit("multi-user.target") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") - machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + testScript = + { nodes, ... }: + let + toplevel = nodes.machine.system.build.toplevel; + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + boot-luks-custom-keymap = + nodes.machine.specialisation.boot-luks-custom-keymap.configuration.system.build.toplevel; + in + # python + '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") - machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdc cryptroot2") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdc cryptroot2") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk - machine.start() - machine.wait_for_text("Passphrase for") - machine.send_chars("supersecret\n") - machine.wait_for_unit("multi-user.target") + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("supersecret\n") + machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - # Boot from the encrypted disk with custom keymap - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-custom-keymap.conf") - machine.succeed("sync") - machine.crash() + # The new root is empty, so it has no /nix/var/nix/profiles. Without a + # system profile, systemd-boot-builder finds zero generations and + # bails. So we manually create the one profile link that we need. + machine.succeed( + "mkdir -p /nix/var/nix/profiles", + "ln -sfn ${toplevel} /nix/var/nix/profiles/system-1-link", + "ln -sfn system-1-link /nix/var/nix/profiles/system", + ) - # Boot and decrypt the disk - machine.start() - machine.wait_for_text("Passphrase for") - machine.send_chars("havfkhfrkfl\n") - machine.wait_for_unit("multi-user.target") + # Boot from the encrypted disk with custom keymap + machine.succeed("${boot-luks-custom-keymap}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - ''; + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("havfkhfrkfl\n") + machine.wait_for_unit("multi-user.target") + + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index dfdd3ae6a9a2..55e12bb39aef 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -1,8 +1,6 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib, + pkgs, + runTest, kernelVersionsToTest ? [ "5.10" "5.15" @@ -15,38 +13,36 @@ # For quickly running a test, the nixosTests.lvm2.lvm-thinpool-linux-latest attribute is recommended let - tests = - let - callTest = p: lib.flip (import p) { inherit system pkgs; }; - in - { - thinpool = { - test = callTest ./thinpool.nix; - kernelFilter = lib.id; - }; - # we would like to test all versions, but the kernel module currently does not compile against the other versions - vdo = { - test = callTest ./vdo.nix; - kernelFilter = lib.filter (v: v == "latest"); - }; + inherit (pkgs) lib; - # systemd in stage 1 - raid-sd-stage-1 = { - test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.filter (v: v != "5.15"); - flavour = "raid"; - }; - thinpool-sd-stage-1 = { - test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.id; - flavour = "thinpool"; - }; - vdo-sd-stage-1 = { - test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.filter (v: v == "latest"); - flavour = "vdo"; - }; + tests = { + thinpool = { + test = ./thinpool.nix; + kernelFilter = lib.id; }; + # we would like to test all versions, but the kernel module currently does not compile against the other versions + vdo = { + test = ./vdo.nix; + kernelFilter = lib.filter (v: v == "latest"); + }; + + # systemd in stage 1 + raid-sd-stage-1 = { + test = ./systemd-stage-1.nix; + kernelFilter = lib.filter (v: v != "5.15"); + flavour = "raid"; + }; + thinpool-sd-stage-1 = { + test = ./systemd-stage-1.nix; + kernelFilter = lib.id; + flavour = "thinpool"; + }; + vdo-sd-stage-1 = { + test = ./systemd-stage-1.nix; + kernelFilter = lib.filter (v: v == "latest"); + flavour = "vdo"; + }; + }; in lib.listToAttrs ( lib.filter (x: x.value != { }) ( @@ -61,18 +57,17 @@ lib.listToAttrs ( lib.flip lib.mapAttrsToList tests ( name: t: lib.nameValuePair "lvm-${name}-linux-${v'}" ( - lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) ( - t.test ( - { - kernelPackages = pkgs."linuxPackages_${v'}"; - inherit mkXfsFlags; - } - // removeAttrs t [ - "test" - "kernelFilter" - ] - ) - ) + lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (runTest { + imports = [ t.test ]; + _module.args = { + kernelPackages = pkgs."linuxPackages_${v'}"; + inherit mkXfsFlags; + } + // removeAttrs t [ + "test" + "kernelFilter" + ]; + }) ) ) ) diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix index c6c68ae64c1c..c6aed70675e2 100644 --- a/nixos/tests/lvm2/systemd-stage-1.nix +++ b/nixos/tests/lvm2/systemd-stage-1.nix @@ -1,7 +1,9 @@ { + lib, kernelPackages ? null, flavour, mkXfsFlags ? "", + ... }: let preparationCode = @@ -66,57 +68,61 @@ let .${flavour}; in -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "lvm2-${flavour}-systemd-stage-1"; - meta.maintainers = with lib.maintainers; [ - das_j - helsinki-Jo - ]; +{ + name = "lvm2-${flavour}-systemd-stage-1"; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; - nodes.machine = - { pkgs, lib, ... }: - { - imports = [ extraConfig ]; - # Use systemd-boot - virtualisation = { - emptyDiskImages = [ - 8192 - 8192 - ]; - useBootLoader = true; - useEFIBoot = true; - # To boot off the LVM disk, we need to have a init script which comes from the Nix store. - mountHostNixStore = true; - }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + nodes.machine = + { pkgs, lib, ... }: + { + imports = [ extraConfig ]; + # Use systemd-boot + virtualisation = { + emptyDiskImages = [ + 8192 + 8192 + ]; + useBootLoader = true; + useEFIBoot = true; + # To boot off the LVM disk, we need to have a init script which comes from the Nix store. + mountHostNixStore = true; + }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; - environment.systemPackages = with pkgs; [ xfsprogs ]; - boot = { - initrd.systemd = { - enable = true; - emergencyAccess = true; - }; - initrd.services.lvm.enable = true; - kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages; - }; - - specialisation.boot-lvm.configuration.virtualisation = { - useDefaultFilesystems = false; - fileSystems = { - "/" = { - device = "/dev/test_vg/test_lv"; - fsType = "xfs"; - }; - }; - - rootDevice = "/dev/test_vg/test_lv"; + environment.systemPackages = with pkgs; [ xfsprogs ]; + boot = { + initrd.systemd = { + enable = true; + emergencyAccess = true; }; + initrd.services.lvm.enable = true; + kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages; }; - testScript = '' + specialisation.boot-lvm.configuration.virtualisation = { + useDefaultFilesystems = false; + fileSystems = { + "/" = { + device = "/dev/test_vg/test_lv"; + fsType = "xfs"; + }; + }; + + rootDevice = "/dev/test_vg/test_lv"; + }; + }; + + testScript = + { nodes, ... }: + let + boot-lvm = nodes.machine.specialisation.boot-lvm.configuration.system.build.toplevel; + in + # python + '' machine.wait_for_unit("multi-user.target") # Create a VG for the root ${preparationCode} @@ -124,7 +130,7 @@ import ../make-test-python.nix ( machine.succeed("mkdir -p /mnt && mount /dev/test_vg/test_lv /mnt && echo hello > /mnt/test && umount /mnt") # Boot from LVM - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-lvm.conf") + machine.succeed("${boot-lvm}/bin/switch-to-configuration boot") machine.succeed("sync") machine.crash() machine.wait_for_unit("multi-user.target") @@ -135,5 +141,4 @@ import ../make-test-python.nix ( assert "hello" in machine.succeed("cat /test") ${extraCheck} ''; - } -) +} diff --git a/nixos/tests/lvm2/thinpool.nix b/nixos/tests/lvm2/thinpool.nix index 8c7471d46f28..02d081f6b38c 100644 --- a/nixos/tests/lvm2/thinpool.nix +++ b/nixos/tests/lvm2/thinpool.nix @@ -1,49 +1,48 @@ { + lib, kernelPackages ? null, mkXfsFlags ? "", + ... }: -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "lvm2-thinpool"; - meta.maintainers = with lib.maintainers; [ - das_j - helsinki-Jo - ]; +{ + name = "lvm2-thinpool"; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; - nodes.machine = - { pkgs, lib, ... }: - { - virtualisation.emptyDiskImages = [ 4096 ]; - services.lvm = { - boot.thin.enable = true; - dmeventd.enable = true; - }; - environment.systemPackages = with pkgs; [ xfsprogs ]; - environment.etc."lvm/lvm.conf".text = '' - activation/thin_pool_autoextend_percent = 10 - activation/thin_pool_autoextend_threshold = 80 - ''; - boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + nodes.machine = + { pkgs, lib, ... }: + { + virtualisation.emptyDiskImages = [ 4096 ]; + services.lvm = { + boot.thin.enable = true; + dmeventd.enable = true; }; - - testScript = - let - mkXfsFlags = - lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") " -m bigtime=0 -m inobtcount=0 " - + lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.19") " -i nrext64=0 "; - in - '' - machine.succeed("vgcreate test_vg /dev/vdb") - machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool") - machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg") - machine.succeed("mkfs.xfs ${mkXfsFlags} /dev/test_vg/test_lv") - machine.succeed("mkdir /mnt; mount /dev/test_vg/test_lv /mnt") - assert "/dev/mapper/test_vg-test_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip() - machine.succeed("dd if=/dev/zero of=/mnt/empty.file bs=1M count=1024") - machine.succeed("journalctl -u dm-event.service | grep \"successfully resized\"") - machine.succeed("umount /mnt") - machine.succeed("vgchange -a n") + environment.systemPackages = with pkgs; [ xfsprogs ]; + environment.etc."lvm/lvm.conf".text = '' + activation/thin_pool_autoextend_percent = 10 + activation/thin_pool_autoextend_threshold = 80 ''; - } -) + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + }; + + testScript = + let + mkXfsFlags = + lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") " -m bigtime=0 -m inobtcount=0 " + + lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.19") " -i nrext64=0 "; + in + '' + machine.succeed("vgcreate test_vg /dev/vdb") + machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool") + machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg") + machine.succeed("mkfs.xfs ${mkXfsFlags} /dev/test_vg/test_lv") + machine.succeed("mkdir /mnt; mount /dev/test_vg/test_lv /mnt") + assert "/dev/mapper/test_vg-test_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip() + machine.succeed("dd if=/dev/zero of=/mnt/empty.file bs=1M count=1024") + machine.succeed("journalctl -u dm-event.service | grep \"successfully resized\"") + machine.succeed("umount /mnt") + machine.succeed("vgchange -a n") + ''; +} diff --git a/nixos/tests/lvm2/vdo.nix b/nixos/tests/lvm2/vdo.nix index ee65aa7d828f..94894f64377b 100644 --- a/nixos/tests/lvm2/vdo.nix +++ b/nixos/tests/lvm2/vdo.nix @@ -1,35 +1,34 @@ { + lib, kernelPackages ? null, mkXfsFlags ? "", + ... }: -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "lvm2-vdo"; - meta.maintainers = [ ]; +{ + name = "lvm2-vdo"; + meta.maintainers = [ ]; - nodes.machine = - { pkgs, lib, ... }: - { - # Minimum required size for VDO volume: 5063921664 bytes - virtualisation.emptyDiskImages = [ 8192 ]; - services.lvm = { - boot.vdo.enable = true; - dmeventd.enable = true; - }; - environment.systemPackages = with pkgs; [ xfsprogs ]; - boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + nodes.machine = + { pkgs, lib, ... }: + { + # Minimum required size for VDO volume: 5063921664 bytes + virtualisation.emptyDiskImages = [ 8192 ]; + services.lvm = { + boot.vdo.enable = true; + dmeventd.enable = true; }; + environment.systemPackages = with pkgs; [ xfsprogs ]; + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + }; - testScript = '' - machine.succeed("vgcreate test_vg /dev/vdb") - machine.succeed("lvcreate --type vdo -n vdo_lv -L 6G -V 12G test_vg/vdo_pool_lv") - machine.succeed("mkfs.xfs ${mkXfsFlags} -K /dev/test_vg/vdo_lv") - machine.succeed("mkdir /mnt; mount /dev/test_vg/vdo_lv /mnt") - assert "/dev/mapper/test_vg-vdo_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip() - machine.succeed("umount /mnt") - machine.succeed("vdostats") - machine.succeed("vgchange -a n") - ''; - } -) + testScript = '' + machine.succeed("vgcreate test_vg /dev/vdb") + machine.succeed("lvcreate --type vdo -n vdo_lv -L 6G -V 12G test_vg/vdo_pool_lv") + machine.succeed("mkfs.xfs ${mkXfsFlags} -K /dev/test_vg/vdo_lv") + machine.succeed("mkdir /mnt; mount /dev/test_vg/vdo_lv /mnt") + assert "/dev/mapper/test_vg-vdo_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip() + machine.succeed("umount /mnt") + machine.succeed("vdostats") + machine.succeed("vgchange -a n") + ''; +} diff --git a/nixos/tests/systemd-initrd-btrfs-raid.nix b/nixos/tests/systemd-initrd-btrfs-raid.nix index 1aa21fc326cd..05caa522b0d7 100644 --- a/nixos/tests/systemd-initrd-btrfs-raid.nix +++ b/nixos/tests/systemd-initrd-btrfs-raid.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { name = "systemd-initrd-btrfs-raid"; @@ -33,21 +33,27 @@ }; }; - testScript = '' - # Create RAID - machine.succeed("mkfs.btrfs -d raid0 /dev/vdb /dev/vdc") - machine.succeed("mkdir -p /mnt && mount /dev/vdb /mnt && echo hello > /mnt/test && umount /mnt") + testScript = + { nodes, ... }: + let + boot-btrfs-raid = nodes.machine.specialisation.boot-btrfs-raid.configuration.system.build.toplevel; + in + # python + '' + # Create RAID + machine.succeed("mkfs.btrfs -d raid0 /dev/vdb /dev/vdc") + machine.succeed("mkdir -p /mnt && mount /dev/vdb /mnt && echo hello > /mnt/test && umount /mnt") - # Boot from the RAID - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-btrfs-raid.conf") - machine.succeed("sync") - machine.crash() - machine.wait_for_unit("multi-user.target") + # Boot from the RAID + machine.succeed("${boot-btrfs-raid}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() + machine.wait_for_unit("multi-user.target") - # Ensure we have successfully booted from the RAID - assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1 - assert "/dev/vdb on / type btrfs" in machine.succeed("mount") - assert "hello" in machine.succeed("cat /test") - assert "Total devices 2" in machine.succeed("btrfs filesystem show") - ''; + # Ensure we have successfully booted from the RAID + assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1 + assert "/dev/vdb on / type btrfs" in machine.succeed("mount") + assert "hello" in machine.succeed("cat /test") + assert "Total devices 2" in machine.succeed("btrfs filesystem show") + ''; } diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix index a38c97e8b0dd..783b9d7426e7 100644 --- a/nixos/tests/systemd-initrd-luks-fido2.nix +++ b/nixos/tests/systemd-initrd-luks-fido2.nix @@ -1,6 +1,5 @@ { lib, - pkgs, hostPkgs, ... }: @@ -43,19 +42,25 @@ }; }; - testScript = '' - # Create encrypted volume - machine.wait_for_unit("multi-user.target") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") - machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdb |& systemd-cat") + testScript = + { nodes, ... }: + let + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + in + # python + '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") + machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdb |& systemd-cat") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk - machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - ''; + # Boot and decrypt the disk + machine.wait_for_unit("multi-user.target") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/systemd-initrd-luks-keyfile.nix b/nixos/tests/systemd-initrd-luks-keyfile.nix index 8b7f28947f72..b12e504a107a 100644 --- a/nixos/tests/systemd-initrd-luks-keyfile.nix +++ b/nixos/tests/systemd-initrd-luks-keyfile.nix @@ -42,20 +42,26 @@ in }; }; - testScript = '' - # Create encrypted volume - machine.wait_for_unit("multi-user.target") - machine.succeed("cryptsetup luksFormat -q --iter-time=1 -d ${keyfile} /dev/vdb") - machine.succeed("cryptsetup luksOpen --key-file ${keyfile} /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + testScript = + { nodes, ... }: + let + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + in + # python + '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("cryptsetup luksFormat -q --iter-time=1 -d ${keyfile} /dev/vdb") + machine.succeed("cryptsetup luksOpen --key-file ${keyfile} /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk - machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - ''; + # Boot and decrypt the disk + machine.wait_for_unit("multi-user.target") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/systemd-initrd-luks-password.nix b/nixos/tests/systemd-initrd-luks-password.nix index a77fe16ea453..8eeb9b178fa1 100644 --- a/nixos/tests/systemd-initrd-luks-password.nix +++ b/nixos/tests/systemd-initrd-luks-password.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { name = "systemd-initrd-luks-password"; @@ -39,30 +39,36 @@ }; }; - testScript = '' - # Create encrypted volume - machine.wait_for_unit("multi-user.target") + testScript = + { nodes, ... }: + let + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + in + # python + '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") - machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") - machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdc cryptroot2") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdc cryptroot2") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk - machine.start() - machine.wait_for_console_text("Please enter passphrase for disk cryptroot") - machine.send_console("supersecret\n") - machine.wait_for_unit("multi-user.target") + # Boot and decrypt the disk + machine.start() + machine.wait_for_console_text("Please enter passphrase for disk cryptroot") + machine.send_console("supersecret\n") + machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount"), "/dev/mapper/cryptroot do not appear in mountpoints list" - assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount") - ''; + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount"), "/dev/mapper/cryptroot do not appear in mountpoints list" + assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixos/tests/systemd-initrd-luks-tpm2.nix index 931959f05464..8628fc2b8a01 100644 --- a/nixos/tests/systemd-initrd-luks-tpm2.nix +++ b/nixos/tests/systemd-initrd-luks-tpm2.nix @@ -35,21 +35,27 @@ }; }; - testScript = '' - # Create encrypted volume - machine.wait_for_unit("multi-user.target") - machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") - machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --tpm2-pcrs= --tpm2-device=auto /dev/vdb |& systemd-cat") + testScript = + { nodes, ... }: + let + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + in + # python + '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --tpm2-pcrs= --tpm2-device=auto /dev/vdb |& systemd-cat") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk - machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") - ''; + # Boot and decrypt the disk + machine.wait_for_unit("multi-user.target") + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/systemd-initrd-luks-unl0kr.nix b/nixos/tests/systemd-initrd-luks-unl0kr.nix index 6844357a729f..b48bd2d1588f 100644 --- a/nixos/tests/systemd-initrd-luks-unl0kr.nix +++ b/nixos/tests/systemd-initrd-luks-unl0kr.nix @@ -82,33 +82,39 @@ in }; }; - testScript = '' - machine.wait_for_unit("multi-user.target") + testScript = + { nodes, ... }: + let + boot-luks = nodes.machine.specialisation.boot-luks.configuration.system.build.toplevel; + in + # python + '' + machine.wait_for_unit("multi-user.target") - machine.succeed("echo -n ${passphrase} | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") - machine.succeed("echo -n ${passphrase} | cryptsetup luksOpen -q /dev/vdb cryptroot") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") + machine.succeed("echo -n ${passphrase} | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") + machine.succeed("echo -n ${passphrase} | cryptsetup luksOpen -q /dev/vdb cryptroot") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot") - machine.succeed("echo -n ${passphrase} | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") - machine.succeed("echo -n ${passphrase} | cryptsetup luksOpen -q /dev/vdc cryptroot2") - machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") + machine.succeed("echo -n ${passphrase} | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") + machine.succeed("echo -n ${passphrase} | cryptsetup luksOpen -q /dev/vdc cryptroot2") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") - # Boot from the encrypted disk - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") - machine.succeed("sync") - machine.crash() + # Boot from the encrypted disk + machine.succeed("${boot-luks}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() - # Boot and decrypt the disk. This part of the test is SLOW. - machine.start() - machine.wait_for_unit("unl0kr-agent.service") - machine.screenshot("prompt") - machine.send_chars("${passphrase}") - machine.screenshot("pw") - machine.send_chars("\n") - machine.switch_root() - machine.wait_for_unit("multi-user.target") + # Boot and decrypt the disk. This part of the test is SLOW. + machine.start() + machine.wait_for_unit("unl0kr-agent.service") + machine.screenshot("prompt") + machine.send_chars("${passphrase}") + machine.screenshot("pw") + machine.send_chars("\n") + machine.switch_root() + machine.wait_for_unit("multi-user.target") - assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount"), "/dev/mapper/cryptroot do not appear in mountpoints list" - assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount") - ''; + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount"), "/dev/mapper/cryptroot do not appear in mountpoints list" + assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount") + ''; } diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix index 997235ecfcd1..01fc9141997e 100644 --- a/nixos/tests/systemd-initrd-swraid.nix +++ b/nixos/tests/systemd-initrd-swraid.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { name = "systemd-initrd-swraid"; @@ -41,30 +41,36 @@ specialisation.build-old-initrd.configuration.boot.initrd.systemd.enable = lib.mkForce false; }; - testScript = '' - # Create RAID - machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal") - machine.succeed("mkfs.ext4 -L testraid /dev/md0") - machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt") + testScript = + { nodes, ... }: + let + boot-swraid = nodes.machine.specialisation.boot-swraid.configuration.system.build.toplevel; + in + # python + '' + # Create RAID + machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal") + machine.succeed("mkfs.ext4 -L testraid /dev/md0") + machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt") - # Boot from the RAID - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-swraid.conf") - machine.succeed("sync") - machine.crash() - machine.wait_for_unit("multi-user.target") + # Boot from the RAID + machine.succeed("${boot-swraid}/bin/switch-to-configuration boot") + machine.succeed("sync") + machine.crash() + machine.wait_for_unit("multi-user.target") - # Ensure we have successfully booted from the RAID - assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1 - assert "/dev/md0 on / type ext4" in machine.succeed("mount") - assert "hello" in machine.succeed("cat /test") - assert "md0" in machine.succeed("cat /proc/mdstat") + # Ensure we have successfully booted from the RAID + assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1 + assert "/dev/md0 on / type ext4" in machine.succeed("mount") + assert "hello" in machine.succeed("cat /test") + assert "md0" in machine.succeed("cat /proc/mdstat") - # Verify the RAID array was properly auto-detected and assembled - detail = machine.succeed("mdadm --detail /dev/md0") - assert "raid1" in detail, f"Expected raid1 in mdadm detail output: {detail}" - assert "/dev/vdb" in detail, f"Expected /dev/vdb in array: {detail}" - assert "/dev/vdc" in detail, f"Expected /dev/vdc in array: {detail}" + # Verify the RAID array was properly auto-detected and assembled + detail = machine.succeed("mdadm --detail /dev/md0") + assert "raid1" in detail, f"Expected raid1 in mdadm detail output: {detail}" + assert "/dev/vdb" in detail, f"Expected /dev/vdb in array: {detail}" + assert "/dev/vdc" in detail, f"Expected /dev/vdc in array: {detail}" - machine.wait_for_unit("mdmonitor.service") - ''; + machine.wait_for_unit("mdmonitor.service") + ''; } diff --git a/nixos/tests/uptermd.nix b/nixos/tests/uptermd.nix index a034fd60d8e4..a471c9274adf 100644 --- a/nixos/tests/uptermd.nix +++ b/nixos/tests/uptermd.nix @@ -21,6 +21,11 @@ in enable = true; openFirewall = true; port = 1337; + # required to match certificate principals + extraFlags = [ + "--hostname" + "server" + ]; }; }; client1 = client; @@ -58,7 +63,7 @@ in client2.execute("ssh-keygen -t ed25519 -N \"\" -f /root/.ssh/id_ed25519") # Grep the ssh connect command from the output of 'upterm host' - ssh_command = client1.succeed("grep 'SSH Command' /tmp/session-details | awk -F'│' '{print $3}'").strip() + ssh_command = client1.succeed("grep -m1 '^[[:space:]]*ssh' /tmp/session-details").strip() # Connect with client2. Because we used '--force-command hostname' we should get "client1" as the output output = client2.succeed(ssh_command) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 418d7aeeda9b..fc5eb975226c 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -1,12 +1,11 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, + system, + pkgs, + runTest, }: -with import ../lib/testing-python.nix { inherit system pkgs; }; - let + inherit (pkgs) lib; makeZfsTest = { @@ -15,11 +14,9 @@ let zfsPackage, extraTest ? "", }: - makeTest { + runTest { name = zfsPackage.kernelModuleAttribute; - meta = with pkgs.lib.maintainers; { - maintainers = [ elvishjerricco ]; - }; + meta.maintainers = with lib.maintainers; [ elvishjerricco ]; nodes.machine = { @@ -124,82 +121,90 @@ let }; }; - testScript = '' - machine.wait_for_unit("multi-user.target") - machine.succeed( - "zpool status", - "parted --script /dev/vdb mklabel msdos", - "parted --script /dev/vdb -- mkpart primary 1024M -1s", - "parted --script /dev/vdc mklabel msdos", - "parted --script /dev/vdc -- mkpart primary 1024M -1s", - ) + testScript = + { nodes, ... }: + let + samba = nodes.machine.specialisation.samba.configuration.system.build.toplevel; + encryption = nodes.machine.specialisation.encryption.configuration.system.build.toplevel; + forcepool = nodes.machine.specialisation.forcepool.configuration.system.build.toplevel; + in + # python + '' + machine.wait_for_unit("multi-user.target") + machine.succeed( + "zpool status", + "parted --script /dev/vdb mklabel msdos", + "parted --script /dev/vdb -- mkpart primary 1024M -1s", + "parted --script /dev/vdc mklabel msdos", + "parted --script /dev/vdc -- mkpart primary 1024M -1s", + ) - with subtest("sharesmb works"): - machine.succeed( - "zpool create rpool /dev/vdb1", - "zfs create -o mountpoint=legacy rpool/root", - # shared datasets cannot have legacy mountpoint - "zfs create rpool/shared_smb", - "bootctl set-default nixos-generation-1-specialisation-samba.conf", - "sync", - ) - machine.crash() - machine.wait_for_unit("multi-user.target") - machine.succeed("zfs set sharesmb=on rpool/shared_smb") - machine.succeed( - "smbclient -gNL localhost | grep rpool_shared_smb", - "umount /tmp/mnt", - "zpool destroy rpool", - ) + with subtest("sharesmb works"): + machine.succeed( + "zpool create rpool /dev/vdb1", + "zfs create -o mountpoint=legacy rpool/root", + # shared datasets cannot have legacy mountpoint + "zfs create rpool/shared_smb", + "${samba}/bin/switch-to-configuration boot", + "sync", + ) + machine.crash() + machine.wait_for_unit("multi-user.target") + machine.succeed("zfs set sharesmb=on rpool/shared_smb") + machine.succeed( + "smbclient -gNL localhost | grep rpool_shared_smb", + "umount /tmp/mnt", + "zpool destroy rpool", + ) - with subtest("encryption works"): - machine.succeed( - 'echo password | zpool create -O mountpoint=legacy ' - + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdb1", - "zpool create -O mountpoint=legacy manual /dev/vdc1", - "echo otherpass | zfs create " - + "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted", - "zfs create -o encryption=aes-256-gcm -o keyformat=passphrase " - + "-o keylocation=http://localhost/zfskey manual/httpkey", - "bootctl set-default nixos-generation-1-specialisation-encryption.conf", - "sync", - "zpool export automatic", - "zpool export manual", - ) - machine.crash() - machine.start() - machine.wait_for_console_text("Starting password query on") - machine.send_console("password\n") - machine.wait_for_unit("multi-user.target") - machine.succeed( - "zfs get -Ho value keystatus manual/encrypted | grep -Fx unavailable", - "echo otherpass | zfs load-key manual/encrypted", - "systemctl start manual-encrypted.mount", - "zfs load-key manual/httpkey", - "systemctl start manual-httpkey.mount", - "umount /automatic /manual/encrypted /manual/httpkey /manual", - "zpool destroy automatic", - "zpool destroy manual", - ) + with subtest("encryption works"): + machine.succeed( + 'echo password | zpool create -O mountpoint=legacy ' + + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdb1", + "zpool create -O mountpoint=legacy manual /dev/vdc1", + "echo otherpass | zfs create " + + "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted", + "zfs create -o encryption=aes-256-gcm -o keyformat=passphrase " + + "-o keylocation=http://localhost/zfskey manual/httpkey", + "${encryption}/bin/switch-to-configuration boot", + "sync", + "zpool export automatic", + "zpool export manual", + ) + machine.crash() + machine.start() + machine.wait_for_console_text("Starting password query on") + machine.send_console("password\n") + machine.wait_for_unit("multi-user.target") + machine.succeed( + "zfs get -Ho value keystatus manual/encrypted | grep -Fx unavailable", + "echo otherpass | zfs load-key manual/encrypted", + "systemctl start manual-encrypted.mount", + "zfs load-key manual/httpkey", + "systemctl start manual-httpkey.mount", + "umount /automatic /manual/encrypted /manual/httpkey /manual", + "zpool destroy automatic", + "zpool destroy manual", + ) - with subtest("boot.zfs.forceImportAll works"): - machine.succeed( - "rm /etc/hostid", - "zgenhostid deadcafe", - "zpool create forcepool /dev/vdb1 -O mountpoint=legacy", - "bootctl set-default nixos-generation-1-specialisation-forcepool.conf", - "rm /etc/hostid", - "sync", - ) - machine.crash() - machine.wait_for_unit("multi-user.target") - machine.fail("zpool import forcepool") - machine.succeed( - "systemctl start forcepool.mount", - "mount | grep forcepool", - ) - '' - + extraTest; + with subtest("boot.zfs.forceImportAll works"): + machine.succeed( + "rm /etc/hostid", + "zgenhostid deadcafe", + "zpool create forcepool /dev/vdb1 -O mountpoint=legacy", + "${forcepool}/bin/switch-to-configuration boot", + "rm /etc/hostid", + "sync", + ) + machine.crash() + machine.wait_for_unit("multi-user.target") + machine.fail("zpool import forcepool") + machine.succeed( + "systemctl start forcepool.mount", + "mount | grep forcepool", + ) + '' + + extraTest; }; @@ -250,7 +255,7 @@ in systemdStage1 = true; }).zfsroot; - expand-partitions = makeTest { + expand-partitions = runTest { name = "multi-disk-zfs"; nodes = { machine = diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 295579c7c085..2c7253ffb7b7 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -13,10 +13,24 @@ lib.makeScope pkgs.newScope ( inherit lib; inherit (pkgs) fetchFromGitHub - fetchzip + fetchgit ; }; + emacs31 = callPackage (self.sources.emacs31) inheritedArgs; + + emacs31-gtk3 = self.emacs31.override { + withGTK3 = true; + }; + + emacs31-nox = self.emacs31.override { + noGui = true; + }; + + emacs31-pgtk = self.emacs31.override { + withPgtk = true; + }; + emacs30 = callPackage (self.sources.emacs30) inheritedArgs; emacs30-gtk3 = self.emacs30.override { @@ -31,11 +45,6 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs30-macport = callPackage (self.sources.emacs30-macport) ( - inheritedArgs - // { - srcRepo = true; - } - ); + emacs30-macport = callPackage (self.sources.emacs30-macport) inheritedArgs; } ) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 8a39e96f900e..22246f9fe962 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -29,7 +29,6 @@ gtk3-x11, harfbuzz, imagemagick, - jansson, libxaw, libxcursor, libxft, @@ -66,7 +65,7 @@ # Boolean flags withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, noGui ? false, - srcRepo ? false, + srcRepo ? true, withAcl ? false, withAlsaLib ? false, withAthena ? false, @@ -80,8 +79,6 @@ withGpm ? stdenv.hostPlatform.isLinux, # https://github.com/emacs-mirror/emacs/blob/emacs-27.2/etc/NEWS#L118-L120 withImageMagick ? false, - # Emacs 30+ has native JSON support - withJansson ? lib.versionOlder version "30", withMailutils ? true, withMotif ? false, withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui), @@ -256,9 +253,6 @@ stdenv.mkDerivation (finalAttrs: { gnutls (lib.getDev harfbuzz) ] - ++ lib.optionals withJansson [ - jansson - ] ++ [ libxml2 ncurses diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index fb9d9697cd85..1e00137cb90c 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - fetchzip, + fetchgit, }: let @@ -26,9 +26,9 @@ let src = { "mainline" = ( - fetchzip { - url = "mirror://gnu/emacs/${rev}.tar.xz"; - inherit hash; + fetchgit { + url = "https://https.git.savannah.gnu.org/git/emacs.git"; + inherit rev hash; } ); "macport" = ( @@ -74,7 +74,7 @@ let ''; changelog = { - "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; + "mainline" = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/plain/etc/NEWS?h=${rev}"; "macport" = "https://github.com/jdtsmith/emacs-mac/blob/${rev}/NEWS-mac"; } .${variant}; @@ -105,12 +105,20 @@ let }; in { + emacs31 = import ./make-emacs.nix (mkArgs { + pname = "emacs"; + version = "31.0.90"; + variant = "mainline"; + rev = "emacs-31.0.90"; + hash = "sha256-Rzlnn+NKQ+jICXLNop27RnVInq79myn4hueJieDO2Ck="; + }); + emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; version = "30.2"; variant = "mainline"; rev = "emacs-30.2"; - hash = "sha256-W2eZ+cNQhi/fMeRkwOqSKU7Vzvp43WUOpiwaLLNEXtg="; + hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA="; patches = fetchpatch: [ (fetchpatch { name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 39b16aabecc1..028aae4c8913 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -11,13 +11,13 @@ }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; - version = "2.45.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "esmuellert"; repo = "codediff.nvim"; tag = "v${version}"; - hash = "sha256-Up4vH5yk13don0HrmHHpqrPIKtc1MTtDbZ6QcMHQYAU="; + hash = "sha256-1F6z/rhZxiuI6W1ReyHP6EQFxys4qm3fbINxoy1hQZA="; }; dependencies = [ vimPlugins.nui-nvim ]; diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index c6beff3fa30a..9a8f38be2647 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "2.1.0"; - hash = "sha256-DTh8IoJfKuAoNx5XS41wZlafoJwi68g0oJn0vXbEGDo="; + version = "2.2.0"; + hash = "sha256-HwgInQOaSKHSs8CU+Ng4jYA6aaP/g3l4CSb/0ewkmc4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dd7df718a4fe..0c4749f7a520 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -618,8 +618,8 @@ let mktplcRef = { name = "github-markdown-preview"; publisher = "bierner"; - version = "0.3.0"; - hash = "sha256-7pbl5OgvJ6S0mtZWsEyUzlg+lkUhdq3rkCCpLsvTm4g="; + version = "0.4.0"; + hash = "sha256-bfj0rrZWVtgNfynap9+kdp8jAef0g9pTozEJwmkzhgU="; }; meta = { description = "VSCode extension that changes the markdown preview to support GitHub markdown features"; @@ -3491,8 +3491,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.23.2"; - hash = "sha256-btwEFVhvNqCnMCftSt7CS6c4lAf29N3MxBAMriKDyjg="; + version = "1.25.0"; + hash = "sha256-7DN0lYxwLL+Z0mIKApRHGHT7HiJZ0nfDMdojQm7XGAM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix index 57db46721887..e7fc7d2bc60e 100644 --- a/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jjk"; publisher = "jjk"; - version = "0.10.0"; - hash = "sha256-mzsujU3fil3z3yDxpecaOpbXX1K8oh+6dfx/rbOwFYs="; + version = "0.11.0"; + hash = "sha256-hEgr8u6p2aI5TwjgC+iNF7M5oU+DLLZcw7M88Ech87w="; }; meta = { changelog = "https://github.com/keanemind/jjk/releases"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 347db2e03128..eb613fa069dc 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2026-05-23"; + version = "0-unstable-2026-06-02"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "ccd8ae3d8d8e43100e9f596a66214a5b2acb2da1"; - hash = "sha256-zznSKLjpc0ovgqzkpxBqVOMV7UZyuTx1R/x4SCbSPdo="; + rev = "ee042b73f8fe2aa9c8c73408b5bf200a3ce1a67b"; + hash = "sha256-k1DvQHGQH/d6W7jTIAW9jIk0qVHUji3PeYAa8MuUP9w="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index f89170fc4be5..a4617c536d10 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2026-05-21"; + version = "0-unstable-2026-06-03"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "9fda5f344470d6837e17b939b0f53e5afe938878"; - hash = "sha256-gGuYxGRRGyBbHiyG7Gpoi2/frEI5d+ySo8JdZStznN8="; + rev = "2b0ed42fe565fb997a0627aaa8f44e0948b527f8"; + hash = "sha256-gkCzHvoSqh9CluahSSe3+dhZG1HtiNH0orU404pwjgo="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 261d0174cf8a..31e58ff6ed55 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1058,11 +1058,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-AFQV9frUBb8OutvJ0UM5bhMh9IownwQ37iGE1fPmps4=", + "hash": "sha256-uIggPhDgTMQei6LpXPzAbfbsoNjVN35P60QcqqHyCIA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.15.0", + "rev": "v8.17.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index f8ff770ad0a5..c06d1a1d2dc3 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "act"; - version = "0.2.88"; + version = "0.2.89"; src = fetchFromGitHub { owner = "nektos"; repo = "act"; tag = "v${finalAttrs.version}"; - hash = "sha256-/nkaJlB2opuScXb8+Jo9rXdYN1Pwc+nq+T05Y4yxcCI="; + hash = "sha256-K3+JJHadA/+aayI5XtGBLgFRbCuu6Uilm45kumnlZUw="; }; - vendorHash = "sha256-z7FX2hrF4DkmHu0K9Atc76pa+PPLylimpoWhQCeF5uA="; + vendorHash = "sha256-Gp4Bxq0n1gmqHwrggSonMsFbWMVeCIgeVKY1U1Oe6lU="; doCheck = false; diff --git a/pkgs/by-name/am/amnezia-vpn-bin/package.nix b/pkgs/by-name/am/amnezia-vpn-bin/package.nix index ed9b55ff33b9..3b20917737ae 100644 --- a/pkgs/by-name/am/amnezia-vpn-bin/package.nix +++ b/pkgs/by-name/am/amnezia-vpn-bin/package.nix @@ -29,13 +29,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn-bin"; - version = "4.8.15.4"; + version = "4.8.16.0"; __structuredAttrs = true; src = fetchzip { url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar"; - hash = "sha256-Dr8zuzgwMAPXOTh69URFvA7EzGMnfBFO6kPhjhtjr6A="; + hash = "sha256-0gffxBD0pNsyTvqAFdYdjI8rzCkyaXHOApSCu4waP7s="; }; strictDeps = true; diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 0940ab2ea90a..978c9f35a0ee 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.2.14"; + version = "1.2.15"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-+yvQK6mrDT9MOeJsEJp4maycz6jpyAnGkc4QddaCbDo="; + hash = "sha256-/Y5JqCCqbP+5Of4K6+Bdag9lLKiY/SJiz6x3W6gQnDE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-ITxeRtPJmLEqD8BundfWdQO10XGHaElL2vpYFSM24pQ="; + vendorHash = "sha256-cp29oB3YcqQljeLq4ySOMhV+CXYnQ+ZnDljHn0UzmWs="; excludedPackages = [ "internal/gen-jsonschema" diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index 202043dd687b..c368c38e6a43 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.10.8"; + version = "7.11.1"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-h7/OGylN2FOC5ESsOV4JHVFZjG7Qv7JHOVlfqqpSWbE="; + hash = "sha256-GsE8UtER5KDIlVA36uFVoKPsX2pJNwotKtaizZH33t0="; }; proxyVendor = true; - vendorHash = "sha256-FzA58f2aBNs3OG+o0XpKiAbwe7w3GsBTo7h83gkfRSE="; + vendorHash = "sha256-spGYYxSeAfbOy+ze854IBBxxv07jnmE9rNGGqenkkCw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index ff56773dbfbf..079a9ed5233a 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -18,13 +18,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.43.1"; + version = "1.44.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xshe0EvsGhtP8ffoo6yV9iY9YZy1krJjnVUmYouSpAM="; + hash = "sha256-/Rv5la54ikmP4qVT19tg0sv0kM+xpQO6w9XU1PpGFk4="; }; outputs = [ diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 13760fbca9e7..0e0b28dbebbe 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.2.530"; + version = "3.2.533"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-Vb9dtlw/fiDRVZ7Mc8RaXvzu6aKQaCiCJHMdIyo4AHY="; + hash = "sha256-WuHmMqtDcivwsZpvZB5wQuKWm5BoDSX4LGJEW7oKJrA="; }; pythonRelaxDeps = [ @@ -96,6 +96,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { docker dockerfile-parse dpath + ecdsa flake8 gitpython igraph diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 0cbef07a654c..7f3a2ec9ba89 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,23 +8,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "7.1.5"; + version = "7.2.1"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-TREBriuK7k3ZBDkdQ5gGdptWCG/5UOdhoWcOj1Ppd/8="; + hash = "sha256-B6bMuy/EEveYtQtGBO5CNeEUlPK8eQ412k+SwlRPm2M="; }; sourceRoot = "${finalAttrs.src.name}/actix"; postPatch = '' - substituteInPlace src/{main.rs,services.rs} \ + substituteInPlace src/{main.rs,services/get.rs,services/utils.rs} \ --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-S+fWxhPRB+JZPjWQkww9VYtYfc9vnXCZgUZTu+ND1So="; + cargoHash = "sha256-9EVGsOipx9ObygpM37iZYLnhYjSMHFhHTDvjHkLWLz8="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index 2a7913a09ba1..89504db1a450 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.25.5"; + version = "2.25.6"; dontConfigure = true; dontBuild = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-pD8F2VoWQELKYP/fT2jKr0k4+mq0ZF7/fxyDdlG9JYA="; + hash = "sha256-1VLmiheNtN6EkPZfgP35hnAiIKhpnuFhigQd6W5DbxU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index cdd09acb65e1..923b36d20808 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "coroot"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${finalAttrs.version}"; - hash = "sha256-TF1Z4IXXTGWkx6oH3MAE+I1AJ+jO7X8Py9lMQwritMc="; + hash = "sha256-FntRLdYazY/FeZrOp+DEV3eaaVhn5hxlE4dkUGbemTc="; }; vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI="; diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index 70308be430b2..e28db468f5ae 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "ctlptl"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "ctlptl"; rev = "v${finalAttrs.version}"; - hash = "sha256-4c/sEWzKhs0PjHmZzVs8jXdWe2GWHYNFGsA9cQF5tOI="; + hash = "sha256-/E1E3agKPYIgBjhUDGr2eKmoWH3tAbx+eSQRnDja2k0="; }; - vendorHash = "sha256-nlLx2+NdhqkhpwM7E5PwKcFW+MsJLeSoXWRdtQjFV4Q="; + vendorHash = "sha256-uARktb9Umo/SkJ8UvbOZhNSYb2ooXFybHhtY4xIVSFs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 206dc5016818..dd69197b546b 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.0.7"; + version = "4.2.2"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-PWuynBFOp4A/0AC5Lc5zAkb5Y5DWJgdZHtDc/douYQc="; + hash = "sha256-8oShyf4TfHjPG/yxK1sbZA5gHyqOQYqfoUEDQlaJgU0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-jU/XnX6i6P1CWWWyUeVXt2q2PXMExDvmPTiLBOEuHcE="; + hash = "sha256-5a2ypu6A4WOGdcm6HlvuzuCEgq3szd64zqTp/rmnjh4="; }; passthru = { diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index 25e7b521c0c3..6759f7a75446 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "doctl"; - version = "1.160.0"; + version = "1.160.1"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { owner = "digitalocean"; repo = "doctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-LXALzs5oubT1uL+sgA0LsaoFbir3e8JYVlIiJv6U5J4="; + hash = "sha256-M+DBJfUXymlzY9DJeyHl3SPaCIKCT2iN/I4rd3uyQbQ="; }; meta = { diff --git a/pkgs/by-name/ec/ecsk/package.nix b/pkgs/by-name/ec/ecsk/package.nix index 9f0ea9cc0588..bc3e2eba6411 100644 --- a/pkgs/by-name/ec/ecsk/package.nix +++ b/pkgs/by-name/ec/ecsk/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "ecsk"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "yukiarrr"; repo = "ecsk"; tag = "v${finalAttrs.version}"; - hash = "sha256-1nrV7NslOIXQDHsc7c5YfaWhoJ8kfkEQseoVVeENrHM="; + hash = "sha256-wCv3wyD2KM4Jzawd6Z4JFLCafsDp0W40ygbB05h7r0I="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 3fd9058e81e3..066bbe64a063 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.308.0"; + version = "0.308.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-phrTg6P/sLb3lKTVF+PBH4EGfOQ57dpt3ZfLxZ6EOew="; + hash = "sha256-MsNDWTv6CDQfQMA9miImvGkQeJnsh6/zYtAcQJjHaF4="; }; vendorHash = "sha256-UI1WyTDJA5GRgt8TmpMQi4DmYzfQFGhDd5WeitT8VnI="; @@ -40,7 +40,7 @@ buildGo126Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-zMZAwO/2cch03myTGK+4sDwrEJhQzJJ8TwEg1lwxH0c="; + hash = "sha256-ypBg2TQ3qbc8cIBfFqICbNSCsIdokOtaFOqFD9bnMQM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index 6fe5354cea0d..d9a84112c608 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.4.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Gepetto"; repo = "example-robot-data"; tag = "v${finalAttrs.version}"; - hash = "sha256-HnI1EaTSqk7mbihwFTgnMxgPZxMSYnAwaCLEXS3LUbE="; + hash = "sha256-oQk6mJ1lOTcWrTWLViVQWk+R6DdcnLSigxKuXgpLhs0="; }; outputs = [ diff --git a/pkgs/by-name/fi/filebot/package.nix b/pkgs/by-name/fi/filebot/package.nix index c3b464be5852..b452a57095f3 100644 --- a/pkgs/by-name/fi/filebot/package.nix +++ b/pkgs/by-name/fi/filebot/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-OcXXKaZcBuP584SJWeQB+aaxO0kih6Oiud0Vm8e9kPo="; + hash = "sha256-1LYFc76wQOnmlkdGjE7ZuRh4FeM2o8ZM4sfDwx8hyBc="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/by-name/fo/fosrl-gerbil/package.nix b/pkgs/by-name/fo/fosrl-gerbil/package.nix index 6795a2c62b3e..e602d599da8a 100644 --- a/pkgs/by-name/fo/fosrl-gerbil/package.nix +++ b/pkgs/by-name/fo/fosrl-gerbil/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gerbil"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "gerbil"; tag = finalAttrs.version; - hash = "sha256-SKpXWlpMkmo5Qwdi/MylqNIBvP4jEHSZfP5BjQD1nVs="; + hash = "sha256-wKqJfiCzmMbKZXJGB7BWoXRNDukc4t+PX60XyynJNAU="; }; - vendorHash = "sha256-k5G8mkqrezRYY2lH1kbMMcW8GsUkyDaPglLEAzJIxYo="; + vendorHash = "sha256-S5olgsmX0uZR9P/u/8Rf3lzRCSIwPDcmlvSzJhhJM3w="; # patch out the /usr/sbin/iptables postPatch = '' diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix index 8b590cdfea62..d5b8ca952bbc 100644 --- a/pkgs/by-name/gh/gh-ost/package.nix +++ b/pkgs/by-name/gh/gh-ost/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "gh-ost"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; tag = "v${finalAttrs.version}"; - hash = "sha256-wnHPFPA0ql6KWN9+ZvzIdXwaAhFdBc94UJK7+4no1NU="; + hash = "sha256-1QdGPAvQgh533oAFwVxtGKPGJ7rfq7tG/zy8VUqJLq0="; }; vendorHash = null; diff --git a/pkgs/by-name/gi/git-relevant-history/package.nix b/pkgs/by-name/gi/git-relevant-history/package.nix index fdf6d189b3bc..1e89e2796883 100644 --- a/pkgs/by-name/gi/git-relevant-history/package.nix +++ b/pkgs/by-name/gi/git-relevant-history/package.nix @@ -10,14 +10,18 @@ python3.pkgs.buildPythonApplication { pname = "git-relevant-history"; version = "1.0.0-unstable-2022-09-15"; - format = "setuptools"; + pyproject = true; + src = fetchFromGitHub { owner = "rainlabs-eu"; repo = "git-relevant-history"; rev = "84552324d7cb4790db86282fc61bf98a05b7a4fd"; hash = "sha256-46a6TR1Hi3Lg2DTmOp1aV5Uhd4IukTojZkA3TVbTnRY="; }; - propagatedBuildInputs = [ + + build-system = [ python3.pkgs.setuptools ]; + + dependencies = [ git git-filter-repo python3.pkgs.docopt diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 71b8cd016284..2a053dcca345 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "1.0.5"; + version = "1.1.2"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-NVC6geIzaSyz1uTwTQO1awMBdVEuuQMB2csAfUjMvsw="; + hash = "sha256-/Wf0p3Ug3fxtXhvfab+ZSPe0XlGlWC0ujxkMb52D+oM="; }; - vendorHash = "sha256-+ybGV37fjJ5eZjxTb+SUnJ52J20XizJL8WjoM16Rabg="; + vendorHash = "sha256-J1hC4hdEKLENXLJrsyV41TaJ9+2CuPz5KoIMm2mXvTE="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index b41ae97b3f66..869241bdc43a 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "glooctl"; - version = "1.21.6"; + version = "1.21.7"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${finalAttrs.version}"; - hash = "sha256-KZh0ZUCZ5zUJRmt/JpfqowADrjuGgK27XoIJ/1TBgzA="; + hash = "sha256-bEFf6paNWstNftUZ3YDKkZmfSp4y4Q3k64p8r1yxzw4="; }; vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg="; diff --git a/pkgs/by-name/go/gocryptfs/0001-mount.go-try-fusermount3-suid-wrapper-and-fallback-t.patch b/pkgs/by-name/go/gocryptfs/0001-mount.go-try-fusermount3-suid-wrapper-and-fallback-t.patch new file mode 100644 index 000000000000..9b33ff97f23e --- /dev/null +++ b/pkgs/by-name/go/gocryptfs/0001-mount.go-try-fusermount3-suid-wrapper-and-fallback-t.patch @@ -0,0 +1,43 @@ +From ac51f09a9e1a1307ebaf38ffab66eb729cf1b0a5 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Tue, 2 Jun 2026 20:17:25 +0200 +Subject: [PATCH] mount.go: try fusermount3 suid wrapper and fallback to + fusermount from $PATH + +On NixOS, we want to use the fusermount3 suid wrapper to allow mounting +as non-root user. + +We still want to try fusermount from `$PATH` to work on non-NixOS, and +keep the /bin/fusermount fallback as a last resort. +--- + mount.go | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/mount.go b/mount.go +index 2508409..defc967 100644 +--- a/mount.go ++++ b/mount.go +@@ -526,14 +526,16 @@ func initGoFuse(rootNode fs.InodeEmbedder, args *argContainer) *fuse.Server { + + // haveFusermount2 finds out if the "fusermount" binary is from libfuse 2.x. + func haveFusermount2() bool { +- path, err := exec.LookPath("fusermount") +- if err != nil { +- path = "/bin/fusermount" ++ path := "/bin/fusermount" ++ if _, err := os.Stat("/run/wrappers/bin/fusermount3"); err == nil { ++ path = "/run/wrappers/bin/fusermount3" ++ } else if newPath, err := exec.LookPath("fusermount"); err == nil { ++ path = newPath + } + cmd := exec.Command(path, "-V") + var out bytes.Buffer + cmd.Stdout = &out +- err = cmd.Run() ++ err := cmd.Run() + if err != nil { + tlog.Warn.Printf("warning: haveFusermount2: %v", err) + return false +-- +2.53.0 + diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index 04de5bd09ea1..7411469c34bb 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - fuse, makeWrapper, openssl, pandoc, @@ -22,6 +21,8 @@ buildGoModule (finalAttrs: { sha256 = "sha256-uQLFcabN418m1dvogJ71lJeTF3F9JycK/8qCPaXblSU="; }; + patches = [ ./0001-mount.go-try-fusermount3-suid-wrapper-and-fallback-t.patch ]; + vendorHash = "sha256-dvOROh5TsMl+52RvKmDG4ftNv3WF19trgttu5BGWktU="; nativeBuildInputs = [ @@ -56,11 +57,7 @@ buildGoModule (finalAttrs: { popd ''; - # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, - # as the setuid wrapper is required to use gocryptfs as non-root on NixOS postInstall = '' - wrapProgram $out/bin/gocryptfs \ - --suffix PATH : ${lib.makeBinPath [ fuse ]} ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs ''; diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix index f6908eaf64d2..43f69758bd40 100644 --- a/pkgs/by-name/go/gogup/package.nix +++ b/pkgs/by-name/go/gogup/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gogup"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "nao1215"; repo = "gup"; rev = "v${finalAttrs.version}"; - hash = "sha256-ptLWQdafFo1zpcgzW0c3C9t8MKquE+fEUEQehSqA2MY="; + hash = "sha256-tkZt0lv3uy43EijCE+Lvgt2X4p1rB2SkZ4UfkJGYPbY="; }; - vendorHash = "sha256-2iPRWNbhXiaj3jZjWQeEl/hieIzJ3ePYh75rMWDh/pc="; + vendorHash = "sha256-lS7C/932cpaVUtXJ3tuZKyqDv4yT2RSG2NfQW5kcQrM="; doCheck = false; ldflags = [ diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 145eefc82620..e7a388c33bf9 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2026-03-28"; + version = "0.1-unstable-2026-05-29"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "b3c2a094163cad4aac7af09333fddf2c9838c348"; - hash = "sha256-xr3Ih1HrAIlO9GGrmnVrmRh50GSPMWI4QWmbEwlbYq8="; + rev = "bf1a7cdb086587e6bed6e8ecd285a81c01a11c54"; + hash = "sha256-epTJKmTCNL1Hm6/YdEWAgiOMVBSzC9/v/rjyOieP3yA="; }; strictDeps = true; diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 1de10cf63b80..5420bd567024 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.17.15"; + version = "0.17.16"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-NuSoLULwS634FPLr8bvcLXIIO3zL9nSFcMkjriuE6G8="; + hash = "sha256-M1aaY32ykfzKGkH1D8U8yBeEPEM20IWuJHUiHIj9IPE="; }; - vendorHash = "sha256-mGsV453mv36Gw5XtLRcBlhXkOpXDLGS3bEpt8oZeb1M="; + vendorHash = "sha256-ZNKNsiiCHlEp5JVVwHTvQLgxBNWIFAgI8vpYGOCb0RY="; tags = [ "sqlite" ]; diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 73eb820388ba..eb495ef79e5d 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "httm"; - version = "0.49.9"; + version = "0.50.0"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = finalAttrs.version; - hash = "sha256-Y0WYgi/VdGjE70XZcJD7G+ONCSq2YXpX9/RyijPW3kc="; + hash = "sha256-+19Xu42Tp0WkhdmhfFOAbSrTZ3SSQRgbOQwZY8KrFJg="; }; - cargoHash = "sha256-CSwfwW5ChnvrtN+zl2DdAPHDJCL3RSQHlBT2xWt+KCc="; + cargoHash = "sha256-HdYBWbyl5FSOf/hgtXV3BbjpXfrM/6EJpDese5hBNzk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 18819ba24078..517edd60530e 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyfetch"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; tag = finalAttrs.version; - hash = "sha256-vrTmjg6CZczImueN3JxKg1vYXAaEDYHYG7UaZeupYPU="; + hash = "sha256-/aOVgl93n9IL5lDzY1REg88BXhlqtDDjrZnkD4rQ9aw="; }; - cargoHash = "sha256-SieVB0zwer9Ksio3l87gUZkVJMwb+Da/NjBi5f57tJc="; + cargoHash = "sha256-uTIzLY5H+zoCsC/YalA0ImnJ817KhU5sXHWkbvWEfVk="; nativeBuildInputs = [ installShellFiles @@ -59,7 +59,9 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckKeepEnvironment = [ "PATH" ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ]; + }; meta = { description = "Neofetch with LGBTQ+ pride flags"; @@ -81,6 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { isabelroses nullcube defelo + Misaka13514 ]; }; }) diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix index de670bd7c06f..d3d81b23e81a 100644 --- a/pkgs/by-name/ii/iio-niri/package.nix +++ b/pkgs/by-name/ii/iio-niri/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iio-niri"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Zhaith-Izaliel"; repo = "iio-niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-foE+bPJANKWmPSt3s8BOqEIXGZoFNWRJT731xf5sr1M="; + hash = "sha256-EwilbkL1cMH8l63Cm5eikVKc+YndsYsaYJxhCNJgz6M="; }; - cargoHash = "sha256-y3Sv3JWg252XbuIqEioNagaQ99Vr9x1OfrFC6Jl4kSY="; + cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 9c41fb24822c..8c488ba81487 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.2"; + version = "0.77.3"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-QxGDmuRTZLHBqZ+S73CtNKdLg/XumutGSpTSz4sGFYQ="; + hash = "sha256-lcv61lzZ45vNDdFdlnJOQW/mIN8KdsAEAUsoNuuhLM0="; }; - cargoHash = "sha256-EtCK/zYRW2LdZhPSrO6ydBXBQwIrkqaJmH+3XfwERTw="; + cargoHash = "sha256-VrzePyiBWAWy+IC9QWi5vooAp2+SwuzT3n+SMG/Ntas="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix index 623131b2279e..b27ef7717856 100644 --- a/pkgs/by-name/ju/jugglinglab/package.nix +++ b/pkgs/by-name/ju/jugglinglab/package.nix @@ -81,7 +81,7 @@ maven.buildMavenPackage rec { ''; meta = { - description = "Program to visualize different juggling pattens"; + description = "Program to visualize different juggling patterns"; homepage = "https://jugglinglab.org/"; license = lib.licenses.gpl2Only; mainProgram = "jugglinglab"; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index 72218e592970..4a1757da4311 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-f9hjo3B4q2WBl0j86fHny8bYUqldYSC0pP4uoWOI8Zk="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - mv *.ttf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Monospaced font for scientific and technical computing"; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/by-name/kr/kronometer/package.nix similarity index 76% rename from pkgs/tools/misc/kronometer/default.nix rename to pkgs/by-name/kr/kronometer/package.nix index bc24c8869673..c69f64ff6d75 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/by-name/kr/kronometer/package.nix @@ -3,13 +3,8 @@ stdenv, lib, cmake, - extra-cmake-modules, - kdoctools, - wrapQtAppsHook, - kconfig, - kcrash, - kwidgetsaddons, - kxmlgui, + kdePackages, + qt6, }: stdenv.mkDerivation { @@ -26,16 +21,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules - kdoctools - wrapQtAppsHook + kdePackages.extra-cmake-modules + kdePackages.kdoctools + qt6.wrapQtAppsHook ]; buildInputs = [ - kconfig - kcrash - kwidgetsaddons - kxmlgui + kdePackages.kconfig + kdePackages.kcrash + kdePackages.kwidgetsaddons + kdePackages.kxmlgui ]; meta = { diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix index 438c922eba3f..1a9af47f754b 100644 --- a/pkgs/by-name/ku/kulala-core/package.nix +++ b/pkgs/by-name/ku/kulala-core/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "kulala-core"; - version = "0.7.0"; + version = "0.13.0"; strictDeps = true; __structuredAttrs = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "mistweaverco"; repo = "kulala-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-zY/Yg/1s/pyyuKxtUa2cIzLCraSNSzpPMBx9EbGIIGI="; + hash = "sha256-pUBG8tlybpd/YPArIssCEy5Op47MVPLJsOOolVItZpU="; }; node_modules = stdenv.mkDerivation { @@ -78,11 +78,13 @@ stdenv.mkDerivation (finalAttrs: { cp -R ${finalAttrs.node_modules}/node_modules . echo '{ "version": "${finalAttrs.version}" }' > packages/core/version.json - bun build src/cli.ts \ - --define __KULALA_EMBED_CURL__=false \ - --target bun \ - --outfile dist/kulala-core.js \ - --cwd packages/core + ( + cd packages/core + bun build src/cli.ts \ + --target=bun \ + --outdir=dist \ + --asset-naming='[name].[ext]' + ) runHook postBuild ''; @@ -90,7 +92,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm644 packages/core/dist/kulala-core.js $out/lib/kulala-core/kulala-core.js + install -Dm644 packages/core/dist/cli.js $out/lib/kulala-core/kulala-core.js + install -Dm644 packages/core/dist/liblua5.1.wasm $out/lib/kulala-core/liblua5.1.wasm makeWrapper ${lib.getExe bun} $out/bin/kulala-core \ --add-flags $out/lib/kulala-core/kulala-core.js \ --set KULALA_CURL_PATH ${lib.getExe curl} diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index 9a79af2c7ed8..6b3d517d7659 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -35,6 +35,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; + checkFlags = [ + # This tests checks the output of `jj diff`. However, `jj diff` had a change upstream making the test fail. Skip for now, until the test is updated. + "--skip=commander::files::tests::get_file_diff" + ]; + meta = { description = "TUI for Jujutsu/jj"; homepage = "https://github.com/Cretezy/lazyjj"; diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix index 4ac898aff051..180d130f621a 100644 --- a/pkgs/by-name/li/librepods/package.nix +++ b/pkgs/by-name/li/librepods/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "librepods"; - version = "0.2.0"; + version = "0.2.5"; src = fetchFromGitHub { owner = "kavishdevar"; repo = "librepods"; tag = "v${finalAttrs.version}"; - hash = "sha256-nLRbVnm+4jr7yH6e/BsygkC4kOx1PJNy6jU5ioe2c54="; + hash = "sha256-6l1WjwjDbv5e3tDaWo9+XSEjr9ge/hKysIkeUqyiO4U="; }; sourceRoot = "source/linux"; diff --git a/pkgs/by-name/li/libtrace/package.nix b/pkgs/by-name/li/libtrace/package.nix index 64786e976743..53e63fa75f5a 100644 --- a/pkgs/by-name/li/libtrace/package.nix +++ b/pkgs/by-name/li/libtrace/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtrace"; - version = "4.0.31-1"; + version = "4.0.32-2"; src = fetchFromGitHub { owner = "LibtraceTeam"; repo = "libtrace"; tag = finalAttrs.version; - hash = "sha256-QsqJquBnhRf7OBOs6eWFo9WFF9J2Bw4zbX1/ooN43Xw="; + hash = "sha256-cqRhTNSXvNlZW63baxqcqVJJEVe8SeunTPdJ623kIvo="; }; strictDeps = true; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 61977a5e4d1f..885c64f795f8 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.3.1"; + version = "12.3.2"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-orkotxbusV4giozDLkUZuLZAHNS4GZnfj+EXi5tSRWU="; + hash = "sha256-xQUoMQbq3fpbvFbYwbHPMz0SZU3LN/gOaF01duhwKGU="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lu/luwen/Cargo.lock b/pkgs/by-name/lu/luwen/Cargo.lock deleted file mode 100644 index f6fd71ccfe86..000000000000 --- a/pkgs/by-name/lu/luwen/Cargo.lock +++ /dev/null @@ -1,2210 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.59.0", -] - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - -[[package]] -name = "ascii" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitfield-struct" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc0846593a56638b74e136a45610f9934c052e14761bebca6b092d5522599e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" - -[[package]] -name = "bytemuck" -version = "1.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441473f2b4b0459a68628c744bc61d23e730fb00128b841d30fa4bb3972257e4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "bytes" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" - -[[package]] -name = "cbindgen" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975982cdb7ad6a142be15bdf84aea7ec6a9e5d4d797c004d43185b24cfe4e684" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 2.0.104", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" - -[[package]] -name = "check_harvesting" -version = "0.7.10" -dependencies = [ - "clap", - "luwen-core", - "luwen-if", - "luwen-ref", - "prometheus", - "prometheus_exporter", - "ttkmd-if", -] - -[[package]] -name = "chunked_transfer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" - -[[package]] -name = "clap" -version = "4.5.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "clap_lex" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" - -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - -[[package]] -name = "console" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width", - "windows-sys 0.59.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "create-ethernet-map" -version = "0.7.10" -dependencies = [ - "clap", - "luwen-core", - "luwen-if", - "luwen-ref", - "prometheus", - "prometheus_exporter", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "deranged" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.60.2", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "drunken-monkey" -version = "0.7.10" -dependencies = [ - "clap", - "luwen-if", - "luwen-ref", -] - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[package]] -name = "errno" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" -dependencies = [ - "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "fixedbitset" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", -] - -[[package]] -name = "hashbrown" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "icu_collections" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" -dependencies = [ - "displaydoc", - "potential_utf", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" - -[[package]] -name = "icu_properties" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "potential_utf", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" - -[[package]] -name = "icu_provider" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" -dependencies = [ - "displaydoc", - "icu_locale_core", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indexmap" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", - "web-time", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "inventory" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83" -dependencies = [ - "rustversion", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.174" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" - -[[package]] -name = "libredox" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" -dependencies = [ - "bitflags 2.9.1", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - -[[package]] -name = "litemap" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" - -[[package]] -name = "lock_api" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "luwen" -version = "0.7.13" -dependencies = [ - "bincode", - "clap", - "luwen-core", - "luwen-if", - "luwen-ref", - "nom", - "rand", - "serde", - "serde_json", - "serde_yaml", - "ttkmd-if", -] - -[[package]] -name = "luwen-core" -version = "0.2.1" -dependencies = [ - "thiserror 1.0.69", -] - -[[package]] -name = "luwen-if" -version = "0.7.11" -dependencies = [ - "bincode", - "bitfield-struct", - "bytemuck", - "home", - "luwen-core", - "num-derive", - "num-traits", - "once_cell", - "prost", - "prost-build", - "prost-types", - "rust-embed", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "luwen-ref" -version = "0.7.11" -dependencies = [ - "indicatif", - "luwen-core", - "luwen-if", - "thiserror 1.0.69", - "tracing", - "ttkmd-if", -] - -[[package]] -name = "luwencpp" -version = "0.7.10" -dependencies = [ - "cbindgen", - "cc", - "luwen-core", - "luwen-if", - "tempfile", -] - -[[package]] -name = "memchr" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "multimap" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "once_cell_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "parking_lot" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "portable-atomic" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" - -[[package]] -name = "potential_utf" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" -dependencies = [ - "zerovec", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "prettyplease" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" -dependencies = [ - "proc-macro2", - "syn 2.0.104", -] - -[[package]] -name = "proc-macro2" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "procfs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" -dependencies = [ - "bitflags 2.9.1", - "hex", - "lazy_static", - "procfs-core", - "rustix 0.38.44", -] - -[[package]] -name = "procfs-core" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" -dependencies = [ - "bitflags 2.9.1", - "hex", -] - -[[package]] -name = "prometheus" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" -dependencies = [ - "cfg-if", - "fnv", - "lazy_static", - "libc", - "memchr", - "parking_lot", - "procfs", - "protobuf", - "thiserror 1.0.69", -] - -[[package]] -name = "prometheus-exporter" -version = "0.7.10" -dependencies = [ - "clap", - "luwen-core", - "luwen-if", - "luwen-ref", - "prometheus", - "prometheus_exporter", -] - -[[package]] -name = "prometheus_exporter" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf17cbebe0bfdf4f279ef84eeefe0d50468b0b7116f078acf41d456e48fe81a" -dependencies = [ - "ascii", - "lazy_static", - "log", - "prometheus", - "thiserror 1.0.69", - "tiny_http", -] - -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck", - "itertools", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 2.0.104", - "tempfile", -] - -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost", -] - -[[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - -[[package]] -name = "pyluwen" -version = "0.7.11" -dependencies = [ - "luwen-core", - "luwen-if", - "luwen-ref", - "pyo3", - "serde_json", - "ttkmd-if", -] - -[[package]] -name = "pyo3" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" -dependencies = [ - "cfg-if", - "indoc", - "inventory", - "libc", - "memoffset 0.9.1", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.16", -] - -[[package]] -name = "redox_syscall" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" -dependencies = [ - "bitflags 2.9.1", -] - -[[package]] -name = "redox_users" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 2.0.12", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reset" -version = "0.7.10" -dependencies = [ - "clap", - "luwen-core", - "luwen-if", - "luwen-ref", - "prometheus", - "prometheus_exporter", - "ttkmd-if", -] - -[[package]] -name = "rust-embed" -version = "8.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "shellexpand", - "syn 2.0.104", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594" -dependencies = [ - "sha2", - "walkdir", -] - -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustix" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.60.2", -] - -[[package]] -name = "rustversion" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "serde_json" -version = "1.0.142" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shellexpand" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" -dependencies = [ - "dirs", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tempfile" -version = "3.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" -dependencies = [ - "fastrand", - "getrandom 0.3.3", - "once_cell", - "rustix 1.0.8", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" -dependencies = [ - "thiserror-impl 2.0.12", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "time" -version = "0.3.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" - -[[package]] -name = "time-macros" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny_http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f8734c6d6943ad6df6b588d228a87b4af184998bcffa268ceddf05c2055a8c" -dependencies = [ - "ascii", - "chunked_transfer", - "log", - "time", - "url", -] - -[[package]] -name = "tinystr" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "toml" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_write", - "winnow", -] - -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "tracing-core" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" -dependencies = [ - "once_cell", -] - -[[package]] -name = "ttkmd-if" -version = "0.2.3" -dependencies = [ - "bitfield-struct", - "luwen-core", - "memmap2", - "nix", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "typenum" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-width" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "url" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.3", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - -[[package]] -name = "winnow" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" -dependencies = [ - "memchr", -] - -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] - -[[package]] -name = "writeable" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" - -[[package]] -name = "yoke" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "zerofrom" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", - "synstructure", -] - -[[package]] -name = "zerotrie" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix index 0a075faf559e..35dc01452d8d 100644 --- a/pkgs/by-name/lu/luwen/package.nix +++ b/pkgs/by-name/lu/luwen/package.nix @@ -6,25 +6,21 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "luwen"; - version = "0.7.14"; + version = "0.8.5"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "tenstorrent"; repo = "luwen"; tag = "v${finalAttrs.version}"; - hash = "sha256-KhkABISkR37MjEwgroVtywYNCxgfwXyM5LG2CIJhu3M="; + hash = "sha256-lY7cZ+8C0UEGGYxufl4Vi8g0L4AJFXaGqn7XE2ivTcQ="; }; - postUnpack = '' - cp ${./Cargo.lock} $sourceRoot/Cargo.lock - ''; - nativeBuildInputs = [ protobuf ]; - # Vendor a lockfile until upstream manages to consistently have checksums in their's. - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-QBGXbRiBk4WIQFopq1OccmUHgx5GzR/PKhMH4Ie+fyg="; meta = { description = "Tenstorrent system interface tools"; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 182e160c5919..e03046cbdc53 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -8,19 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "md-tui"; - version = "0.10.0"; + version = "0.10.1"; __structuredAttrs = true; - strictDeps = true; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZyCPaeY1fcUEx5LNHlp84BJ525BTeqiwLGxvGElWIVA="; + hash = "sha256-bFL84y0735L93x0nWkKAAmTDMdZzs5DDoxqbQhgXUMQ="; }; - cargoHash = "sha256-E/WW3LnD5qVJciyOYmAZSVBhXKRuTgEHbV0UHC18+Vw="; + cargoHash = "sha256-xR9bWWDxerP2zGAb43ZWONLcsbmUn8KzMXwDEmrjioU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 8bf165d0c899..7ff2f20eb38e 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.13.2"; + version = "2.13.4"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-5VfldFEPcYva6yKDolgs1ZzGSAkn3Caxk29sedniw58="; + hash = "sha256-Axd6zCAarhXUsT32ZTqcVKC/b2PwmZvIg5f9QNMREAI="; }; vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM="; diff --git a/pkgs/by-name/na/nanobench/fix-cmake-find_package.patch b/pkgs/by-name/na/nanobench/fix-cmake-find_package.patch new file mode 100644 index 000000000000..5e307db09b3e --- /dev/null +++ b/pkgs/by-name/na/nanobench/fix-cmake-find_package.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt 2026-02-25 19:30:35.568736249 -0800 ++++ b/CMakeLists.txt 2026-02-25 19:31:26.709567839 -0800 +@@ -124,6 +124,17 @@ + DESTINATION ${INSTALL_CONFIGDIR} + ) + ++ write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 4.3.11 ++ COMPATIBILITY SameMajorVersion ++ ) ++ ++ install(FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/nanobench" ++ ) ++ + # Install headers + install(FILES src/include/nanobench.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + else() diff --git a/pkgs/by-name/na/nanobench/package.nix b/pkgs/by-name/na/nanobench/package.nix index 4c09d1ff2479..fd689b079761 100644 --- a/pkgs/by-name/na/nanobench/package.nix +++ b/pkgs/by-name/na/nanobench/package.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/martinus/nanobench/pull/98/commits/17a1f0b598a09d399dd492c72bca5b48ad76c794.patch"; hash = "sha256-2lOD63qN7gywUQxrdSRVyddpzcQjjeWOrA3hqu7x+CY="; }) + + # Drop when https://github.com/martinus/nanobench/pull/134 is merged + # This is a slice of what that PR provides, it makes it possible for packages to do "find_package" + ./fix-cmake-find_package.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index eccd9bd55aef..77e7aecbadb6 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -4,31 +4,35 @@ lib, fetchFromGitHub, nixVersions, + pkg-config, boost, python3Packages, }: python3Packages.buildPythonPackage rec { pname = "nix-heuristic-gc"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; src = fetchFromGitHub { owner = "risicle"; repo = "nix-heuristic-gc"; tag = "v${version}"; - hash = "sha256-aTwILsqqlV0DEm9AhDKd6HCB022BbebPH/VwzDgzS4E="; + hash = "sha256-T/PKn005gkALJP2FfHfWJj5UIRP9IYkvMOT3+kMY3Wo="; }; # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - env.NIX_SYSTEM = nixVersions.nixComponents_2_30.nix-store.stdenv.hostPlatform.system; + env.NIX_SYSTEM = nixVersions.nixComponents_2_31.nix-store.stdenv.hostPlatform.system; buildInputs = [ boost - nixVersions.nixComponents_2_30.nix-store - nixVersions.nixComponents_2_30.nix-main + nixVersions.nixComponents_2_31.nix-store + nixVersions.nixComponents_2_31.nix-main python3Packages.pybind11 python3Packages.setuptools ]; + nativeBuildInputs = [ + pkg-config + ]; propagatedBuildInputs = [ python3Packages.humanfriendly python3Packages.rustworkx diff --git a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix index f25fcd8cd58a..f29317d050d8 100644 --- a/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "prometheus-klipper-exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "scross01"; repo = "prometheus-klipper-exporter"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2BJkSKchUkLbUJke+4nB49MFp8OPPcytYAhtxCEdXO4="; + sha256 = "sha256-TcGD7WjExo1/rgwVUSPmKFJEQZhttSgBIY3gKyfcwtQ="; }; - vendorHash = "sha256-8Y5o6Vh1Kn9CBG91qr1TQzyBHA0d31Femj9j1uW+4uk="; + vendorHash = "sha256-VebaCzdPGl0hOHRXvwZb4aDzXlDZ57v/QVYzuagvvOM="; doCheck = true; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 74f373c2f3a2..47409315b01b 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-es"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protobuf-es"; tag = "v${version}"; - hash = "sha256-fH/gp7+MU7W8FESJTr4do6FIqXpxS4v6fAxa4xc+vKw="; + hash = "sha256-+na4Gfnl+xfyeDO5r1WHgmG9SpDwamhfJvoFchAzhns="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-UW17BQoPv5sfQT52n6PBQrwArInDvQptneF3bgKEXTY="; + npmDepsHash = "sha256-6iof5DCyA+LLbWfFE/BuznUD87hT8jtmzKleVK5cnw8="; npmWorkspace = "packages/protoc-gen-es"; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index fb238781ef02..888e2a3cc9db 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.32.2"; + version = "0.33.0"; __structuredAttrs = true; strictDeps = true; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-VVMogg0mWBoev9oE4CSbv2caTTpcfkReTWA1tJ2n7RI="; + hash = "sha256-1jlZ+8jx1dNsWWrkQSyFAIK/VQNSotcyTknz0WhIaIc="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-6cL7pocqcMiw+D7R6LIcegP4tO9fUTgXQFG51n6rsU4="; + cargoHash = "sha256-3erI/kWTJ5Exl9QpGidsIizi0UWbudzMSzoscoSTmP8="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/rt/rtkit/package.nix b/pkgs/by-name/rt/rtkit/package.nix index 4d3b47ce87d8..11ecf56af993 100644 --- a/pkgs/by-name/rt/rtkit/package.nix +++ b/pkgs/by-name/rt/rtkit/package.nix @@ -9,7 +9,7 @@ dbus, libcap, polkit, - systemd, + systemdLibs, fetchpatch, nix-update-script, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { dbus libcap polkit - systemd + systemdLibs ]; mesonFlags = [ diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix index 8c1c00dd141d..6188a68aa15e 100644 --- a/pkgs/by-name/sa/sandbox-runtime/package.nix +++ b/pkgs/by-name/sa/sandbox-runtime/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { pname = "sandbox-runtime"; - version = "0.0.52"; + version = "0.0.54"; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { owner = "anthropic-experimental"; repo = "sandbox-runtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-EcRnx4j8YdBvhCNgWdfzvgP6SgvXQfqu8aNBjeM1YQM="; + hash = "sha256-mk+dd/vMuQPklbFhse35n+m/0Y90WxrLPqjXCFBLE78="; }; postPatch = @@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: { strictDeps = true; - npmDepsHash = "sha256-IFf65G1v3JtjjH7o8gS68VongLIP3WuKmD/om41yRts="; + npmDepsHash = "sha256-H4azrpaCxKZNQZPEC/xaKxpPzwK19/ZhQlzYKsrDHWY="; postFixup = let diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 00630fc6935d..41bb1150570c 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "sish"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = "sish"; tag = "v${finalAttrs.version}"; - hash = "sha256-sLryMoGnxTinMsf4DXyM37MjZ5TaJI+ldYxKiCB6ny0="; + hash = "sha256-8C4Xh9OX5pmaQ12Guu3y/jw8nIfy6DV0nduAH6hlImM="; }; - vendorHash = "sha256-3Imp9g0/Ory7ECw4pkrIltau9G1Aw3uRP5A+zWCz0mE="; + vendorHash = "sha256-U+gMlfDTEt9//SRLJA5yx/VZhwFGuMpTCnCfw9Nck+0="; ldflags = [ "-s" diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index 151811fe2962..00c2ba918d7a 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "tofu-ls"; - version = "0.4.2"; + version = "0.5.0"; __structuredAttrs = true; @@ -16,10 +16,10 @@ buildGoModule (finalAttrs: { owner = "opentofu"; repo = "tofu-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-B7y22tmD8PLO4FRI0rskffRQAZu8Kvi8TyzmjCYsWs8="; + hash = "sha256-v6oqCRsiTAOGqhVZD6Zwhq0/bSl55PhH9+aEYxjlQcA="; }; - vendorHash = "sha256-Uq/4rd3OvCBhp53MEMLiWL/V6hkygwdBLSN8Wzwqoew="; + vendorHash = "sha256-vugyEaOD7diOiymo9nDEfIez++mPYWq1qVj3a9wCqoc="; ldflags = [ "-s" diff --git a/pkgs/by-name/tr/trusttunnel-endpoint/package.nix b/pkgs/by-name/tr/trusttunnel-endpoint/package.nix new file mode 100644 index 000000000000..e1266df50626 --- /dev/null +++ b/pkgs/by-name/tr/trusttunnel-endpoint/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + boringssl, + cacert, + python3, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "trusttunnel-endpoint"; + version = "1.0.33"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "TrustTunnel"; + repo = "TrustTunnel"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uTAjZbPBCVucjjrl3cYCT6+6cSxiIe/Q3jm+Oa+Fl7E="; + }; + + cargoHash = "sha256-njQL6YtnRtfpyvsxoTmsSILvyKwYqg42DXsZ8zkhBWo="; + + postPatch = '' + substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs $cargoDepsCopy/*/quiche-*/src/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \ + --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl" + ''; + + env = { + BORING_BSSL_PATH = boringssl; + BORING_BSSL_INCLUDE_PATH = "${boringssl.dev}/include"; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + buildInputs = [ + boringssl + ]; + + nativeCheckInputs = [ + cacert + python3 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern, fast and obfuscated VPN protocol - endpoint component"; + homepage = "https://github.com/TrustTunnel/TrustTunnel"; + changelog = "https://github.com/TrustTunnel/TrustTunnel/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ k900 ]; + mainProgram = "trusttunnel_endpoint"; + }; +}) diff --git a/pkgs/by-name/tt/tt-logger/fix-install.patch b/pkgs/by-name/tt/tt-logger/fix-install.patch new file mode 100644 index 000000000000..caa7ff5ee80a --- /dev/null +++ b/pkgs/by-name/tt/tt-logger/fix-install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3c7ca3..927e11c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,8 +41,9 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.23) + INTERFACE + FILE_SET api + TYPE HEADERS +- BASE_DIRS ${CMAKE_INSTALL_INCLUDEDIR} +- FILES ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/tt-logger.hpp ++ BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ++ FILES ++ include/${PROJECT_NAME}/tt-logger.hpp + ) + endif() + diff --git a/pkgs/by-name/tt/tt-logger/package.nix b/pkgs/by-name/tt/tt-logger/package.nix new file mode 100644 index 000000000000..8b5600377b6a --- /dev/null +++ b/pkgs/by-name/tt/tt-logger/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + ninja, + pkg-config, + fmt_11, + spdlog, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tt-logger"; + version = "1.1.9"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-logger"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Vd/FwjcNZWh/FnP5CwXO4UQtKTq/6GhRSppCYJMj9d4="; + }; + + cpm = fetchurl { + url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.2/CPM.cmake"; + hash = "sha256-yM3DLAOBZTjOInge1ylk3IZLKjSjENO3EEgSpcotg10="; + }; + + patches = [ + # https://github.com/tenstorrent/tt-logger/pull/27 + ./fix-install.patch + ]; + + postPatch = '' + cp $cpm cmake/CPM.cmake + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + fmt_11 + spdlog + ]; + + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES_ONLY" true) + (lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true) + (lib.cmakeBool "TT_LOGGER_INSTALL" true) + ]; + + meta = { + description = "Flexible and performant C++ logging library for Tenstorrent projects"; + homepage = "https://github.com/tenstorrent/tt-logger"; + maintainers = with lib.maintainers; [ RossComputerGuy ]; + license = with lib.licenses; [ asl20 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix index 9fced72b8bfd..912e59170ec4 100644 --- a/pkgs/by-name/tt/tt-smi/package.nix +++ b/pkgs/by-name/tt/tt-smi/package.nix @@ -4,17 +4,19 @@ fetchFromGitHub, pre-commit, versionCheckHook, + tt-umd, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tt-smi"; - version = "3.0.30"; + version = "5.2.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-smi"; tag = "v${finalAttrs.version}"; - hash = "sha256-C6CfcS0H3rFew/Y1uhmzICdFp1UYU7H9h3YPeAKlcbE="; + hash = "sha256-meDqvDvGBXx/zbHbtgLUb+Kv8LSmsu9OvYCFhmEPAdQ="; }; build-system = with python3Packages; [ @@ -33,8 +35,11 @@ python3Packages.buildPythonApplication (finalAttrs: { tt-tools-common setuptools tomli + tt-umd ]; + pythonRelaxDeps = [ "tt-umd" ]; + nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/tt/tt-umd/fix-targets.patch b/pkgs/by-name/tt/tt-umd/fix-targets.patch new file mode 100644 index 000000000000..df35f4d8a650 --- /dev/null +++ b/pkgs/by-name/tt/tt-umd/fix-targets.patch @@ -0,0 +1,35 @@ +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 96d71990..1db71f88 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -43,6 +43,7 @@ CPMAddPackage( + "YAML_CPP_BUILD_TESTS OFF" + "YAML_CPP_BUILD_TOOLS OFF" + "YAML_BUILD_SHARED_LIBS OFF" ++ FIND_PACKAGE_ARGUMENTS GLOBAL + ) + + if(yaml-cpp_ADDED) +@@ -146,7 +147,13 @@ CPMAddPackage( + #################################################################################################################### + # tt-logger + #################################################################################################################### +-CPMAddPackage(NAME tt-logger GITHUB_REPOSITORY tenstorrent/tt-logger VERSION 1.1.8 SYSTEM YES) ++CPMAddPackage( ++ NAME tt-logger ++ GITHUB_REPOSITORY tenstorrent/tt-logger ++ VERSION 1.1.8 ++ SYSTEM YES ++ FIND_PACKAGE_ARGUMENTS GLOBAL ++) + + #################################################################################################################### + # cxxopts +@@ -159,6 +166,7 @@ CPMAddPackage( + SYSTEM YES + OPTIONS + "CMAKE_MESSAGE_LOG_LEVEL NOTICE" ++ FIND_PACKAGE_ARGUMENTS GLOBAL + ) + + #################################################################################################################### diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix new file mode 100644 index 000000000000..d18a3f7b11fe --- /dev/null +++ b/pkgs/by-name/tt/tt-umd/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + ninja, + pkg-config, + gtest, + yaml-cpp, + fmt, + nanobench, + spdlog, + tt-logger, + cxxopts, + hwloc, + python3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tt-umd"; + version = "0.9.6"; + __structuredAttrs = true; + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "tenstorrent"; + repo = "tt-umd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3IrgsKRaJP/rEXiMvi2LnzS9n2+Giu5d05RohzRgPw4="; + }; + + cpm = fetchurl { + url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.2/CPM.cmake"; + hash = "sha256-yM3DLAOBZTjOInge1ylk3IZLKjSjENO3EEgSpcotg10="; + }; + + patches = [ + # https://github.com/tenstorrent/tt-umd/pull/2187 + ./fix-targets.patch + ]; + + postPatch = '' + cp $cpm cmake/CPM.cmake + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + python3 + ]; + + buildInputs = [ + fmt + yaml-cpp + nanobench + spdlog + tt-logger + cxxopts + python3.pkgs.nanobind + hwloc + gtest + ]; + + cmakeFlags = [ + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES_ONLY" true) + (lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true) + (lib.cmakeFeature "umd_asio_SOURCE_DIR" ( + builtins.toString (fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "asio"; + tag = "asio-1-30-2"; + hash = "sha256-g+ZPKBUhBGlgvce8uTkuR983unD2kbQKgoddko7x+fk="; + }) + )) + (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "TT_UMD_BUILD_STATIC" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "TT_UMD_BUILD_PYTHON" true) + (lib.cmakeFeature "nanobind_DIR" "${python3.pkgs.nanobind}/${python3.sitePackages}/nanobind/cmake") + ]; + + postInstall = '' + mkdir -p $out/${python3.sitePackages} + mv $out/tt_umd $out/${python3.sitePackages}/tt_umd + rm $out/libtt-umd.so.* + + mkdir -p $out/${python3.sitePackages}/tt_umd-${finalAttrs.version}.dist-info + cat > $out/${python3.sitePackages}/tt_umd-${finalAttrs.version}.dist-info/METADATA <=72.1,<74" "setuptools" \ - --replace-fail "setuptools_scm<8.2" "setuptools_scm" - ''; - build-system = [ setuptools setuptools-scm @@ -78,6 +74,7 @@ buildPythonPackage rec { "packaging" "prettytable" "requests" + "ruamel.yaml.clib" "setuptools_scm" "typing-extensions" ]; @@ -92,6 +89,7 @@ buildPythonPackage rec { asn1crypto bincopy bitstring + chardet click click-command-tree click-option-group @@ -139,10 +137,13 @@ buildPythonPackage rec { # Attempts to access /run "test_nxpimage_famode_export_cli" + + # spsdk.exceptions.SPSDKValueError: SPSDK: The EC curve with name 'sect163k1' is not supported + "test_keys_generation_ec" ]; meta = { - changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.tag}/docs/release_notes.rst"; + changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${finalAttrs.src.tag}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = lib.licenses.bsd3; @@ -150,4 +151,4 @@ buildPythonPackage rec { ]; mainProgram = "spsdk"; }; -} +}) diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix index 9b4a69219131..1dd6a24790c6 100644 --- a/pkgs/development/python-modules/symbolic/default.nix +++ b/pkgs/development/python-modules/symbolic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { pname = "symbolic"; - version = "13.1.0"; + version = "13.1.1"; pyproject = true; src = fetchFromGitHub { @@ -23,12 +23,12 @@ buildPythonPackage (finalAttrs: { tag = finalAttrs.version; # the `py` directory is not included in the tarball, so we fetch the source via git instead forceFetchGit = true; - hash = "sha256-PjvbEJ+YJjdjrNdlPF0wJfZzK4jCzySm6RmufQLtmRA="; + hash = "sha256-nrEWnjMyp4KKBcdcqN0uWHIV59RHN+rJWzvJLznvh20="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-5dElAOrg6aEcDrUFIwYRhJ3KeldstiZdvT99UNZn5yI="; + hash = "sha256-9yO+Y5Oxsfa/AM54TQTCEvnHr33L7/gh1q+hQq9iP3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 086bfb6c994a..be0de76f02a7 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tesla-powerwall"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "jrester"; repo = "tesla_powerwall"; tag = "v${version}"; - hash = "sha256-cAsJKFM0i0e7w2T4HP4a5ybJGuDvBAGCGmPEKFzNFAY="; + hash = "sha256-IFJ3NmQtMTPUQ4FA3CQOEPgqAhoW0V9p+JSGx+8WF+A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix index dfe08055bd8e..06863712e7c5 100644 --- a/pkgs/development/python-modules/torch-geometric/default.nix +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -54,11 +54,17 @@ # modelhub huggingface-hub, # rag + faiss, + json-repair, + langgraph, + openai, # pcst-fast, + pyyaml, datasets, transformers, sentencepiece, accelerate, + peft, # test onnx, onnxruntime, @@ -73,14 +79,15 @@ buildPythonPackage (finalAttrs: { pname = "torch-geometric"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "pyg-team"; repo = "pytorch_geometric"; tag = finalAttrs.version; - hash = "sha256-xlOzpoYRoEfIRWSQoZbEPvUW43AMr3rCgIYnxwG/z3A="; + hash = "sha256-O2W/68DtVimDR4wQb5UVJcqzuZv7GG+CxCj7rqNu9iE="; }; build-system = [ @@ -148,13 +155,19 @@ buildPythonPackage (finalAttrs: { huggingface-hub ]; rag = [ + faiss + json-repair + langgraph + openai # pcst-fast (unpackaged) + pyyaml datasets transformers pandas sentencepiece accelerate torchmetrics + peft ]; test = [ onnx diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix index 3d3503f5f5da..429f91f52a91 100644 --- a/pkgs/development/python-modules/tt-flash/default.nix +++ b/pkgs/development/python-modules/tt-flash/default.nix @@ -9,16 +9,17 @@ pyluwen, tt-tools-common, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tt-flash"; - version = "3.6.0"; + version = "3.8.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-flash"; - tag = "v${version}"; - hash = "sha256-io3+fNQWS1Gxb0L0HcQQocOT+ROjQUk4mw7xG3om7oU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-p1NzR53n9f4nVQXHDxTlbtqYVTL/5/ZSqkM3ldozsME="; }; build-system = [ @@ -33,7 +34,10 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "tt_flash" ]; - pythonRelaxDeps = [ "pyyaml" ]; + pythonRelaxDeps = [ + "pyyaml" + "tabulate" + ]; meta = { description = "Tenstorrent Firmware Update Utility"; @@ -41,4 +45,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ RossComputerGuy ]; license = with lib.licenses; [ asl20 ]; }; -} +}) diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 145ce42ed3d6..2fb62a70f06f 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -8,23 +8,21 @@ langcodes, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unidata-blocks"; - version = "0.0.24"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "TakWolf"; repo = "unidata-blocks"; - tag = version; - hash = "sha256-WGo7Sn2lubsOWfLglBAEx/2PQ1YCrF/wI7/pDwoHMRk="; + tag = finalAttrs.version; + hash = "sha256-BWcKqTMYdJ59XncPL29wCms2kCVTrcrV1zSY8mkbErs="; }; build-system = [ uv-build ]; - dependencies = [ - langcodes - ]; + dependencies = [ langcodes ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -33,13 +31,12 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { - homepage = "https://github.com/TakWolf/unidata-blocks"; description = "Library that helps query unicode blocks by Blocks.txt"; - platforms = lib.platforms.all; + homepage = "https://github.com/TakWolf/unidata-blocks"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ TakWolf h7x4 ]; }; -} +}) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index e46a48df4554..058da8228165 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -117,7 +117,7 @@ grpcio, }: let - version = "0.18.28"; + version = "0.18.31"; in buildPythonPackage rec { pname = "unstructured"; @@ -128,7 +128,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-zs7T52SkC9PDnx0O/XChHMfnRnPwbbOz8/8ea3jyjNA="; + hash = "sha256-2RGwuCVnoKkqYFVzW7nWuaB9B4IguKSfLO7u1qqAALk="; }; build-system = [ setuptools ]; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 288a2bc584d3..57517472e08f 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -466,14 +466,12 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ json2x ]; - value = builtins.toJSON value; + inherit value; preferLocalBuild = true; __structuredAttrs = true; } '' - valuePath="$TMPDIR/value" - printf "%s" "$value" > "$valuePath" - json2x toml "$valuePath" "$out" + json2x toml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out" '' ) { }; diff --git a/pkgs/pkgs-lib/formats/json2x/src/main.rs b/pkgs/pkgs-lib/formats/json2x/src/main.rs index b9025c67f42a..1464fb8972b9 100644 --- a/pkgs/pkgs-lib/formats/json2x/src/main.rs +++ b/pkgs/pkgs-lib/formats/json2x/src/main.rs @@ -10,6 +10,9 @@ use argh::{FromArgValue, FromArgs}; /// Convert a JSON file to another format #[derive(FromArgs)] struct Args { + /// convert only value of this attribute + #[argh(option)] + unwrap: Option, /// format of the output file, possible values: toml #[argh(positional)] format: Format, @@ -29,16 +32,31 @@ enum Format { fn main() -> anyhow::Result<()> { let args: Args = argh::from_env(); - let input = read_to_string(&args.input) + let json_text = read_to_string(&args.input) .with_context(|| format!("failed to read {}", args.input.display()))?; - let input: serde_json::Value = serde_json::from_str(&input) + let parsed_json: serde_json::Value = serde_json::from_str(&json_text) .with_context(|| format!("failed to parse {}", args.input.display()))?; + let output_value = if let Some(unwrap_key) = args.unwrap { + parsed_json + .as_object() + .ok_or_else(|| anyhow::anyhow!("{} does not contain an object", args.input.display()))? + .get(&unwrap_key) + .ok_or_else(|| { + anyhow::anyhow!( + "{} does not containt attribute '{unwrap_key}'", + args.input.display() + ) + })? + } else { + &parsed_json + }; let mut output = File::create(&args.output) .with_context(|| format!("failed to create {}", args.output.display()))?; match args.format { Format::Toml => { - let content = toml::to_string(&input).context("failed to serialize value to toml")?; + let content = + toml::to_string(output_value).context("failed to serialize value to toml")?; output .write_all(content.as_bytes()) .with_context(|| format!("failed to write to {}", args.output.display()))?; diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix index 16f176672760..36d1f5b047bf 100644 --- a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix @@ -17,12 +17,12 @@ requests, }: let - version = "3.14.0-beta.6"; + version = "3.14.0-beta.10"; src = fetchFromGitHub { owner = "solentlabs"; repo = "cable_modem_monitor"; tag = "v${version}"; - hash = "sha256-1Mkowy23ct8QGKe5m6XIyEE4SfAbRLlOmTzTsPHY+iw="; + hash = "sha256-Tl5MQVaitq1I5CeajVrgwKvs6HT4WEKejPjz2IcfTqw="; fetchLFS = true; }; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index ab3a435eb0fe..7a2b5240fdea 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.28.4"; + version = "0.28.5"; rev = "v${version}"; - vendorHash = "sha256-dn5XNwD3OPLrppxCM+B50uetBxLIuvFZUFZfWR/lCoY="; + vendorHash = "sha256-TsMIH1L2LD+LxoAMwtvOa36sakiyxoJ2Av0oW5+dEJQ="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-lrT2rbMzE9Kx4s84TdSs6GdeWfbaJA0PeweoLJ5ZvR0="; + sha256 = "sha256-cG6w2fErJ6lnEfnHXEVwk6dk056bSamPUWquRu1R0QU="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c07f6e2ce59b..4a8a9074b588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2539,8 +2539,6 @@ with pkgs; inherit (darwin) sigtool; }; - kronometer = kdePackages.callPackage ../tools/misc/kronometer { }; - limine-full = limine.override { enableAll = true; }; logstash7 = callPackage ../tools/misc/logstash/7.x.nix { @@ -8930,6 +8928,11 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) + emacs31 + emacs31-gtk3 + emacs31-nox + emacs31-pgtk + emacs30 emacs30-gtk3 emacs30-nox diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 73cd88b2530f..1ef2e779ed3e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -89,6 +89,7 @@ mapAliases { APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29 argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29 aspy-refactor-imports = throw "'aspy-refactor-imports' has been renamed to/replaced by 'classify-imports'"; # Added 2026-05-22 + aspy-yaml = throw "'aspy-yaml' has been removed because the upstream repository was archived in 2020"; # Added 2026-06-04 astropy-extension-helpers = extension-helpers; # Added 2025-10-15 asyauth-bad = throw "'asyauth-bad' has been renamed to/replaced by 'badauth'"; # added 2025-11-06 async-dns = throw "'async-dns' has been removed as it was unmaintained upstream"; # Added 2026-03-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e66595ce3ad..135ff46d3ec3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1084,8 +1084,6 @@ self: super: with self; { aspell-python = callPackage ../development/python-modules/aspell-python { }; - aspy-yaml = callPackage ../development/python-modules/aspy-yaml { }; - assay = callPackage ../development/python-modules/assay { }; assertpy = callPackage ../development/python-modules/assertpy { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 14b41c632887..db3de68e59b6 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -106,7 +106,7 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mapbox-gl-qml = callPackage ../development/libraries/mapbox-gl-qml { }; maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { };