diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index c318acad7bca..3a061961a0cd 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -210,7 +210,7 @@ jobs: --arg beforeResultDir ./baseResult \ --arg afterResultDir ./prResult \ -o comparison - + cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" # TODO: Request reviews from maintainers for packages whose files are modified in the PR - name: Upload the combined results diff --git a/ci/eval/default.nix b/ci/eval/default.nix index efd8d6637a2d..ef107d4ce517 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -261,6 +261,7 @@ let --slurpfile after ${afterResultDir}/outpaths.json \ > $out/changed-paths.json + jq -r -f ${./generate-step-summary.jq} < $out/changed-paths.json > $out/step-summary.md # TODO: Compare eval stats ''; diff --git a/ci/eval/generate-step-summary.jq b/ci/eval/generate-step-summary.jq new file mode 100644 index 000000000000..28597eaec371 --- /dev/null +++ b/ci/eval/generate-step-summary.jq @@ -0,0 +1,15 @@ +def truncate(xs; n): + if xs | length > n then xs[:n] + ["..."] + else xs + end; + +def itemize_packages(xs): + # we truncate the list to stay below the GitHub limit of 1MB per step summary. + truncate(xs; 3000) | map("- [\(.)](https://search.nixos.org/packages?channel=unstable&show=\(.)&from=0&size=50&sort=relevance&type=packages&query=\(.))") | join("\n"); + +def section(title; xs): + "
" + title + " (" + (xs | length | tostring) + ")\n\n" + itemize_packages(xs) + "
"; + +section("Added packages"; .attrdiff.added) + "\n\n" + +section("Removed packages"; .attrdiff.removed) + "\n\n" + +section("Changed packages"; .attrdiff.changed) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8e148f683b7..a12afe76d680 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18732,6 +18732,12 @@ github = "ribose-jeffreylau"; githubId = 2649467; }; + ribru17 = { + name = "Riley Bruins"; + email = "ribru17@hotmail.com"; + github = "ribru17"; + githubId = 55766287; + }; ricarch97 = { email = "ricardo.steijn97@gmail.com"; github = "RicArch97"; diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index 3608cd7716fc..b470c5736f71 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -160,6 +160,18 @@ The first steps to all these are the same: Refer to the `nixos-generate-config` step in [](#sec-installation) for more information. + ::: {.note} + On [UEFI](https://en.wikipedia.org/wiki/UEFI) systems, check that your `/etc/nixos/hardware-configuration.nix` did the right thing with the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition). + In NixOS, by default, both [systemd-boot](https://systemd.io/BOOT/) and [grub](https://www.gnu.org/software/grub/index.html) expect it to be mounted on `/boot`. + However, the configuration generator bases its [](#opt-fileSystems) configuration on the current mount points at the time it is run. + If the current system and NixOS's bootloader configuration don't agree on where the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition) is to be mounted, you'll need to manually alter the mount point in `hardware-configuration.nix` before building the system closure. + ::: + + ::: {.note} + The lustrate process will not work if the [](#opt-boot.initrd.systemd.enable) option is set to `true`. + If you want to use this option, wait until after the first boot into the NixOS system to enable it and rebuild. + ::: + You'll likely want to set a root password for your first boot using the configuration files because you won't have a chance to enter a password until after you reboot. You can initialize the root password @@ -231,26 +243,46 @@ The first steps to all these are the same: $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE ``` -1. Finally, move the `/boot` directory of your current distribution out - of the way (the lustrate process will take care of the rest once you - reboot, but this one must be moved out now because NixOS needs to - install its own boot files: +1. Finally, install NixOS's boot system, backing up the current boot system's files in the process. + + The details of this step can vary depending on the bootloader configuration in NixOS and the bootloader in use by the current system. + + The commands below should work for: + + - [BIOS](https://en.wikipedia.org/wiki/BIOS) systems. + + - [UEFI](https://en.wikipedia.org/wiki/UEFI) systems where both the current system and NixOS mount the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition) on `/boot`. + Both [systemd-boot](https://systemd.io/BOOT/) and [grub](https://www.gnu.org/software/grub/index.html) expect this by default in NixOS, but other distributions vary. ::: {.warning} - Once you complete this step, your current distribution will no - longer be bootable! If you didn't get all the NixOS configuration - right, especially those settings pertaining to boot loading and root - partition, NixOS may not be bootable either. Have a USB rescue - device ready in case this happens. + Once you complete this step, your current distribution will no longer be bootable! + If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. + Have a USB rescue device ready in case this happens. + ::: + + ::: {.warning} + On [UEFI](https://en.wikipedia.org/wiki/UEFI) systems, anything on the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition) will be removed by these commands, such as other coexisting OS's bootloaders. ::: ```ShellSession - $ sudo mv -v /boot /boot.bak && - sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + $ sudo mkdir /boot.bak && sudo mv /boot/* /boot.bak && + sudo NIXOS_INSTALL_BOOTLOADER=1 /nix/var/nix/profiles/system/bin/switch-to-configuration boot ``` Cross your fingers, reboot, hopefully you should get a NixOS prompt! + In other cases, most commonly where the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition) of the current system is instead mounted on `/boot/efi`, the goal is to: + + - Make sure `/boot` (and the [EFI System Partition](https://en.wikipedia.org/wiki/EFI_system_partition), if mounted elsewhere) are mounted how the NixOS configuration would mount them. + + - Clear them of files related to the current system, backing them up outside of `/boot`. + NixOS will move the backups into `/old-root` along with everything else when it first boots. + + - Instruct the NixOS closure built earlier to install its bootloader with: + ```ShellSession + sudo NIXOS_INSTALL_BOOTLOADER=1 /nix/var/nix/profiles/system/bin/switch-to-configuration boot + ``` + 1. If for some reason you want to revert to the old distribution, you'll need to boot on a USB rescue disk and do something along these lines: diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index d36c90c6254e..15304c995f10 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -42,5 +42,11 @@ done ''; + environment.defaultPackages = with pkgs; [ + rsync + ]; + + programs.git.enable = lib.mkDefault true; + system.stateVersion = lib.mkDefault lib.trivial.release; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index f4a2884964f5..095f1f8fa860 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -49,10 +49,6 @@ vim nano - # Include some version control tools. - git - rsync - # Firefox for reading the manual. firefox diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix index 103d6787a03c..0e6eb251091c 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix @@ -17,6 +17,10 @@ sdImage = { populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' + # u-boot refuses to start (gets stuck at rainbow polygon) without this, + # at least on Raspberry Pi 0. + enable_uart=1 + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel # when attempting to show low-voltage or overtemperature warnings. avoid_warnings=1 @@ -28,7 +32,7 @@ kernel=u-boot-rpi1.bin ''; in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf *.dtb $NIX_BUILD_TOP/firmware/) cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin firmware/u-boot-rpi0.bin cp ${pkgs.ubootRaspberryPi}/u-boot.bin firmware/u-boot-rpi1.bin cp ${configTxt} firmware/config.txt diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 7e22d4b6b684..a4e5a4aac790 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -74,8 +74,8 @@ with lib; # installation device for head-less systems i.e. arm boards by manually # mounting the storage in a different system. services.openssh = { - enable = true; - settings.PermitRootLogin = "yes"; + enable = mkDefault true; + settings.PermitRootLogin = mkDefault "yes"; }; # Enable wpa_supplicant, but don't start it by default. diff --git a/nixos/modules/security/acme/mk-cert-ownership-assertion.nix b/nixos/modules/security/acme/mk-cert-ownership-assertion.nix index 53a3fbaadd2e..0339d7920ad9 100644 --- a/nixos/modules/security/acme/mk-cert-ownership-assertion.nix +++ b/nixos/modules/security/acme/mk-cert-ownership-assertion.nix @@ -6,7 +6,7 @@ let svcGroups = svc: (lib.optional (svc.serviceConfig ? Group) svc.serviceConfig.Group) - ++ (svc.serviceConfig.SupplementaryGroups or [ ]); + ++ lib.toList (svc.serviceConfig.SupplementaryGroups or [ ]); in { assertion = builtins.all (svc: diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 3a3f14523d41..09f271999fc4 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1001,7 +1001,7 @@ in { "20-addMacAllowFromSaeFile" = mkIf (bssCfg.authentication.saeAddToMacAllow && bssCfg.authentication.saePasswordsFile != null) (pkgs.writeShellScript "add-mac-allow-from-sae-file" '' MAC_ALLOW_FILE=$2 grep mac= ${escapeShellArg bssCfg.authentication.saePasswordsFile} \ - | grep -v '\s*#' \ + | grep -v '^\s*#' \ | grep -Eo 'mac=([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})' \ | sed 's|^mac=||' >> "$MAC_ALLOW_FILE" ''); @@ -1025,7 +1025,7 @@ in { # Add sae passwords from file "20-saePasswordsFile" = mkIf (bssCfg.authentication.saePasswordsFile != null) (pkgs.writeShellScript "sae-passwords-file" '' HOSTAPD_CONFIG_FILE=$1 - grep -v '\s*#' ${escapeShellArg bssCfg.authentication.saePasswordsFile} \ + grep -v '^\s*#' ${escapeShellArg bssCfg.authentication.saePasswordsFile} \ | sed 's/^/sae_password=/' >> "$HOSTAPD_CONFIG_FILE" ''); }; diff --git a/nixos/modules/services/web-apps/plausible.md b/nixos/modules/services/web-apps/plausible.md index d3673eabddd4..90e71c0d6d8d 100644 --- a/nixos/modules/services/web-apps/plausible.md +++ b/nixos/modules/services/web-apps/plausible.md @@ -15,15 +15,6 @@ After that, `plausible` can be deployed like this: { services.plausible = { enable = true; - adminUser = { - # activate is used to skip the email verification of the admin-user that's - # automatically created by plausible. This is only supported if - # postgresql is configured by the module. This is done by default, but - # can be turned off with services.plausible.database.postgres.setup. - activate = true; - email = "admin@localhost"; - passwordFile = "/run/secrets/plausible-admin-pwd"; - }; server = { baseUrl = "http://analytics.example.org"; # secretKeybaseFile is a path to the file which contains the secret generated diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 188b80ca43a1..213d5125ee93 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -11,33 +11,6 @@ in { package = mkPackageOption pkgs "plausible" { }; - adminUser = { - name = mkOption { - default = "admin"; - type = types.str; - description = '' - Name of the admin user that plausible will created on initial startup. - ''; - }; - - email = mkOption { - type = types.str; - example = "admin@localhost"; - description = '' - Email-address of the admin-user. - ''; - }; - - passwordFile = mkOption { - type = types.either types.str types.path; - description = '' - Path to the file which contains the password of the admin user. - ''; - }; - - activate = mkEnableOption "activating the freshly created admin-user"; - }; - database = { clickhouse = { setup = mkEnableOption "creating a clickhouse instance" // { default = true; }; @@ -164,18 +137,13 @@ in { imports = [ (mkRemovedOptionModule [ "services" "plausible" "releaseCookiePath" ] "Plausible uses no distributed Erlang features, so this option is no longer necessary and was removed") + (mkRemovedOptionModule [ "services" "plausible" "adminUser" "name" ] "Admin user is now created using first start wizard") + (mkRemovedOptionModule [ "services" "plausible" "adminUser" "email" ] "Admin user is now created using first start wizard") + (mkRemovedOptionModule [ "services" "plausible" "adminUser" "passwordFile" ] "Admin user is now created using first start wizard") + (mkRemovedOptionModule [ "services" "plausible" "adminUser" "activate" ] "Admin user is now created using first start wizard") ]; config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; - message = '' - Unable to automatically activate the admin-user if no locally managed DB for - postgres (`services.plausible.database.postgres.setup') is enabled! - ''; - } - ]; - services.postgresql = mkIf cfg.database.postgres.setup { enable = true; }; @@ -243,11 +211,7 @@ in { # Home is needed to connect to the node with iex HOME = "/var/lib/plausible"; - ADMIN_USER_NAME = cfg.adminUser.name; - ADMIN_USER_EMAIL = cfg.adminUser.email; - - DATABASE_SOCKET_DIR = cfg.database.postgres.socket; - DATABASE_NAME = cfg.database.postgres.dbname; + DATABASE_URL = "postgresql:///${cfg.database.postgres.dbname}?host=${cfg.database.postgres.socket}"; CLICKHOUSE_DATABASE_URL = cfg.database.clickhouse.url; BASE_URL = cfg.server.baseUrl; @@ -270,7 +234,6 @@ in { # even though we set `RELEASE_DISTRIBUTION=none` so the cookie should be unused. # Thus, make a random one, which should then be ignored. export RELEASE_COOKIE=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 20) - export ADMIN_USER_PWD="$(< $CREDENTIALS_DIRECTORY/ADMIN_USER_PWD )" export SECRET_KEY_BASE="$(< $CREDENTIALS_DIRECTORY/SECRET_KEY_BASE )" ${lib.optionalString (cfg.mail.smtp.passwordFile != null) @@ -283,10 +246,6 @@ in { ${cfg.package}/migrate.sh export IP_GEOLOCATION_DB=${pkgs.dbip-country-lite}/share/dbip/dbip-country-lite.mmdb - ${cfg.package}/bin/plausible eval "(Plausible.Release.prepare() ; Plausible.Auth.create_user(\"$ADMIN_USER_NAME\", \"$ADMIN_USER_EMAIL\", \"$ADMIN_USER_PWD\"))" - ${optionalString cfg.adminUser.activate '' - psql -d plausible <<< "UPDATE users SET email_verified=true where email = '$ADMIN_USER_EMAIL';" - ''} exec plausible start ''; @@ -297,7 +256,6 @@ in { WorkingDirectory = "/var/lib/plausible"; StateDirectory = "plausible"; LoadCredential = [ - "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 7f824680b92e..148645ed1d67 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -12,7 +12,7 @@ let extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; - notExcluded = pkg: (!(lib.elem pkg config.environment.cinnamon.excludePackages)); + notExcluded = pkg: (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.cinnamon.excludePackages))); in { diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index cbbce8468569..8b043f109a36 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -58,7 +58,7 @@ let enableGnomePanel = true; } ++ cfg.flashback.customSessions; - notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages)); + notExcluded = pkg: mkDefault (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.gnome.excludePackages))); in diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 774e77131f5d..5220f8ef8c09 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -41,10 +41,6 @@ use Fcntl ':flock'; my $out = "@out@"; # System closure path to switch to my $toplevel = "@toplevel@"; -# Path to the directory containing systemd tools of the old system -my $cur_systemd = abs_path("/run/current-system/sw/bin"); -# Path to the systemd store path of the new system -my $new_systemd = "@systemd@"; # To be robust against interruption, record what units need to be started etc. # We read these files again every time this script starts to make sure we continue @@ -130,6 +126,12 @@ if ($action eq "boot") { exit(0); } +# Path to the directory containing systemd tools of the old system +# Needs to be after the "boot" action exits, as this directory will not exist when doing a NIXOS_LUSTRATE install +my $cur_systemd = abs_path("/run/current-system/sw/bin"); +# Path to the systemd store path of the new system +my $new_systemd = "@systemd@"; + # Check if we can activate the new configuration. my $cur_init_interface_version = read_file("/run/current-system/init-interface-version", err_mode => "quiet") // ""; my $new_init_interface_version = read_file("$toplevel/init-interface-version"); diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 9c26c509a5ab..4f1ba137f41b 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -1,18 +1,13 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { +import ./make-test-python.nix ({ lib, ... }: { name = "plausible"; - meta = with lib.maintainers; { - maintainers = [ ]; + meta = { + maintainers = lib.teams.cyberus.members; }; nodes.machine = { pkgs, ... }: { virtualisation.memorySize = 4096; services.plausible = { enable = true; - adminUser = { - email = "admin@example.org"; - passwordFile = "${pkgs.writeText "pwd" "foobar"}"; - activate = true; - }; server = { baseUrl = "http://localhost:8000"; secretKeybaseFile = "${pkgs.writeText "dont-try-this-at-home" "nannannannannannannannannannannannannannannannannannannan_batman!"}"; @@ -32,21 +27,5 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed("curl -f localhost:8000 >&2") machine.succeed("curl -f localhost:8000/js/script.js >&2") - - csrf_token = machine.succeed( - "curl -c /tmp/cookies localhost:8000/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" - ) - - machine.succeed( - f"curl -b /tmp/cookies -f -X POST localhost:8000/login -F email=admin@example.org -F password=foobar -F _csrf_token={csrf_token.strip()} -D headers" - ) - - # By ensuring that the user is redirected to the dashboard after login, we - # also make sure that the automatic verification of the module works. - machine.succeed( - "[[ $(grep 'location: ' headers | cut -d: -f2- | xargs echo) == /sites* ]]" - ) - - machine.shutdown() ''; }) diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index a747cb2e14d7..5c0c2a7f3d00 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csound-qt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; rev = "v${version}"; - hash = "sha256-ufjZQnO3H5pwdeEwGqunbXCfx7nvWTzak4cwVYWqvz4="; + hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk="; }; patches = [ diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index da36dfde736b..91389dd07254 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -1,65 +1,66 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchzip -, alsa-lib -, appstream -, bash-completion -, boost -, breeze-icons -, carla -, chromaprint -, cmake -, curl -, dbus -, dconf -, fftw -, fftwFloat -, flex -, glib -, graphviz -, gtk4 -, gtksourceview5 -, guile -, help2man -, jq -, kissfft -, libadwaita -, libbacktrace -, libcyaml -, libepoxy -, libjack2 -, libpanel -, libpulseaudio -, libsamplerate -, libsndfile -, libxml2 -, libyaml -, lilv -, lv2 -, meson -, ninja -, pcre2 -, pkg-config -, python3 -, rtaudio_6 -, rtmidi -, rubberband -, sassc -, serd -, sord -, sox -, soxr -, sratom -, texi2html -, vamp-plugin-sdk -, wrapGAppsHook4 -, writeScript -, xdg-utils -, xxHash -, yyjson -, zix -, zstd +{ + stdenv, + lib, + fetchFromGitHub, + fetchzip, + alsa-lib, + appstream, + bash-completion, + boost, + breeze-icons, + carla, + chromaprint, + cmake, + curl, + dbus, + dconf, + fftw, + fftwFloat, + flex, + glib, + graphviz, + gtk4, + gtksourceview5, + guile, + help2man, + jq, + kissfft, + libadwaita, + libbacktrace, + libcyaml, + libepoxy, + libjack2, + libpanel, + libpulseaudio, + libsamplerate, + libsndfile, + libxml2, + libyaml, + lilv, + lv2, + meson, + ninja, + pcre2, + pkg-config, + python3, + rtaudio_6, + rtmidi, + rubberband, + sassc, + serd, + sord, + sox, + soxr, + sratom, + texi2html, + vamp-plugin-sdk, + wrapGAppsHook4, + writeScript, + xdg-utils, + xxHash, + yyjson, + zix, + zstd, }: let @@ -79,11 +80,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zrythm"; - version = "1.0.0-rc.2"; + version = "1.0.0"; src = fetchzip { url = "https://www.zrythm.org/releases/zrythm-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-Da//nY0yXSbDPEg6t9jgL32NoT8dFYSQ4Kzc/KbHGSk="; + hash = "sha256-qI1UEIeIJdYQcOWMjJa55DaWjDIabx56dSwjhm64ROM="; }; passthru.updateScript = writeScript "update-zrythm" '' @@ -187,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace meson.build \ - --replace "'/usr/lib', '/usr/local/lib', '/opt/homebrew/lib'" "'${fftw}/lib'" + --replace-fail "'/usr/lib', '/usr/local/lib', '/opt/homebrew/lib'" "'${fftw}/lib'" chmod +x scripts/meson-post-install.sh patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \ @@ -201,12 +202,18 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - meta = with lib; { + meta = { homepage = "https://www.zrythm.org"; description = "Automated and intuitive digital audio workstation"; - maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ + tshaynik + magnetophon + yuu + astavie + PowerUser64 + ]; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; }; }) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9aa00a3f682a..318a42f13df9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10868,6 +10868,18 @@ final: prev: meta.homepage = "https://github.com/vladdoster/remember.nvim/"; }; + remote-nvim-nvim = buildVimPlugin { + pname = "remote-nvim.nvim"; + version = "2024-08-04"; + src = fetchFromGitHub { + owner = "amitds1997"; + repo = "remote-nvim.nvim"; + rev = "ffbf91f6132289a8c43162aba12c7365c28d601c"; + sha256 = "00phk7jgg1hrr3vrr5k19kx1a23srwxiqf3nl6gn4v9f7kn900pj"; + }; + meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/"; + }; + renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; version = "2022-08-29"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a05de14c35c1..64182160f3c3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -145,6 +145,14 @@ let luaPackages = neovim-unwrapped.lua.pkgs; in { + aerial-nvim = super.aerial-nvim.overrideAttrs { + # optional dependencies + nvimSkipModule = [ + "lualine.components.aerial" + "telescope._extensions.aerial" + ]; + }; + alpha-nvim = super.alpha-nvim.overrideAttrs { nvimRequireCheck = "alpha"; }; @@ -158,6 +166,18 @@ in nvimRequireCheck = "advanced_git_search.utils"; }; + astrotheme = super.astrotheme.overrideAttrs { + nvimRequireCheck = "astrotheme"; + }; + + asyncrun-vim = super.asyncrun-vim.overrideAttrs { + nvimSkipModule = [ + # vim plugin with optional toggleterm integration + "asyncrun.toggleterm" + "asyncrun.toggleterm2" + ]; + }; + animation-nvim = super.animation-nvim.overrideAttrs { dependencies = [ self.middleclass ]; nvimRequireCheck = "animation"; @@ -168,6 +188,15 @@ in nvimRequireCheck = "autosave"; }; + auto-session = super.auto-session.overrideAttrs { + # optional telescope dependency + nvimSkipModule = [ + "auto-session.session-lens.actions" + "auto-session.session-lens.init" + "telescope._extensions.session-lens" + ]; + }; + avante-nvim = super.avante-nvim.overrideAttrs ( oldAttrs: let @@ -229,6 +258,26 @@ in } ); + bamboo-nvim = super.bamboo-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires config table + "bamboo.colors" + "bamboo.terminal" + "bamboo.highlights" + "bamboo-light" + "bamboo-vulgaris" + "bamboo-multiplex" + # Optional modules + "lualine.themes.bamboo" + "barbecue.theme.bamboo" + ]; + }; + + barbar-nvim = super.barbar-nvim.overrideAttrs { + # nvim-web-devicons dependency + nvimSkipModule = "bufferline.utils"; + }; + barbecue-nvim = super.barbecue-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig @@ -245,6 +294,15 @@ in base46 = super.base46.overrideAttrs { dependencies = [ self.nvchad-ui ]; + # Requires global config setup + nvimSkipModule = [ + "nvchad.configs.cmp" + "nvchad.configs.gitsigns" + "nvchad.configs.luasnip" + "nvchad.configs.mason" + "nvchad.configs.nvimtree" + "nvchad.configs.telescope" + ]; }; # The GitHub repository returns 404, which breaks the update script @@ -266,6 +324,25 @@ in dependencies = [ self.lush-nvim ]; }; + bufferline-nvim = super.bufferline-nvim.overrideAttrs { + # depends on bufferline.lua being loaded first + nvimSkipModule = [ "bufferline.commands" ]; + }; + + catppuccin-nvim = super.catppuccin-nvim.overrideAttrs { + nvimSkipModule = [ + "catppuccin.groups.integrations.noice" + "catppuccin.groups.integrations.feline" + "catppuccin.lib.vim.init" + ]; + }; + + ccc-nvim = super.ccc-nvim.overrideAttrs { + # ccc auto-discover requires all pass + # but there's a bootstrap module that hangs forever if we dont stop on first success + nvimRequireCheck = "ccc"; + }; + chadtree = super.chadtree.overrideAttrs { buildInputs = [ python3 @@ -336,81 +413,203 @@ in nvimRequireCheck = "cmake-tools"; }; - cmp-ai = super.cmp-ai.overrideAttrs { - dependencies = [ self.plenary-nvim ]; + cmd-parser-nvim = super.cmd-parser-nvim.overrideAttrs { + nvimRequireCheck = "cmd-parser"; }; - cmp-clippy = super.cmp-clippy.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; + cmp-ai = super.cmp-ai.overrideAttrs (oa: { + # We dont want to bundle nvim-cmp anymore since blink.nvim can use these sources. + # Add to check inputs though to validate plugin + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + dependencies = with self; [ + plenary-nvim + ]; + }); - cmp-conjure = super.cmp-conjure.overrideAttrs { + cmp-async-path = super.cmp-async-path.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-beancount = super.cmp-beancount.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-clippy = super.cmp-clippy.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + dependencies = with self; [ + plenary-nvim + ]; + }); + + cmp-cmdline = super.cmp-cmdline.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-conjure = super.cmp-conjure.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.conjure ]; - }; + }); - cmp-copilot = super.cmp-copilot.overrideAttrs { + cmp-copilot = super.cmp-copilot.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.copilot-vim ]; - }; + }); - cmp-dap = super.cmp-dap.overrideAttrs { + cmp-ctags = super.cmp-ctags.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-dap = super.cmp-dap.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.nvim-dap ]; - }; + }); - cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs { + cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-digraphs = super.cmp-digraphs.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-fish = super.cmp-fish.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.fuzzy-nvim ]; - }; + }); - cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs { + cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.fuzzy-nvim ]; - }; + }); - cmp-git = super.cmp-git.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - }; + cmp-git = super.cmp-git.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + dependencies = with self; [ plenary-nvim ]; + }); - cmp_luasnip = super.cmp_luasnip.overrideAttrs { + cmp-greek = super.cmp-greek.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-look = super.cmp-look.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp_luasnip = super.cmp_luasnip.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.luasnip ]; - }; + }); - cmp-neosnippet = super.cmp-neosnippet.overrideAttrs { + cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.neosnippet-vim ]; - }; + }); - cmp-npm = super.cmp-npm.overrideAttrs { + cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-npm = super.cmp-npm.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.plenary-nvim ]; - }; + }); - cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs { + cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-nvim-lua = super.cmp-nvim-lua.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-nvim-ultisnips = super.cmp-nvim-ultisnips.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.plenary-nvim ]; - }; + }); - cmp-snippy = super.cmp-snippy.overrideAttrs { + cmp-pandoc-references = super.cmp-pandoc-references.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-path = super.cmp-path.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-rg = super.cmp-rg.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-snippy = super.cmp-snippy.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.nvim-snippy ]; - }; + }); - cmp-tabnine = super.cmp-tabnine.overrideAttrs { + cmp-tabby = super.cmp-tabby.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-tabnine = super.cmp-tabnine.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; buildInputs = [ tabnine ]; postFixup = '' mkdir -p $target/binaries/${tabnine.version} ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform} ''; - }; + }); - cmp-tmux = super.cmp-tmux.overrideAttrs { + cmp-tmux = super.cmp-tmux.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ tmux ]; - }; + }); - cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs { + cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.vim-lsp ]; - }; + }); - cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs { + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ self.vimwiki ]; - }; + }); - cmp-zsh = super.cmp-zsh.overrideAttrs { + cmp-vsnip = super.cmp-vsnip.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-vimtex = super.cmp-vimtex.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; + }); + + cmp-zsh = super.cmp-zsh.overrideAttrs (oa: { + nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; dependencies = [ zsh ]; + }); + + cobalt2-nvim = super.cobalt2-nvim.overrideAttrs { + dependencies = with self; [ colorbuddy-nvim ]; + # Few broken themes + nvimSkipModule = [ + "cobalt2.plugins.init" + "cobalt2.plugins.trouble" + "cobalt2.plugins.gitsigns" + "cobalt2.plugins.package-info" + "cobalt2.plugins.indent-blankline" + "cobalt2.plugins.marks" + "cobalt2.theme" + ]; }; coc-clangd = buildVimPlugin { @@ -643,6 +842,11 @@ in ]; }; + context-vim = super.context-vim.overrideAttrs { + # Vim plugin with optional lua highlight module + nvimSkipModule = "context.highlight"; + }; + CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { dependencies = with self; [ copilot-lua @@ -796,6 +1000,8 @@ in darkearth-nvim = super.darkearth-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; + # Lua module used to build theme + nvimSkipModule = "shipwright_build"; }; ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs { @@ -894,6 +1100,11 @@ in ]; }; + dropbar-nvim = super.dropbar-nvim.overrideAttrs { + # Requires global config table + nvimSkipModule = "dropbar.menu"; + }; + efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; @@ -919,6 +1130,16 @@ in }; }; + feline-nvim = super.feline-nvim.overrideAttrs { + nvimSkipModule = "minimal_init"; + }; + + flash-nvim = super.flash-nvim.overrideAttrs { + # Docs require lazyvim + # dependencies = with self; [ lazy-nvim ]; + nvimSkipModule = "flash.docs"; + }; + flit-nvim = super.flit-nvim.overrideAttrs { dependencies = [ self.leap-nvim ]; nvimRequireCheck = "flit"; @@ -926,6 +1147,8 @@ in flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + # Optional nvim-dap module + nvimSkipModule = "flutter-tools.dap"; }; follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs { @@ -1043,6 +1266,31 @@ in nvimRequireCheck = "git-worktree"; }; + go-nvim = super.go-nvim.overrideAttrs { + nvimSkipModule = [ + # Null-ls + "go.null_ls" + # _GO_NVIM_CFG + "go.inlay" + "go.project" + "go.comment" + "go.tags" + "go.gotests" + "go.format" + # nvim-treesitter + "go.gotest" + "go.ginkgo" + "go.ts.go" + "go.ts.utils" + "go.ts.nodes" + "go.fixplurals" + # Luasnip + "go.snips" + "snips.all" + "snips.go" + ]; + }; + guard-collection = super.guard-collection.overrideAttrs { dependencies = [ self.guard-nvim ]; }; @@ -1101,6 +1349,14 @@ in rev = "v${himalaya.version}"; sha256 = "W+91hnNeS6WkDiR9r1s7xPTK9JlCWiVkI/nXVYbepY0="; }; + # vim plugin with optional telescope lua module + nvimSkipModule = "himalaya.folder.pickers.telescope"; + }; + + hover-nvim = super.hover-nvim.overrideAttrs { + # Single provider issue with reading from config + # /lua/hover/providers/fold_preview.lua:27: attempt to index local 'config' (a nil value) + nvimSkipModule = "hover.providers.fold_preview"; }; hunk-nvim = super.hunk-nvim.overrideAttrs { @@ -1145,6 +1401,20 @@ in nvimRequireCheck = "image"; }; + indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs { + # Meta file + nvimSkipModule = "ibl.config.types"; + }; + + instant-nvim = super.instant-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires global variable config + "instant" + # instant/log.lua:12: cannot use '...' outside a vararg function near '...' + "instant.log" + ]; + }; + intellitab-nvim = super.intellitab-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -1220,6 +1490,23 @@ in LazyVim = super.LazyVim.overrideAttrs { # Any other dependency is optional dependencies = [ self.lazy-nvim ]; + nvimSkipModule = [ + # attempt to index global 'LazyVim' (a nil value) + "lazyvim.config.keymaps" + "lazyvim.plugins.extras.ai.tabnine" + "lazyvim.plugins.extras.coding.blink" + "lazyvim.plugins.extras.coding.luasnip" + "lazyvim.plugins.extras.editor.fzf" + "lazyvim.plugins.extras.editor.telescope" + "lazyvim.plugins.extras.formatting.prettier" + "lazyvim.plugins.extras.lang.markdown" + "lazyvim.plugins.extras.lang.omnisharp" + "lazyvim.plugins.extras.lang.python" + "lazyvim.plugins.extras.lang.svelte" + "lazyvim.plugins.extras.lang.typescript" + "lazyvim.plugins.init" + "lazyvim.plugins.xtras" + ]; }; lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { @@ -1274,6 +1561,10 @@ in legendary-nvim = super.legendary-nvim.overrideAttrs { dependencies = [ self.sqlite-lua ]; + nvimSkipModule = [ + "vimdoc-gen" + "vimdocrc" + ]; }; lens-vim = super.lens-vim.overrideAttrs { @@ -1293,7 +1584,8 @@ in }; lightline-bufferline = super.lightline-bufferline.overrideAttrs { - dependencies = with self; [ nvim-web-devicons ]; + # Requires web-devicons but mini.icons can mock them up + nativeCheckInputs = [ self.nvim-web-devicons ]; }; lir-nvim = super.lir-nvim.overrideAttrs { @@ -1308,6 +1600,12 @@ in telescope-nvim plenary-nvim ]; + nvimSkipModule = [ + # Attempt to connect to sqlitedb + "lispdocs.db" + "lispdocs.finder" + "lispdocs" + ]; }; litee-calltree-nvim = super.litee-calltree-nvim.overrideAttrs { @@ -1340,6 +1638,16 @@ in nvimRequireCheck = "lspecho"; }; + lspsaga-nvim = super.lspsaga-nvim.overrideAttrs { + # Other modules require setup call first + nvimRequireCheck = "lspsaga"; + }; + + ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs { + # Other modules require setup call first + nvimRequireCheck = "ltex_extra"; + }; + lualine-lsp-progress = super.lualine-lsp-progress.overrideAttrs { dependencies = [ self.lualine-nvim ]; }; @@ -1351,6 +1659,11 @@ in luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs { dependencies = [ self.luasnip ]; + # E5108: /luasnip-latex-snippets/luasnippets/tex/utils/init.lua:3: module 'luasnip-latex-snippets.luasnippets.utils.conditions' not found: + # Need to fix upstream + nvimSkipModule = [ + "luasnip-latex-snippets.luasnippets.tex.utils.init" + ]; }; lz-n = neovimUtils.buildNeovimPlugin { @@ -1426,11 +1739,21 @@ in nvimRequireCheck = "mason-lspconfig"; }; + mason-nvim = super.mason-nvim.overrideAttrs { + # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' + nvimSkipModule = "mason-vendor.zzlib.inflate-bwo"; + }; + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { dependencies = [ self.mason-nvim ]; nvimRequireCheck = "mason-tool-installer"; }; + material-vim = super.material-vim.overrideAttrs { + # vim plugin with optional lualine module + nvimSkipModule = "material.lualine"; + }; + meson = buildVimPlugin { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -1472,6 +1795,21 @@ in mkdnflow-nvim = super.mkdnflow-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + # Requires setup call and has optional nvim-cmp dependency + nvimRequireCheck = "mkdnflow"; + }; + + modicator-nvim = super.modicator-nvim.overrideAttrs { + # Optional lualine integration + nvimSkipModule = "modicator.integration.lualine.init"; + }; + + molten-nvim = super.molten-nvim.overrideAttrs { + nvimSkipModule = [ + # Optional image providers + "load_image_nvim" + "load_wezterm_nvim" + ]; }; moveline-nvim = @@ -1562,6 +1900,15 @@ in nvimRequireCheck = "neogit"; }; + neorepl-nvim = super.neorepl-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires main module loaded first + "neorepl.bufs" + "neorepl.map" + "neorepl.repl" + ]; + }; + neorg = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.neorg; @@ -1689,7 +2036,15 @@ in neotest nvim-nio ]; - nvimRequirecheck = "neotest-jest"; + # Unit test assert + nvimSkipModule = "neotest-jest-assertions"; + }; + + neotest-minitest = super.neotest-minitest.overrideAttrs { + dependencies = with self; [ + neotest + plenary-nvim + ]; }; neotest-pest = super.neotest-pest.overrideAttrs { @@ -1716,6 +2071,8 @@ in plenary-nvim telescope-nvim ]; + # Unit test assert + nvimSkipModule = "neotest-playwright-assertions"; }; neotest-plenary = super.neotest-plenary.overrideAttrs { @@ -1773,8 +2130,18 @@ in dependencies = with self; [ neotest nvim-nio + plenary-nvim + ]; + # Unit test assert + nvimSkipModule = "neotest-vitest-assertions"; + }; + + neotest-zig = super.neotest-zig.overrideAttrs { + dependencies = with self; [ + neotest + nvim-nio + plenary-nvim ]; - nvimRequirecheck = "neotest-vitest"; }; neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { @@ -1785,6 +2152,15 @@ in nvimRequirecheck = "neo-tree"; }; + netman-nvim = super.netman-nvim.overrideAttrs { + nvimSkipModule = [ + # Optional neo-tree integration + "netman.ui.neo-tree.init" + "netman.ui.neo-tree.commands" + "netman.ui.neo-tree.components" + ]; + }; + neuron-nvim = super.neuron-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim @@ -1837,10 +2213,36 @@ in telescope-nvim nvim-treesitter ]; + nvimSkipModule = [ + # Requires global config setup + "nvchad.configs.cmp" + "nvchad.configs.gitsigns" + "nvchad.configs.luasnip" + "nvchad.configs.mason" + "nvchad.configs.nvimtree" + "nvchad.configs.telescope" + ]; }; nvchad-ui = super.nvchad-ui.overrideAttrs { dependencies = [ self.nvzone-volt ]; + nvimSkipModule = [ + # Requires global config setup + "nvchad.tabufline.modules" + "nvchad.term.init" + "nvchad.themes.init" + "nvchad.themes.mappings" + "nvchad.cheatsheet.grid" + "nvchad.cheatsheet.simple" + ]; + }; + + nvim-autopairs = super.nvim-autopairs.overrideAttrs { + nvimSkipModule = [ + # Optional completion dependencies + "nvim-autopairs.completion.cmp" + "nvim-autopairs.completion.compe" + ]; }; nvim-biscuits = super.nvim-biscuits.overrideAttrs { @@ -1859,10 +2261,6 @@ in nvimRequireCheck = "coverage"; }; - nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs { - dependencies = [ self.nvim-fzf ]; - }; - nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { dependencies = [ self.nvim-dap ]; }; @@ -1895,6 +2293,12 @@ in dependencies = [ self.nvim-dap ]; }; + nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs { + dependencies = [ self.nvim-fzf ]; + # Requires global variable setup nvim_fzf_directory + nvimSkipModule = "fzf-commands.rg"; + }; + nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -1926,6 +2330,11 @@ in nvimRequireCheck = "metals"; }; + nvim-moonwalk = super.nvim-moonwalk.overrideAttrs { + # Asserts log file exists before it is created + nvimSkipModule = "moonwalk"; + }; + nvim-navbuddy = super.nvim-navbuddy.overrideAttrs { dependencies = with self; [ nui-nvim @@ -1935,6 +2344,19 @@ in nvimRequireCheck = "nvim-navbuddy"; }; + nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs { + nvimSkipModule = [ + # Optional dependencies + "neoclip.fzf" + "neoclip.telescope" + ]; + }; + + nvim-nonicons = super.nvim-nonicons.overrideAttrs { + # Requires web-devicons but mini.icons can mock them up + nativeCheckInputs = [ self.nvim-web-devicons ]; + }; + nvim-nu = super.nvim-nu.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -2024,6 +2446,16 @@ in nvimRequireCheck = "scissors"; }; + nvim-snippets = super.nvim-snippets.overrideAttrs { + # Optional cmp integration + nvimSkipModule = "snippets.utils.cmp"; + }; + + nvim-surround = super.nvim-surround.overrideAttrs { + # Optional treesitter integration + nvimSkipModule = "nvim-surround.queries"; + }; + nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' substituteInPlace lua/tealmaker/init.lua \ @@ -2036,6 +2468,11 @@ in callPackage ./nvim-treesitter/overrides.nix { } self super ); + nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs { + # Meant for CI installing parsers + nvimSkipModule = "install_parsers"; + }; + nvim-treesitter-endwise = super.nvim-treesitter-endwise.overrideAttrs { dependencies = [ self.nvim-treesitter ]; }; @@ -2071,8 +2508,15 @@ in nvimRequireCheck = "ufo"; }; + nvim-unception = super.nvim-unception.overrideAttrs { + # Attempt rpc socket connection + nvimSkipModule = "client.client"; + }; + nvzone-menu = super.nvzone-menu.overrideAttrs { dependencies = [ self.nvzone-volt ]; + # Optional nvimtree integration + nvimSkipModule = "menus.nvimtree"; }; nvzone-minty = super.nvzone-minty.overrideAttrs { @@ -2101,6 +2545,21 @@ in configurePhase = "cd vim"; }; + omni-vim = super.omni-vim.overrideAttrs { + # Optional lightline integration + nvimSkipModule = "omni-lightline"; + }; + + onedark-nvim = super.onedark-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires global config value + "barbecue.theme.onedark" + "onedark.highlights" + "onedark.colors" + "onedark.terminal" + ]; + }; + one-nvim = super.one-nvim.overrideAttrs { # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co' # https://github.com/Th3Whit3Wolf/one-nvim/issues/23 @@ -2117,7 +2576,11 @@ in ]; # FIXME: cant find plugin root dir - # nvimRequireCheck = "openscad"; + nvimSkipModule = [ + "openscad" + "openscad.snippets.openscad" + "openscad.utilities" + ]; patches = [ (substituteAll { src = ./patches/openscad.nvim/program_paths.patch; @@ -2138,6 +2601,11 @@ in nvimRequirecheck = "otter"; }; + outline-nvim = super.outline-nvim.overrideAttrs { + # Requires setup call + nvimSkipModule = "outline.providers.norg"; + }; + overseer-nvim = super.overseer-nvim.overrideAttrs { doCheck = true; checkPhase = '' @@ -2168,6 +2636,16 @@ in ]; }; + persisted-nvim = super.persisted-nvim.overrideAttrs { + nvimSkipModule = [ + # /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value) + # https://github.com/olimorris/persisted.nvim/issues/146 + "persisted" + "persisted.config" + "persisted.utils" + ]; + }; + phpactor = buildVimPlugin { inherit (phpactor) pname @@ -2199,6 +2677,11 @@ in nvimRequireCheck = "plenary"; }; + poimandres-nvim = super.poimandres-nvim.overrideAttrs { + # Optional treesitter support + nvimSkipModule = "poimandres.highlights"; + }; + popup-nvim = super.popup-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2212,8 +2695,30 @@ in ]; }; + pywal-nvim = super.pywal-nvim.overrideAttrs { + # Optional feline integration + nvimSkipModule = "pywal.feline"; + }; + qmk-nvim = super.qmk-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + nvimSkipModule = [ + # Test assertions + "qmk.config.init_spec" + "qmk.format.keymap_spec" + "qmk.format.qmk_spec" + "qmk.format.zmk_spec" + "qmk.parse.qmk.init_spec" + "qmk.parse.zmk.init_spec" + "qmk_spec" + ]; + }; + + rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs { + nvimSkipModule = [ + # rainbow-delimiters.types.lua + "rainbow-delimiters.types" + ]; }; range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { @@ -2248,6 +2753,14 @@ in nvimRequireCheck = "refactoring"; }; + remote-nvim-nvim = super.remote-nvim-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + ]; + nvimSkipModule = "repro"; + }; + renamer-nvim = super.renamer-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2361,6 +2874,45 @@ in sqlite-lua telescope-nvim ]; + nvimSkipModule = [ + # optional dependency + "smart-open.matching.algorithms.fzf_implementation" + ]; + }; + + smart-splits-nvim = super.smart-splits-nvim.overrideAttrs { + nvimSkipModule = [ + "vimdoc-gen" + "vimdocrc" + ]; + }; + + snacks-nvim = super.snacks-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires setup call first + "snacks.dashboard" + "snacks.git" + "snacks.lazygit" + "snacks.notifier" + "snacks.terminal" + "snacks.win" + "snacks.words" + ]; + }; + + snap = super.snap.overrideAttrs { + nvimSkipModule = [ + "snap.consumer.fzy.all" + "snap.consumer.fzy.filter" + "snap.consumer.fzy.init" + "snap.consumer.fzy.positions" + "snap.consumer.fzy.score" + # circular import + "snap.producer.create" + # https://github.com/camspiers/snap/pull/97 + "snap.preview.help" + "snap.producer.vim.help" + ]; }; sniprun = @@ -2433,6 +2985,11 @@ in meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; }; + spaceman-nvim = super.spaceman-nvim.overrideAttrs { + # Optional telescope integration + nvimSkipModule = "spaceman.adapters.telescope"; + }; + sqlite-lua = super.sqlite-lua.overrideAttrs ( oa: let @@ -2484,6 +3041,11 @@ in nvimRequireCheck = "stylish"; }; + supermaven-nvim = super.supermaven-nvim.overrideAttrs { + # TODO: handle supermaven binary + doCheck = false; + }; + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook3 @@ -2590,6 +3152,8 @@ in telescope-nvim plenary-nvim ]; + # Meta + nvimSkipModule = "frecency.types"; }; telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs { @@ -2741,9 +3305,16 @@ in ''; }; + text-case-nvim = super.text-case-nvim.overrideAttrs { + nvimSkipModule = [ + # some leftover from development + "textcase.plugin.range" + ]; + }; + tmux-complete-vim = super.tmux-complete-vim.overrideAttrs { # Vim plugin with optional nvim-compe lua module - doCheck = false; + nvimSkipModule = "compe_tmux"; }; todo-comments-nvim = super.todo-comments-nvim.overrideAttrs { @@ -2751,6 +3322,15 @@ in nvimRequireCheck = "todo-comments"; }; + tokyonight-nvim = super.tokyonight-nvim.overrideAttrs { + nvimSkipModule = [ + # Meta file + "tokyonight.docs" + # Optional integration + "tokyonight.extra.fzf" + ]; + }; + triptych-nvim = super.triptych-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "triptych"; @@ -2762,6 +3342,14 @@ in postPatch = '' substituteInPlace lua/tsc/utils.lua --replace '@tsc@' ${typescript}/bin/tsc ''; + + # Unit test + nvimSkipModule = "tsc.better-messages-test"; + }; + + trouble-nvim = super.trouble-nvim.overrideAttrs { + # Meta file + nvimSkipModule = "trouble.docs"; }; tssorter-nvim = super.tssorter-nvim.overrideAttrs { @@ -2913,6 +3501,10 @@ in ''; }; + vim-apm = super.vim-apm.overrideAttrs { + nvimSkipModule = "run"; + }; + vim-bazel = super.vim-bazel.overrideAttrs { dependencies = [ self.vim-maktaba ]; }; @@ -2964,6 +3556,11 @@ in ]; }; + vim-flog = super.vim-flog.overrideAttrs { + # Not intended to be required, used by vim plugin + nvimSkipModule = "flog.graph_bin"; + }; + vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs { dependencies = with self; [ fzf-vim ]; }; @@ -3037,6 +3634,11 @@ in buildInputs = [ vim ]; }; + vim-illuminate = super.vim-illuminate.overrideAttrs { + # Optional treesitter integration + nvimSkipModule = "illuminate.providers.treesitter"; + }; + vim-isort = super.vim-isort.overrideAttrs { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ @@ -3062,6 +3664,11 @@ in ''; }; + vim-matchup = super.vim-matchup.overrideAttrs { + # Optional treesitter integration + nvimSkipModule = "treesitter-matchup.third-party.query"; + }; + vim-metamath = super.vim-metamath.overrideAttrs { preInstall = "cd vim"; }; @@ -3121,6 +3728,11 @@ in meta.maintainers = with lib.maintainers; [ farlion ]; }; + vim-tpipeline = super.vim-tpipeline.overrideAttrs { + # Requires global variable + nvimSkipModule = "tpipeline.main"; + }; + vim-unimpaired = super.vim-unimpaired.overrideAttrs { dependencies = [ self.vim-repeat ]; }; @@ -3215,6 +3827,12 @@ in dependencies = [ self.vimproc-vim ]; }; + vim-ultest = super.vim-ultest.overrideAttrs { + # NOTE: vim-ultest is no longer maintained. + # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead. + nvimSkipModule = "ultest"; + }; + vim-zettel = super.vim-zettel.overrideAttrs { dependencies = with self; [ vimwiki @@ -3222,6 +3840,20 @@ in ]; }; + virt-column-nvim = super.virt-column-nvim.overrideAttrs { + # Meta file + nvimSkipModule = "virt-column.config.types"; + }; + + which-key-nvim = super.which-key-nvim.overrideAttrs { + nvimSkipModule = [ "which-key.docs" ]; + }; + + wiki-vim = super.wiki-vim.overrideAttrs { + # Optional telescope integration + nvimSkipModule = [ "wiki.telescope" ]; + }; + windows-nvim = super.windows-nvim.overrideAttrs { dependencies = with self; [ middleclass @@ -3239,6 +3871,14 @@ in sourceRoot = "."; }; + yanky-nvim = super.yanky-nvim.overrideAttrs { + nvimSkipModule = [ + # Optional telescope integration + "yanky.telescope.mapping" + "yanky.telescope.yank_history" + ]; + }; + yazi-nvim = super.yazi-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "yazi"; @@ -3266,6 +3906,61 @@ in }; }; + zenbones-nvim = super.zenbones-nvim.overrideAttrs { + nvimSkipModule = [ + # Requires global variable set + "randombones" + "randombones.palette" + # Optional shipwright + "zenbones.shipwright.runners.alacritty" + "zenbones.shipwright.runners.foot" + "zenbones.shipwright.runners.iterm" + "zenbones.shipwright.runners.kitty" + "zenbones.shipwright.runners.lightline" + "zenbones.shipwright.runners.lualine" + "zenbones.shipwright.runners.tmux" + "zenbones.shipwright.runners.vim" + "zenbones.shipwright.runners.wezterm" + "zenbones.shipwright.runners.windows_terminal" + # Optional lush-nvim integration + "duckbones" + "duckbones.palette" + "forestbones" + "forestbones.palette" + "kanagawabones" + "kanagawabones.palette" + "neobones" + "neobones.palette" + "nordbones" + "nordbones.palette" + "rosebones" + "rosebones.palette" + "seoulbones" + "seoulbones.palette" + "tokyobones" + "tokyobones.palette" + "vimbones" + "vimbones.palette" + "zenbones" + "zenbones.palette" + "zenbones.specs.dark" + "zenbones.specs.light" + "zenburned" + "zenburned.palette" + "zenwritten" + "zenwritten.palette" + ]; + }; + + zk-nvim = super.zk-nvim.overrideAttrs { + # Optional integrations + nvimSkipModule = [ + "zk.pickers.fzf_lua" + "zk.pickers.minipick" + "zk.pickers.telescope" + ]; + }; + zoxide-vim = super.zoxide-vim.overrideAttrs { buildInputs = [ zoxide ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d6e4d6f59e0d..e89f97d07ae7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -903,6 +903,7 @@ https://github.com/ryvnf/readline.vim/,, https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, +https://github.com/amitds1997/remote-nvim.nvim/,HEAD, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 3d0cbe7198c2..e996a39d9d4b 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.2"; + version = "1.6.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-L56aX5UFFodSR2YHWt6Y+s83q3YoAuYvyqXP/XVMp20="; + hash = "sha256-nWG9r0/qs9Jrj0Bo3RKtNSP1pnUd7CRiEkkRWf0UMNs="; }; buildInputs = [ diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 09a38a501e5e..2986d7981b35 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, lib, fetchFromGitLab, - qtmultimedia, qttools, wrapQtAppsHook, ... }: + qtmultimedia, qttools, qtwayland, wrapQtAppsHook, ... }: stdenv.mkDerivation rec { pname = "tipp10"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; - buildInputs = [ qtmultimedia ]; + buildInputs = [ qtmultimedia qtwayland ]; meta = { description = "Learn and train typing with the ten-finger system"; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index cec05a410c2c..b57ce2570e4e 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.169.0"; + version = "0.169.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-HGdNCGCJ8LsXyRSinNu1EDy9XuI7mTHONAgti2SETWw="; + hash = "sha256-0tkUmLItw8VYApCVRwfzn4LN4kYcbQKDQd2QSafap1A="; }; vendorHash = "sha256-zWgza1eiO4UF/RL2Z4R4bvO+tgcN1KT8nBZor/plY+A="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 55050006b651..fa842dfd81ff 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,11 +831,11 @@ "vendorHash": "sha256-jHm6fDk8zjrZcWKHOKhhFmRICBwx/d7BD4Ycy8gcQWU=" }, "namecheap": { - "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", + "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", "repo": "terraform-provider-namecheap", - "rev": "v2.1.2", + "rev": "v2.2.0", "spdx": "Apache-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index f3726d047cd0..75d5df9ecfa9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.4.3esr"; + version = "128.5.0esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/af/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/af/thunderbird-128.5.0esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "677a968ad1bf6d417f7e03777aa67bac01e2e8d3aeff85b4120b0c69bd6dfcc9"; + sha256 = "bf141809be942000802ccc5c7e7f9c9de64345e2ee323f57c29e30fb8301613f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ar/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ar/thunderbird-128.5.0esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1f0a7658e10b8e252b19b9c9b6f2e1277017b9782723ad7cefb3cb978eeb114f"; + sha256 = "ac71adbd3510e52f5280c2674c9ce3104f41d7ff0800c244093a331d04b4971d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ast/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ast/thunderbird-128.5.0esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "865ec1f922c1c928e89f19ebbb76d4473ddfee98ff47a3e01aa2f8bb71630808"; + sha256 = "51838e12a6a1f304a0a5c1c85417bc81b5e2f3870a58912e08e088bfbca636d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/be/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/be/thunderbird-128.5.0esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3345b67e2049573472178060452ccf3e6707537892fb6da298fd1fa235fcaa5f"; + sha256 = "b9a95f985de60041985ba11611af933d9cfdc15a5345bb1f71019e1caae5fad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/bg/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/bg/thunderbird-128.5.0esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "68358b07856975a185b749858487a033833f4011201baf2f6e8516c6faa8f5b2"; + sha256 = "ab8493efca260eee3ade25251be5cf00549c80940c22560fb3927a2c4b1e700f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/br/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/br/thunderbird-128.5.0esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7366e610b124d2740bee2fece510f67b4147712b61d98ac8dde85522b6dc0e63"; + sha256 = "a3134f3df5baab7c99acb53f9ad27e367b641ea42216f8753cb0c55513d863d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ca/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ca/thunderbird-128.5.0esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "15ea59c2b973f3dbb38d00835964de2b0fcb6e80ce5aac6edb456c489764fef5"; + sha256 = "57e922d86a1fad2d220372eb1086236853b56a04619eb3ce5b72cca24532d46c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/cak/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/cak/thunderbird-128.5.0esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e7b546ee241bf717bf283a2c44e77656770f681456c138427cf10af46845a996"; + sha256 = "0ac666a4f2066bfc7b77ed3400340c3e7510b695d979dee19b2dbe08cad64df9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/cs/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/cs/thunderbird-128.5.0esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9fdf7ece475955c2c39ebcc7d16a65688d8bf054e0bc281cd16f0e10a9055f3b"; + sha256 = "39eed8ef4c0d6035cd250acc46852c590c95f2985f04f32619013cfade06f893"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/cy/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/cy/thunderbird-128.5.0esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "41eae3eab14fead7b6d4bcac2bb0f0f5ec66433d523a3310afda8ccae96063d7"; + sha256 = "cd11988b3bc4b228470e36f1af45571e8a85b96361da46410a0ee38a366af2b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/da/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/da/thunderbird-128.5.0esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "16c1456abaf174e9fb81ded8418ff5913e0376e104398b29bea5c0d8a7a7fad9"; + sha256 = "0c05b4aad2e76343a1923f89593ae51bf3a2db326d44e089834e9d54bf31c263"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/de/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/de/thunderbird-128.5.0esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7a385dce0557c79fdeba30f04b8ea741ebb70be8f8340c49880285ac4eb5d916"; + sha256 = "8b281370178e06a6a35133c7cdb791e22cef34da9dbf9b84b5847b8b4201746b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/dsb/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/dsb/thunderbird-128.5.0esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5ddf0218a25f0b4619bafe4e7258575b7bb1e5f253a84fa71ce537b33103af88"; + sha256 = "324a99f3ba46d9ccef0f7ac0dab35db5330cddfa3c09b328770c7812fe3d364c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/el/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/el/thunderbird-128.5.0esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d5159cd596aa78465b2f79cede6377d904382a287ca865992e5a2a74f35e4929"; + sha256 = "08f49bf601feb248f98bbb5d558440f04c7df9e320466c0282c0588fda275a03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/en-CA/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/en-CA/thunderbird-128.5.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "110cbe9edb91a72a7332a48523cf4dc42ba9ae25528dddf11d7522eae419d7af"; + sha256 = "329fa38d6e881706bfbbaa8b9625b9e681e41606b42cfd9f25c866a45ab58fee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/en-GB/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/en-GB/thunderbird-128.5.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c1f49f9ec2d21bf28c293457d8cb1d8c34cf234dfe3f00c2d718ee0cf54ab7d8"; + sha256 = "276387261629de231ad41570c0821d39c4e343f6b34bb31867e7c4ff5bc7c9b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/en-US/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/en-US/thunderbird-128.5.0esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "baa3801ed20599083e6e0b15cd8bdc7794b2b4af236f305accb7c4e6bf11b614"; + sha256 = "d612084b5e5f4005577171bc8c8bf8ee7e38fd7e16cbb2b7c32fb4148faf0e50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/es-AR/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/es-AR/thunderbird-128.5.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0163af9517613edbef401df51c9a22d6c72816cfd4041d3f98bc3140f58c8e23"; + sha256 = "81a62da51a8b732721783059359f98033778831db689cb602bf1add2c53256b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/es-ES/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/es-ES/thunderbird-128.5.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "02194d20f2a396c335417b336ff1897ebe144d204038afdf048484e4452ec16d"; + sha256 = "b7374e7069ef698c83c55a32247543b0229bf1f1dc2a1656532b95dde2d6e3a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/es-MX/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/es-MX/thunderbird-128.5.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "81fe8789b4e9fc67ce46a7ee6aee11f511644818b99e1332be7f73238ce0e38f"; + sha256 = "63b228f1de074f1f7e59d2e26f5531c49643e9e83ed2c87dd52c39b059c8985a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/et/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/et/thunderbird-128.5.0esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b22c78ecc2cce9323c5b034fb72656b7026a4a3f00f322dc1914b764509935af"; + sha256 = "6d6f597f49a0c0606257534d44075ebacb25f503a0380858b6f46841d78e20de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/eu/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/eu/thunderbird-128.5.0esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4e76bc6ddbb55c3adfaf7b1e25bb4bab094f2396b5882354b1ff61bbeaed98ab"; + sha256 = "441c835d3990fd72ceb87fa1a8474ba0988c9423f4fad6558eade93ad840d730"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/fi/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/fi/thunderbird-128.5.0esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0dbc4365be81ea22062c4b497bd36dd51fbfd3a6e244d5dc240d07533291206e"; + sha256 = "2b6d9faf698fbf46fde988b1f9bcfa35a5ecad69327f1fc50f4a0f9f99ef2e62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/fr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/fr/thunderbird-128.5.0esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6f8b0bbd726a8acb86efd0f30f4031cf328397e1a6f9db27dcda84742d12d080"; + sha256 = "7b96d4d29d4185cf3f4539e79466d71e110c516f1ea5b71e909bd4f6d6c197e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/fy-NL/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/fy-NL/thunderbird-128.5.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "64b69a446807ca6307a45581d2e31cd52406b82b64a7cc5b711abff85c968281"; + sha256 = "3793b5f8ea3900980608d8771597645caa1c3173b3ca50e52d39002d5ff45fe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ga-IE/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ga-IE/thunderbird-128.5.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1ccf06a5ab5013b13e396470ae0bee3a052c81764e65a2223b6cbcf360e249e9"; + sha256 = "e71dda89ed9d87a1a4685efc2d30962db948c5cf01eb70a22adcdff93c96f371"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/gd/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/gd/thunderbird-128.5.0esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1e7b889eac7a26fd4fbd1d47c949b933c61291ee54b602e952c314e0b0fd781"; + sha256 = "70262e69f9b02d86358d9c9303becba44ffec53ef982bdc3eebac026c83702bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/gl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/gl/thunderbird-128.5.0esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "935285e1b80885f0a89fd12c38d4b3437538b25871304f4797bb4ac798542aad"; + sha256 = "c4cb4c3e0d882dd460f476da3d22553a2402cf54865411005754777f8c370644"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/he/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/he/thunderbird-128.5.0esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f16326393b05bf99aa290ffa76936c3be3324d4212af06373b2869f68be01de2"; + sha256 = "b455c97a5a1e0ecaef5374b11ab08ad709330c14bcc29abaa4767e151ab2f1ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/hr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/hr/thunderbird-128.5.0esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4555c83f05fb55264cd0d96892eee0b2771aa16425da1078f0cf20012641345e"; + sha256 = "1ac9c1583ce60d5f6878038c60cfc0bcee90a5fb34cc1d4f0a239f710586668b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/hsb/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/hsb/thunderbird-128.5.0esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e61b32e045c80c5d5befc0c22167f45989a01cef78e7d5f22085693dbf477ba1"; + sha256 = "f40a7d7eec65fe20e3ddd26d7dbb49c80131ade60ccb1872b51c6cf09b5cdaac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/hu/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/hu/thunderbird-128.5.0esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3f5791a0e8bd9a9fd089deb80e33028b5cbe6449944cbcf1cc8c38647386dd9f"; + sha256 = "876cd1f1840edaf44602d42012bcc31b2f928f83915869e7a1a85b74ec1b8cc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/hy-AM/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/hy-AM/thunderbird-128.5.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "9b365fd16e4274e4d560a4d42f510e547c8ea1ba48ec7ec34f529df7a6d8afa8"; + sha256 = "974f0eb2b1452d787036db75dc8ef06ccf1d15521ddcdf7fefe89e25ea0451c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/id/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/id/thunderbird-128.5.0esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f5579d30c18b3e3c5ece3bc3911050921c3ac70a2561eb2d7dbd13fcd821ce13"; + sha256 = "2e7ba78aed383c152fbf443e74a25ff41c22b28a34fcdcf8d347ff1c0e46ce77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/is/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/is/thunderbird-128.5.0esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "aad75579660dab0909336fccf9a2905e63a1448a81b46c3e6e9c695e73426f3f"; + sha256 = "55c295af6a1339b7c432834381d587ea921d558ecb78f29e29564d1f394c155a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/it/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/it/thunderbird-128.5.0esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1f2cd75945ed72f0901661d885da89cfed7784bbe4ff5fe42fab5a21c8961f99"; + sha256 = "2479f33f19d0d2724202a133e2590931ceab894660c3dc775151f6c850c9e42c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ja/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ja/thunderbird-128.5.0esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1d849adfa4724c1b832d3ae55426698bfea937e26c0f6724c41e242af0e5a6df"; + sha256 = "1f3b76a1193330f7a4538400805a0cdafad56b96a4cc4bc2ada5cf1d62361648"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ka/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ka/thunderbird-128.5.0esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "43c7dfb910f5ae7bc74d802b75eb332d8a817d78f117db6c4c10c049cfd789e6"; + sha256 = "b63d8939320c1dd3d6e9a7d965f82b0fc388640e304fce7995f7a13710339e99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/kab/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/kab/thunderbird-128.5.0esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e58cc49875bcfe71035e06130482bbd17245e0d382fc87aad5ee1ae8e3ebc344"; + sha256 = "d221cd9396a1b2b8945e0e75b8ad118f2ee34d45976bdb9b717dae0a96db9286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/kk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/kk/thunderbird-128.5.0esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "df3f1aa4fc6d7dfd342e630a34b5590c28169c44a2f01d3f8c3c88a60d5cac52"; + sha256 = "56a63af61c24148d5fe12601580157381669ab670f07507107d9ea46d03d4392"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ko/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ko/thunderbird-128.5.0esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "df0c47381ae58f4c44b32a7a15d64d813fedf9406506f276a11fb1e3dbdd917c"; + sha256 = "b5d2af0451f659e7abb6d548ceff053e3cbf13cf3eb6c42374a9a193e331fda7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/lt/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/lt/thunderbird-128.5.0esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1153a50988bea6ae1705a0a914da8c44fca55e836263734e85bf996738edebfb"; + sha256 = "5ee2a8440be5e344564a5d4b4f4629df691e6245f2b0f2024020752430ba488e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/lv/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/lv/thunderbird-128.5.0esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d0799d3af9bfcc59427e60d9bc2c67339d64bb8c38d7538fbe302b6a83bc8edb"; + sha256 = "3e2fe77604f976102a274e77a506b025b4c0443077082da6cfaa648b3018f322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ms/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ms/thunderbird-128.5.0esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ebfc771a9c47cd31b6e3f74ac565356fa73105037651edbdc549adf0c458b293"; + sha256 = "e180dc2c02fad1473272b7dfb447208a1b8abdb335d362696d649fe6f2fa9da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/nb-NO/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/nb-NO/thunderbird-128.5.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d3ce84ea436a1fcd0f10dc227d622bc479125ca35fc1a6927e993842d1c20928"; + sha256 = "472ae10df128c9d16a5c1bf688edc4bf43da36b4f254c55b37e5af8768339581"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/nl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/nl/thunderbird-128.5.0esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b0ebd946bead254cc1f9fe82dd013f686817ef36801c0303c720ae1291485681"; + sha256 = "18235f21aae857efcff66427a4d1e3a513c71d89aad3142e4161f61c7775224e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/nn-NO/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/nn-NO/thunderbird-128.5.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "67009401be98b191cab030acbc54f352cb7466c38b682807ad23198790fb2459"; + sha256 = "99fe98fc5c5a015a053a2918625be003a67ffb0369f8b373cda1684391a9a281"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/pa-IN/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/pa-IN/thunderbird-128.5.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d5347535345cc9c47906f833209d6cfa80998737f841852d8503c6262735cb44"; + sha256 = "f7f27918958d21c681c10b413907b3517e5090134fd29a659b0c31dfba6f9e69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/pl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/pl/thunderbird-128.5.0esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "0fd6c9c0d329e38e77c5bccce33e68db2247bd00acb7931cf5067464710d27bd"; + sha256 = "2dbfacbedb8dcfaa57553240ea7b52320a5ee0ea2351aeba731532674fd8903e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/pt-BR/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/pt-BR/thunderbird-128.5.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "3b1727a7ceff3c2b85a7d5a074cc7b12c4e59ddd670ad7557c075a04f5375ccd"; + sha256 = "91e59ecd438834f178d283f305500030c5d7f37ecd527c4c052a1b77b0f789d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/pt-PT/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/pt-PT/thunderbird-128.5.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "75c0cf0b79cb8bdf0129b9d71ff0dd0b2239a9b64ba4786dbd6d7c00cf76fd48"; + sha256 = "3677a355554546e8dfd0654829662fb5d0ec50eeb95516ce50a96e656f055bd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/rm/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/rm/thunderbird-128.5.0esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1ed7b0b744b94127ac5c5903da5bc5e45d131156d0f8b99ecf6d3bcb7d50938c"; + sha256 = "4ff5642d2e03153feb8c692959879391bb2506fe7727009ad50ca8163c06f293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ro/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ro/thunderbird-128.5.0esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4fb5c868689b8acf4b06caf89e104bed46a5b467de1ccc813e56c56416c4eacd"; + sha256 = "db9d6d7e5b786d20f3fa9dc270a0ea1cc6e2ca3c1c87079f2b490300b402bc02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/ru/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/ru/thunderbird-128.5.0esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ec6cdc1a46ddcba234cfbc777273b76d38c913dff07e017ac1f13bce32466f5a"; + sha256 = "0153f7690b1996b0e0f13bec1cbb19eaedd84dd3a10d0e3f4343ecc623407140"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/sk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/sk/thunderbird-128.5.0esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1c64614b9cf7d427e075a679bdf6f76b9c5907cbe4b73cebe9c12c920d9171f0"; + sha256 = "0ed388ce9ff2bfc214b612b0a2e8982ec6162e4950769b0deb89a362f5440900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/sl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/sl/thunderbird-128.5.0esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "76bac02265409f8000095a70c523fd4570205f2f73a47d637cad5b4272134863"; + sha256 = "2cbd30d96f27d5d292d88c0a73e2e13589b254527d109fab2d2aae7bda7d7ff1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/sq/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/sq/thunderbird-128.5.0esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7de7008c4a269f770e2843d95ced6e3880a6b6188767aff1eabdb7a822df408f"; + sha256 = "cdbf3a92fa32a750575b6c1258ddae971ce62a1e6d57ac24b137742830306977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/sr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/sr/thunderbird-128.5.0esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "078617b08d7c0bc158c34f3447b656a51fe7c6d1cc4ef264a1a21fb00b863028"; + sha256 = "f67aa8002c54ff88405ee37a2d875826fd46e8481750138531c713d15a97d79c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/sv-SE/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/sv-SE/thunderbird-128.5.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "99632681537b7edd0e494c912045131df1982a4a88e3caf2f230be1672d4ada4"; + sha256 = "82c2b8a75d8bb8c3261366b049ea6524317d254d2dc61a5ee813d7220e927f6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/th/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/th/thunderbird-128.5.0esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "241bcb16d30c47761295c1cadf52c7c34baf120e5d9ba543a98b33fd0f957d47"; + sha256 = "5e55930bda79b5cefd10f5d7418f67cc355eb5b3548e424984a8ee18c5aba5ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/tr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/tr/thunderbird-128.5.0esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a969166057fdb9f024478eab6968f515a1f64d7a68d45f3ae9bfea154a8f87a5"; + sha256 = "4285425d9cebd097360212de6d9534f05373478946b6ad1a0233421246fa7c0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/uk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/uk/thunderbird-128.5.0esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a5c2e555e5b79fd5a1b16da110ef7b67a1925de38cbec1f16f6db61a0b57daee"; + sha256 = "417c6482d30b61839b3545cbcccb7664f91e9993a94a7475a513a6842646240d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/uz/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/uz/thunderbird-128.5.0esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a8e86ffb844e11662c9afad55884d5605acf3b67cf1ef9ad945ab6e1f7986c5a"; + sha256 = "6a051d014f8bdca6195e3f21dd481be9a232501e0280843cc07b0fde09149801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/vi/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/vi/thunderbird-128.5.0esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a06bad043ac7a2cfbbb23e5a740851997f3efbfc624a48885c998f50b0e3c70c"; + sha256 = "d5ebe571e630ef8a963f5a27e6e0096eccfc12f35fd5437bae82bacdf0e5538e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/zh-CN/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/zh-CN/thunderbird-128.5.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a42ea03857414d80b7f38f1859b58b280812753f269af6a14ed92ac5640886db"; + sha256 = "97563908550924bc43d99da7d096e7260b3c23e59df58a51bfe1b6c76de54f33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-x86_64/zh-TW/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-x86_64/zh-TW/thunderbird-128.5.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d3acef8e4f8f9ef76a395c1942b352754ecaa941488157c717318c2b89293ccc"; + sha256 = "bce0c4667d7444d63802badffdaad9f7bf3d916233f836b98b7565fc68171804"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/af/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/af/thunderbird-128.5.0esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7159115d63e8339c6fad265f9fcf21c5bb69113c1cd88a2f549f383db26a573f"; + sha256 = "ba311de618f1d21f816de08fe19410f5e7623c177ca1a60054b62457662b4721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ar/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ar/thunderbird-128.5.0esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "15deabb5b4144edc9509c206d0a2fa46f49aa11679091c8b0caab9e25b8fa210"; + sha256 = "7b9a0a04a18ee7a051254fd72d0cefbbf82b86cf3b6fcefaec8481ca969c70bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ast/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ast/thunderbird-128.5.0esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6a725deca4468a14fd1f319e3df70acf89a928d698dd64348398c7a386f5a067"; + sha256 = "3cf834ba074f2a38e0686d820ee9abe6714b3f0e4d1c385b22bf81e4681eb42a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/be/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/be/thunderbird-128.5.0esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "aeb20709304687f52f65e5a57dab2887d6072d38e9f7e6d4b43cf084f3aa0918"; + sha256 = "9c7e2f2e1285b4a728948226d8b3494c79053b5ec210b2b42c261b18a79c8f68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/bg/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/bg/thunderbird-128.5.0esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0c938e4ca22c2927ddb9f87a345c82042dc9f379e6a44ab1877d5e1cb86fa055"; + sha256 = "fa4786856bf6966c5e6f3bb0066950cd3da1f6fed2179e7071ca76d96ea09880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/br/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/br/thunderbird-128.5.0esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9abb43d8a4ae5c033976235c2411756650ad1131620e61544321387aee83c19e"; + sha256 = "9baa235bfdf221d9494c028ec29f968be68a23595ef4bb6817f71bccaa5cae8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ca/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ca/thunderbird-128.5.0esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "36c7e2af8233b00b22494840c0e8651d340e76cacea88c50a5c547e07c805c90"; + sha256 = "d3ca0c86f8ce9313272c540cf7ab87e01b7a6f183adceff9f31a571eacbcc0bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/cak/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/cak/thunderbird-128.5.0esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "29be04a346f06611a0da6f28b01bb68170eb464a33317a794a2e68f5798c8bc0"; + sha256 = "97cb59dfaaf9f7f7c68f3d6030aa4e65314f80ed2be7671a188d10aeb2b1166a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/cs/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/cs/thunderbird-128.5.0esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5b608a1a2cd6e1724d9f6d494fe95223e48d669959904d36267e40cbf79e5ba3"; + sha256 = "acb99acc481fdaa9135e07e10c962df82d66f7296fec84bbddba324248a3b115"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/cy/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/cy/thunderbird-128.5.0esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9c61b2c94352fd32bad22b706ff840734e4dc60cf5be37b1926c740b5aa17f7b"; + sha256 = "b3945247f968f32b59fbea6454d05bc32973d6caee3a1b89a3551555321ee18c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/da/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/da/thunderbird-128.5.0esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d589a65574a918e98ae11579bb146133bc5efefe0f1dbc38bc091acbea3bd6bd"; + sha256 = "c786d70438ece2b4b20d4ddfb79ba150981e4a46d5095525da9cfe5ec8d3b5ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/de/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/de/thunderbird-128.5.0esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2bf891b2811c1858923053240d765a9a889123911804b62fac4d7b3175e36603"; + sha256 = "98e47e0264d620ec111ebc29fd56f07b113adf4dabe29c8982e6ae8f325dc0df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/dsb/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/dsb/thunderbird-128.5.0esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "847b553b4375f88497c38e6b02c6084566b778b782a4a7c4c721d09cbe9b3ec9"; + sha256 = "61c38ccd7c956da45aae15ed5d83387efdf6d1a2efd5a23bd2cd689885d99732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/el/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/el/thunderbird-128.5.0esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6fb7799b6aeafaad725d1bcbfe65c77f705a8ea74f459431fa01b712a3897220"; + sha256 = "ee48d2bc6b808b38ef15381c35f152fd8c6b6c6ea2847a8bf1664299787ced22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/en-CA/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/en-CA/thunderbird-128.5.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ff9f3ab364c8245d89ba7fefd3a0fed4b7cbd141a433dbcb6aa3d655d30c599b"; + sha256 = "4e2ddaea30c6e96305816e325799480976bd4a592a12aeec3847f432e60f66b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/en-GB/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/en-GB/thunderbird-128.5.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "81897db63c3d1775f941f9837f24b184b60235747cb453ff474c8980adbc39fe"; + sha256 = "d5e799d093ba2aa4559e4be92791e2be385db915fbfc2965d87d3c19b2a67a46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/en-US/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/en-US/thunderbird-128.5.0esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ffcfd9052aa66e2a639c025c2df0de73fd611bdae7cd5462bfce8088eee08a43"; + sha256 = "225928a3496a12af6b7b324255702e0057e3e80dd4bafb1166394a2bc3933d2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/es-AR/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/es-AR/thunderbird-128.5.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5bfe096486d392bfec4d231303bc74040630186275f7790a9004447acf0a96cf"; + sha256 = "269ec58e0278505c778353e454e91756720b8c0c65b8a976e7ab443380c6c1bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/es-ES/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/es-ES/thunderbird-128.5.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "86439dce0037b2cf3537f33fba50a4293baabb303bd89685ad1d50e109545bf4"; + sha256 = "38ae3bb15128c5c3aa7f8e9a3361c5cff75f16fc27bccc55589f6e93b65567d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/es-MX/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/es-MX/thunderbird-128.5.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "89ebeffc9c597bcd170df61b9c9fcc806eb25127219aaa0eca9e3d257734837a"; + sha256 = "44d11638c8cb8a7aa2072b37b384d17e125ab5ba62459bc2fd849e3965a66f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/et/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/et/thunderbird-128.5.0esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "402c2c5de4a14d51c4b27e59c32573d887369699a0e03ab10ed85d4f17daaca1"; + sha256 = "fdd71790464e206363c079d118fa318b2b5ae530851d381b832ccf29a172dce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/eu/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/eu/thunderbird-128.5.0esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6decfa7f19323f2eb9a8d5cc72f8036e0559b4686a9a02eedff0a2ab837c0731"; + sha256 = "4b88c2d28eea088bdcbfb6abfc3a0591a0ee2792d009027b5f420785ec8f6313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/fi/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/fi/thunderbird-128.5.0esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b818124a2c7dd8536b437bf710d2c5629513a4089d04f56c78f0f3b2b0f48d8b"; + sha256 = "55e655f7dd3ce2143cdf9069f87fab107a604c61503c8212f77db95d4f3d98cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/fr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/fr/thunderbird-128.5.0esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "319fcd2d90604b729935ba74bdb2afea5f671df210736ff28c89f6878e51df9f"; + sha256 = "cc8f46937ef91d7eb2a5e8eadf3f8a493c2575d028ea8c9644e33913f7475d08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/fy-NL/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/fy-NL/thunderbird-128.5.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9f216c97edd67cabcf524bc1b351f71fc69b9aae3280219025697e2847c5f6fd"; + sha256 = "b77292a17c79f90d986e5b29dd7a5953fe4bd25cf50c8b857c7577d4fcbccf1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ga-IE/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ga-IE/thunderbird-128.5.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fb98526507105f8170e605939d7a14c954187bef5af71976ad6dedc1440b4360"; + sha256 = "d094e795f50e27de04f6955043cbdef837d6ef62dc46dc76a4d0ae563a02f80e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/gd/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/gd/thunderbird-128.5.0esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3d0e8bb5b05081c662fe5db43d895717f40bd07a76554cd9dbbe2fd868f163b0"; + sha256 = "ded59f8212ffbe5b232cc966a41868ec7693f4512e4601d248090842632756da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/gl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/gl/thunderbird-128.5.0esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a4ea36e95409951cf5f9445206b3a5878d2e201fccc8a799d0d9132fdc00650e"; + sha256 = "38772837b18fc6c1b76776e346b5fe55c247846eaef66c438d0041b88e68179b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/he/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/he/thunderbird-128.5.0esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5e24637ccd8e29c0d06701ad31ccc1714636e731e256f4dcb7f0694f6bb76cd4"; + sha256 = "d3b5d4f548520e72c5c73aeafaf322246c1211027903b7364cab2b343ac382c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/hr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/hr/thunderbird-128.5.0esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "85d6396ce5c4377412e1cab33ab3e0df37d25301efe14248164d1451acf81205"; + sha256 = "02f9f830b1337d657d14e185426b1e1f7c0843960539391312b496285ca575b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/hsb/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/hsb/thunderbird-128.5.0esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6e8c0a583333b99e735732db3636a074496f4cd61bf6d6d12695acf5cecdbcca"; + sha256 = "7e9d8c754dc440413f69ce6c9c08c312e02c7492317541b61fa408ba234c7ea0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/hu/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/hu/thunderbird-128.5.0esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e6a7475d19a21a5e1ee3491ee850e5a2e7b0d6973e52392c3b819b8c6ec6fa6e"; + sha256 = "c346a07a93298fa66ff79013c1551e544920da1eacf5afcb8f556dc1bdbfd38f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/hy-AM/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/hy-AM/thunderbird-128.5.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9fcb5ddaaff39071914d76482c23c98c399bb1928b21a67a809eda36f49d63a4"; + sha256 = "b3d19416bfe0101db8c03a4de0c686da8fcf187943c4d187a5eaf1953d11d9f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/id/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/id/thunderbird-128.5.0esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cfaf944b28688d6c1376eb2dafdaaf6c79d401dd2a9c320dca296a67c32fba47"; + sha256 = "e7bbb5da9c98343fe39ed2e4a816825b9ac4e45c89e31a0f0b3ed685c3447bf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/is/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/is/thunderbird-128.5.0esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3c9cb079426f99ffa9c6d2c48f7adf6352d369198aed11eb6b05e23b36aab882"; + sha256 = "1528dacdd88638660567ce992705f63675530389161c5af6e3c8e9388d624faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/it/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/it/thunderbird-128.5.0esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8aef6a220fe36b98c7e295f4b549f3d85d442957d7be7faca812b5742cb513e3"; + sha256 = "2ab9b4b12aa7ffbedf2e74719ece9cb9cbe45005e751f3b4b416ad0c31ea995e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ja/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ja/thunderbird-128.5.0esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9992dd96e5fe3009e3a06a63bdd6552279219c02362fceda040544ecff4324f8"; + sha256 = "48556fcff723564962d5efc2d9b81f44f284fc402ed637b2a399c4ee39820365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ka/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ka/thunderbird-128.5.0esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "79db02e345ec26dac792557a4c69b02bcba856bdfd44fae5680f95ec952685b4"; + sha256 = "32cae5dc83bc8af9e8dc78a9d4840ae65dc7cb9398eb8941b1eb447a3673d5a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/kab/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/kab/thunderbird-128.5.0esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3b0f61646739671960f2c09f546bfecb4d563e179875fd1a067467fd954714c5"; + sha256 = "9777ffd9750589355d6813a55bc0467f956020e8f406b121e9f309e1e7b479da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/kk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/kk/thunderbird-128.5.0esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d8b8de76e7c02c4fce581c2c58778a0e5c1ef27c2f629d9bc3479e131288c96c"; + sha256 = "668aeab0a0805d16ee124b5b01b70558d1b719a3f1192c13a180d119ec5dc44c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ko/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ko/thunderbird-128.5.0esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5298b1eea4de1e81b3419a880642415a231f506a7ecda2a6bf2e2f2eaeb1b40e"; + sha256 = "bc3cb3148ff679839bdfded84fa7cd304293a6aad2309af6660436e5bba9b8ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/lt/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/lt/thunderbird-128.5.0esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "337f48719fb33b8de925db6e13b8d38704d51c21c4baa62c5b9465c4f558bb69"; + sha256 = "0892035b80226a7b2ec419d50784abe51f71554fe18d93c2ec19d2712e94992d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/lv/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/lv/thunderbird-128.5.0esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "18edf9cba92f9a831af9c2907d86e6aa8aa19424940a6b33352ec5f65cc95164"; + sha256 = "48d8939c0ef1a9873ed899c9c48136b9588834d92cf30e3c596c852ba52151cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ms/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ms/thunderbird-128.5.0esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ddf6f9d33f31d233c97e4529194dd77efda4f3aced6b659d5d2f22f4712c13fa"; + sha256 = "3232bbabf77527e425cd11482ce3958f123ef15d678091d5db8557bb6e44bb7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/nb-NO/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/nb-NO/thunderbird-128.5.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e7520c6718b47c6c64dff2cfe4e4dd45c946ab9bea7745cc1c87cb2a302fce4e"; + sha256 = "278250280ca434aa4609d6f40f736c9eb2e591f860732acccc14caea9d4fce91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/nl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/nl/thunderbird-128.5.0esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "68edf043f287fb6807b617c1ada4af8a78b13215895243bc66d6bdcb716be318"; + sha256 = "06d5b30f31d8cb020df0b29d8bf116664623b58dba6fccb4da49620d55e11097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/nn-NO/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/nn-NO/thunderbird-128.5.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae6ae674e7e036fd2429f1422514d0330054dc72ba77afd9db353f95cacb46b6"; + sha256 = "6a06b0eb2885a9673bd46f4f2fa2298e3ae97ea460e2b86b7a4974d37ab056b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/pa-IN/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/pa-IN/thunderbird-128.5.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0ca8de9796da958362668fea42ee2306fd456753600bbc4c882971031ba47526"; + sha256 = "540fea06d1665754e8aa440f2f09267b4907245d3f4a5f5a01ffd375c8b1f9b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/pl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/pl/thunderbird-128.5.0esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7ec9e349dd19d4119271af0608a3fd4e4e6fb068ac7d46d10aa2c6dd99a91e8a"; + sha256 = "50601e0dcc19aede6d8f731690a98accd3f190525eb3f9239ac002943736772e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/pt-BR/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/pt-BR/thunderbird-128.5.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "94c0d7387266b19f8209b5229c5acde88fdda31c3f40565c1002f73fa5919228"; + sha256 = "5f0f63a764a1078219fd74890260cdd88409c635c1ec5159170dd55f53e77269"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/pt-PT/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/pt-PT/thunderbird-128.5.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1696cb842dcbd9a1a028dad212ab506479c26318ae926c1d7eb668141b60d8f6"; + sha256 = "14aa259fb2791e21d597267972d73fd7653bccd9ae5d46568a2356f8d6b99ff3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/rm/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/rm/thunderbird-128.5.0esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "25d927d3b9b48c80b0a4fddd27c7b36b97ef0270c5e930d46c7eb6dbdde07598"; + sha256 = "dc76ed46119a8674bcf1d635736fed833f5059c1bbfcb5ec438cbb14ce3cfc60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ro/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ro/thunderbird-128.5.0esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "814a5bc58df335b95a8504262dde39a4d9580cbeeb2c53e2544574265eac9149"; + sha256 = "6cd8772297a9ad2081a2b09a98f7d927907734cce5be4353c323f1a47d7c5c53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/ru/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/ru/thunderbird-128.5.0esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d9686cfb49cd3451fc5988999bf7889a7b04b73876a28e0a3cf5fa24a8ed29ff"; + sha256 = "09e176ce5b1fdc83011ee13656a16f05ac001b37b312c60499ed125a7d0045d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/sk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/sk/thunderbird-128.5.0esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "56b74fe1bcb4ff3150e6c7c4f230e19f4888c084803bf202ab00ab9425e40d67"; + sha256 = "d92580dc8af74dc6f8e42f83816d5f673023bf3c99d111e4db209169120844e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/sl/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/sl/thunderbird-128.5.0esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "18695d06e06828b3266754c2ebd6706466a3b887135d1280fdc4ce956ff30ee1"; + sha256 = "9a7a336d20a67550a29820d0971c35b9ea094a725bc31322570ed87c3d0c6df6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/sq/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/sq/thunderbird-128.5.0esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3006e1f63911f812388342933473b425c6335a00d89f6c3f703f119c94f6bade"; + sha256 = "4b30e60ddd89e203f43c229e8a068f9168d4950f28872b3718526bf1cec96fee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/sr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/sr/thunderbird-128.5.0esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "aed3333d9f7237eda9688a297110cf041647e22b8649021b70faf7cf9a1d1e80"; + sha256 = "cf81a4717f8711b3271c3885d30307ed21096d5c75cd350d7c147df14758e49c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/sv-SE/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/sv-SE/thunderbird-128.5.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "29b217d9d8ebc311290d7f41f34d88bb46a2b161e489d27dab7e7cc32db61cfd"; + sha256 = "5fd223489a2547f1bd90c86ffd92ba3fab9ffca84830927d70b2d2d875d370f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/th/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/th/thunderbird-128.5.0esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "76b84f590fa8e5329943efc13b01f672db682e14620252c6e914526ef65306be"; + sha256 = "278b2051256b8d2185701ddce3ddded8db683295e1d8b28ae26c5f0aeb4c4dde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/tr/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/tr/thunderbird-128.5.0esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d4c48707e1dbea709fda5f0bda66b168bf18bcc5f45c3378cc6aebfc49fc5f31"; + sha256 = "36a716a4e38eedde49ab9632d32782fa244eed8091caa7a7acd4065c523994b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/uk/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/uk/thunderbird-128.5.0esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "5d980b8d8cfe7f9a02c349b5073eea3d427a2f35e2c43db422ab52e985f4cc29"; + sha256 = "f3e32dcbde43f6f6cbf85da393d777b781022264897958b5bc31e5cb9b4dfa74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/uz/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/uz/thunderbird-128.5.0esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "627721ea6aee46a4be15a4325408641f846bfa79ed0d8ca61873097395d8280d"; + sha256 = "4bf7147f7b81a06bf8768cc765dd8a18689ae275d802cfe21da31a80edff0dbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/vi/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/vi/thunderbird-128.5.0esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5280a6e36c6d9c17ed2311b4ca87cbb31a9f9163872146a58df34a4e9eacee2d"; + sha256 = "50446ba6696a84faaedda2d2f8e733c37410ac6d94f74f6634a9f3bacee326cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/zh-CN/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/zh-CN/thunderbird-128.5.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d7de4f53b7b27b13c731c45366827ea0de81aba2e3fb77697689bb2b63308ceb"; + sha256 = "f1bf08a735a7d6aab3a732be36ad5d37c880673a268feb4272d82b3beef48b04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.3esr/linux-i686/zh-TW/thunderbird-128.4.3esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.0esr/linux-i686/zh-TW/thunderbird-128.5.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a22f80236888b3ae1d3969c748f5fd69812bd8c65b68ddf8a512d0c9057bbad"; + sha256 = "523cab1dac4989ea47a3432d3d99bb467f9e1e71e90a9c0069c81eb9c8ff946e"; } ]; } diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 014dd89d7499..917012279eb6 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -9,7 +9,6 @@ mkDerivation rec { pname = "soulseekqt"; version = "2018-1-30"; - name="${pname}-${version}"; src = fetchzip { url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"; @@ -17,7 +16,7 @@ mkDerivation rec { }; appextracted = appimageTools.extractType2 { - inherit name; + inherit pname version; src="${src}/SoulseekQt-2018-1-30-64bit.AppImage"; }; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index a6b08042db99..18b3ec99229b 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -26,7 +26,9 @@ rec { ]; }; - extract = args@{ name ? "${args.pname}-${args.version}", postExtract ? "", src, ... }: pkgs.runCommand "${name}-extracted" { + extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }: + assert lib.assertMsg (name == null) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name."; + pkgs.runCommand "${pname}-${version}-extracted" { buildInputs = [ appimage-exec ]; } '' appimage-exec.sh -x $out ${src} @@ -58,7 +60,7 @@ rec { wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage (args // { inherit extraPkgs; - src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args); + src = extract (lib.filterAttrs (key: value: builtins.elem key [ "pname" "version" "src" ]) args); # passthru src to make nix-update work # hack to keep the origin position (unsafeGetAttrPos) diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index bd1464c550e8..92a8b72eb0e5 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -3,22 +3,39 @@ buildGoModule, fetchFromGitHub, stdenv, + nix-update-script, }: -let + +buildGoModule rec { pname = "abctl"; - version = "0.13.1"; -in -buildGoModule { - inherit pname version; + version = "0.22.0"; src = fetchFromGitHub { owner = "airbytehq"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ZZP5wXsPtqkZd/sdj/LU8M/DYv0gjIWRspAFrp3ETH8="; + repo = "abctl"; + rev = "refs/tags/v${version}"; + hash = "sha256-GWtEwRXMaZNjbxZ8WGsJBwWJ2qzIY7YOk2KKUOtSEq0="; }; - vendorHash = "sha256-uvOKH/MLIoIwYClpTIj010os9dGkkZPAVV0RYBjjzVk="; + checkFlags = + let + skippedTests = [ + # network access + "TestManifestCmd" + "TestManifestCmd_Enterprise" + "TestManifestCmd_Nightly" + # docker + "TestValues_BadYaml" + "TestInvalidHostFlag_IpAddr" + "TestInvalidHostFlag_IpAddrWithPort" + "TestNewWithOptions_InitErr" + ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; + + vendorHash = "sha256-pGNKrWgBjMeSUDE7hiJI0h1zytF+v7yuftKFxONsOHQ="; + + passthru.updateScript = nix-update-script { }; meta = { description = "Airbyte's CLI for managing local Airbyte installations"; diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index 384ffd113a0c..ff47a033a994 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "8.0.0"; + version = "8.0.4"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-q3AkqhE0hD6+cCv5UeZ4uyUi6Adrmxv4jMGYN7Keias="; + sha256 = "sha256-OimWSzVOL1JlBeZthw9Ybpfhd5TOkjIWoXbIny1lha4="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix index 4f755d71fcb4..f569f315b364 100644 --- a/pkgs/by-name/an/android-udev-rules/package.nix +++ b/pkgs/by-name/an/android-udev-rules/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20241019"; + version = "20241109"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-ZKJhGobW3F339PBsIezMTbzouomYGxDJyFbJMGIeim4="; + hash = "sha256-WHAm9hDpXsn+Isrc5nNgw7G5DKBJb7X0ILx6lG5Y7YQ="; }; installPhase = '' diff --git a/pkgs/by-name/an/anvil-editor/extras.nix b/pkgs/by-name/an/anvil-editor/extras.nix new file mode 100644 index 000000000000..4e130565fe4c --- /dev/null +++ b/pkgs/by-name/an/anvil-editor/extras.nix @@ -0,0 +1,14 @@ +{ + buildGoModule, + anvil-editor, +}: + +buildGoModule { + inherit (anvil-editor) version src meta; + + pname = "anvil-editor-extras"; + + modRoot = "anvil-extras"; + + vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E="; +} diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix new file mode 100644 index 000000000000..97a547f25bb0 --- /dev/null +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + buildGoModule, + fetchzip, + pkg-config, + libicns, + copyDesktopItems, + makeDesktopItem, + desktopToDarwinBundle, + apple-sdk_11, + darwinMinVersionHook, + wayland, + libxkbcommon, + vulkan-headers, + libGL, + xorg, + callPackage, + buildPackages, + anvilExtras ? callPackage ./extras.nix { }, +}: + +buildGoModule rec { + pname = "anvil-editor"; + version = "0.4"; + + # has to update vendorHash of extra package manually + # nixpkgs-update: no auto update + src = fetchzip { + url = "https://anvil-editor.net/releases/anvil-src-v${version}.tar.gz"; + hash = "sha256-0fi6UeppWC9KbWibjQYlPlRqsl9xsvij8YpJUS0S/wY="; + }; + + modRoot = "anvil/src/anvil"; + + vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk="; + + nativeBuildInputs = + [ + pkg-config + copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = + if stdenv.hostPlatform.isDarwin then + [ + apple-sdk_11 + # metal dependencies require 10.13 or newer + (darwinMinVersionHook "10.13") + ] + else + [ + wayland + libxkbcommon + vulkan-headers + libGL + xorg.libX11 + xorg.libXcursor + xorg.libXfixes + ]; + + # Got different result in utf8 char length? + checkFlags = [ "-skip=^TestClearAfter$" ]; + + desktopItems = [ + (makeDesktopItem { + name = "anvil"; + exec = "anvil"; + icon = "anvil"; + desktopName = "Anvil"; + comment = meta.description; + categories = [ "TextEditor" ]; + startupWMClass = "anvil"; + }) + ]; + + postInstall = '' + pushd ../../img + # cannot add to nativeBuildInputs + # will be conflict with icnsutils in desktopToDarwinBundle + ${lib.getExe' buildPackages.libicns "icns2png"} -x anvil.icns + for width in 32 48 128 256; do + square=''${width}x''${width} + install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png + done + popd + cp ${anvilExtras}/bin/* $out/bin + ''; + + passthru = { + inherit anvilExtras; + }; + + meta = { + description = "Graphical, multi-pane tiling editor inspired by Acme"; + homepage = "https://anvil-editor.net"; + license = lib.licenses.mit; + mainProgram = "anvil"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = with lib.platforms; unix ++ windows; + }; +} diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix index 1cdf6369914d..12e40444c500 100644 --- a/pkgs/by-name/ba/bats/package.nix +++ b/pkgs/by-name/ba/bats/package.nix @@ -27,13 +27,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - hash = "sha256-goHIhbBoCf1eb1N8xIHdVvAURofvLDgEDXofhDHrr7Y="; + hash = "sha256-+qmCeLixfLak09XxgSe6ONcH1IoHGl5Au0s9JyNm95g="; }; patchPhase = '' diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix index 2aa523987623..c1323a89c031 100644 --- a/pkgs/by-name/bl/blackbox-terminal/package.nix +++ b/pkgs/by-name/bl/blackbox-terminal/package.nix @@ -44,6 +44,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; }) + + # Fix build with GCC 14 + # https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369#note_1986032 + # https://gitlab.gnome.org/raggesilver/blackbox/-/merge_requests/143 + (fetchpatch { + url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/2f45717f1c18f710d9b9fbf21830027c8f0794e7.patch"; + hash = "sha256-VlXttqOTbhD6Rp7ZODgsafOjeY+Lb5sZP277bC9ENXU="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix index d8b40e0ca30d..9a9957a99aa7 100644 --- a/pkgs/by-name/bu/buildkite-cli/package.nix +++ b/pkgs/by-name/bu/buildkite-cli/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-lmsL73jck3vt6oDP699BrMq0RyrXAUuTjKtvHcNtcZc="; + sha256 = "sha256-BmlGMS+IQMl5UVqqQagcrqkQ7vtwZ0bNU+Adjim3bMY="; }; - vendorHash = "sha256-PZHMJpyZ2w3GFHQW56m+9POyXR6wMt3TmNaQENg9lWw="; + vendorHash = "sha256-5mpJIoGlvaeFSfq9C8+i9p4vO2RBcTOuvcYtcXjJShM="; doCheck = false; diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 4ce71233cb19..5c37aa4c87a7 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -18,17 +18,15 @@ let appimageContents = appimageTools.extract { inherit pname version src; postExtract = '' - substituteInPlace $out/${name}.desktop --replace 'Exec=AppRun' 'Exec=cables' + substituteInPlace $out/${pname}-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables' ''; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/cables - install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png ''; diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 06746e1b654e..83e599e7fe00 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "capslock"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-w2dB8DUCjbuzdEfX4nmaGbf9TZH58t+NZtyMoBHVG8I="; + hash = "sha256-8B9L/lLRxDI6/qUCbL8VM37glDFBTaqb0fGI9BYfICU="; }; - vendorHash = "sha256-ZRDoKB3/oxJhVFNWT71sKu8WbvIUyvXNKY1hD8ljo5U="; + vendorHash = "sha256-gmvnpJurjhCGS3/FH6HBZ0Zwx57ArSaw5dLHtJXCFc8="; subPackages = [ "cmd/capslock" ]; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index cb0b084ebf5f..739dab9a7ec1 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.91"; + version = "1.0.95"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-ucxqC5OqBqmM9+jKnGWLd9g2GDAXjAqSl+0ouhs6evA="; + hash = "sha256-VEjgSmZcy/CZ8EO/mJ2nBOpQviF4A/QQ8SpLLF/9x4c="; }; - cargoHash = "sha256-vDYpFJ+RFjouXgZc+ESPpkXA4sv5eHVZc93s+3KJj2g="; + cargoHash = "sha256-m/F6fI1d8i5lVyURti86FWAs/U14TXpgg/nemLAv4NI="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 2ba9fe941dab..be9564d52560 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.40.0"; + version = "0.42.0"; src = fetchCrate { inherit pname version; - hash = "sha256-FXScN4xOaJOiEm9NV66wsfGOj7up1DPzLK7lMofXL2g="; + hash = "sha256-vQhKvL9vRUq7WqtJ25v12DuCzO90bgXLmwu2Mm1jbig="; }; - cargoHash = "sha256-v7K62jMGNwIo1XbkWpIXuoNkaRGRAqvZ/c9wdKfY+Xs="; + cargoHash = "sha256-Gm72Hr+bVmNwdFAIsAatTcF9Il6JG2i6dQPu1ZQy46o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 4f3b16c4ddee..f49c16b2170b 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -1,26 +1,20 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-Lpcofb4yz1pR6dNJEnpkkCFdYjgt0qMzVP55kgKqjFA="; + hash = "sha256-lglCbrZhlNrBsHZUbUBNxT3QM5eNPYVvOLLTs993dXY="; }; - cargoHash = "sha256-xVG1nET020rfMIjhIcCtNr9ZCj8SgQAvXePjyKSPjUs="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + cargoHash = "sha256-WG2yxE03tRUke1GJml34ej4MUoTqQT4IZQ9OTRqaZFc="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/cx/cxx-rs/Cargo.lock b/pkgs/by-name/cx/cxx-rs/Cargo.lock index 157563e60f94..fa933dc0c273 100644 --- a/pkgs/by-name/cx/cxx-rs/Cargo.lock +++ b/pkgs/by-name/cx/cxx-rs/Cargo.lock @@ -3,24 +3,26 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] -name = "bitflags" -version = "1.3.2" +name = "anstyle" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "cc" -version = "1.0.78" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -31,32 +33,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-ast" -version = "0.1.13" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a6edb6daf3175c637a7c78e46cde7729af8d07d43f36935680a88fd55c0f1c" +checksum = "4c01fb720699b43fbf9db04dbb8d2b5d037f38938e6b8153863db7532b24a86c" dependencies = [ + "foldhash", "serde", ] [[package]] name = "clap" -version = "4.1.0" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ - "bitflags", + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +dependencies = [ + "anstyle", "clap_lex", "strsim", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "codespan-reporting" @@ -70,16 +79,16 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "cxx" -version = "1.0.94" +version = "1.0.131" dependencies = [ "cc", "cxx-build", @@ -87,6 +96,7 @@ dependencies = [ "cxx-test-suite", "cxxbridge-flags", "cxxbridge-macro", + "foldhash", "link-cplusplus", "rustversion", "trybuild", @@ -94,28 +104,27 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.94" +version = "1.0.131" dependencies = [ "cc", "codespan-reporting", "cxx", "cxx-gen", - "once_cell", "pkg-config", "proc-macro2", "quote", "scratch", - "syn 2.0.15", + "syn", ] [[package]] name = "cxx-gen" -version = "0.7.94" +version = "0.7.131" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] @@ -129,22 +138,22 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.94" +version = "1.0.131" dependencies = [ "clap", "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] name = "cxxbridge-flags" -version = "1.0.94" +version = "1.0.131" [[package]] name = "cxxbridge-macro" -version = "1.0.94" +version = "1.0.131" dependencies = [ "clang-ast", "cxx", @@ -152,9 +161,11 @@ dependencies = [ "memmap", "proc-macro2", "quote", + "rustversion", "serde", + "serde_derive", "serde_json", - "syn 2.0.15", + "syn", ] [[package]] @@ -167,20 +178,32 @@ dependencies = [ [[package]] name = "dissimilar" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb" +checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "glob" version = "0.3.1" @@ -188,35 +211,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "itoa" -version = "1.0.5" +name = "hashbrown" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "libc" -version = "0.2.139" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "link-cplusplus" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + [[package]] name = "memmap" version = "0.7.0" @@ -229,109 +274,113 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "1.0.107" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -339,61 +388,81 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.15" +name = "target-triple" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078" [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "toml" -version = "0.5.10" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] -name = "trybuild" -version = "1.0.75" +name = "toml_edit" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "trybuild" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4" dependencies = [ "dissimilar", "glob", - "once_cell", "serde", "serde_derive", "serde_json", + "target-triple", "termcolor", "toml", ] [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "winapi" @@ -413,11 +482,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -425,3 +494,85 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] diff --git a/pkgs/by-name/cx/cxx-rs/package.nix b/pkgs/by-name/cx/cxx-rs/package.nix index a2864fbb89df..fb1ce99fda6d 100644 --- a/pkgs/by-name/cx/cxx-rs/package.nix +++ b/pkgs/by-name/cx/cxx-rs/package.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cxx-rs"; - version = "1.0.94"; + version = "1.0.131"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cxx"; rev = version; - sha256 = "sha256-h6TmQyxhoOhaAWBZr9rRPCf0BE2QMBIYm5uTVKD2paE="; + sha256 = "sha256-KQlbJvULdc94SM0sx6JtukZPpaX4Gojc6Qgr20V3/VI="; }; cargoLock = { diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 848c75355d74..5ad845467a7f 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.7.2"; + version = "6.7.6"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-kfQo86Kii9kL1K5L2vTjw9fo65f4H0ikwUGFaSL/Ck8="; + hash = "sha256-loZ+xdYwlyaHamta/shX5+suG9IJxy57UIEZXrs531Y="; }; vendorHash = "sha256-IkwTi6szNf1Hh50z2jDZsJ2nncvJjnanCsQlrFELpc0="; diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix index 98f735703e1b..517a38dd37d8 100644 --- a/pkgs/by-name/de/deskreen/package.nix +++ b/pkgs/by-name/de/deskreen/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-0jI/mbXaXanY6ay2zn+dPWGvsqWRcF8aYHRvfGVsObE="; }; deskreenUnwrapped = appimageTools.wrapType2 { - name = "deskreen"; + inherit (finalAttrs) pname version; src = finalAttrs.src; }; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 646b18a5c178..67bb8474b9f5 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.193.0"; + version = "0.194.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-Le/RDF4vhHmCdzuOJaIehqWYnfGH1tHAlSCjwgHXMiE="; + hash = "sha256-BjMM2xjDA9rteT1dFE1DENEzM5226GW+Zv2gtZNCzNo="; }; - vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; + vendorHash = "sha256-3BVy2e2cbxtWP7yP4UTXvtH1Hr/Vl06e6Dsr+FLhtZg="; doCheck = false; diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index 467411a8e71f..cffc2de30414 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-YAjKdr40MTNEtdzSdsKZQlogZYgMFbTrnLLKOyNtLsM="; + hash = "sha256-hgFOXAxbCpG3lHWyX6gE/aGJ1A/QymWHMmRwta997+Q="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/by-name/go/go-minimock/package.nix b/pkgs/by-name/go/go-minimock/package.nix index 8238d97a596a..4b82975d5bc6 100644 --- a/pkgs/by-name/go/go-minimock/package.nix +++ b/pkgs/by-name/go/go-minimock/package.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - hash = "sha256-YwaC+saod1IoVj6fc6Zucwy83XhnPgqaOp1IcxEmlaw="; + hash = "sha256-K7b77EqcXl4fZcpp93Jwg3fXLVmDuantv4QJYHj/Fik="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorHash = "sha256-0dqbDG/fKaznxeVMSVCEtkQn76dOso6XBiw6xlKqgwM="; + vendorHash = "sha256-zk5ulVxn7qAsU5i5z6eG0OMN5ExSu/ceBKu8UMwoiPo="; doCheck = true; diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index dc5ee3052a01..1f64a4db4824 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2024-09-05"; + version = "0-unstable-2024-11-18"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "ce4811554b022ac27d024d355ad160e95079bec1"; - hash = "sha256-kJJod7Qma3++lrctezYltB9hV8/gH/CycHrk+GpOasE="; + rev = "34caac8501763e3ea700ee019bf2c29671a30c55"; + hash = "sha256-b46zDtBlNpVMTwXTL9sYSpfEVJ87P2ZRQ7MVhOI0r/s="; }; - vendorHash = "sha256-VWywJ1LalYcfOQjrC0sLBfbQyIg8fYv4paMlIfa3RxI="; + vendorHash = "sha256-5cGgUTruCdfDhvLxXzl5gg2BtAC8HU7ZBL7Niw++HZ0="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index d48673c8a43a..3259ce5711e6 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.105"; + version = "0.106"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MXPjYNzQb6JBvsMfxN+GKEP/7fKwEGBWgGgLDf1cokQ="; + hash = "sha256-MHnXQsElBH3jOd2SPXXQuWCZWjpLVn7QjvNtESvbB8w="; }; nativeBuildInputs = [ pkg-config bison ] diff --git a/pkgs/by-name/go/gotemplate/package.nix b/pkgs/by-name/go/gotemplate/package.nix index aecef203ec89..5e7fa9f94d31 100644 --- a/pkgs/by-name/go/gotemplate/package.nix +++ b/pkgs/by-name/go/gotemplate/package.nix @@ -6,16 +6,16 @@ buildGo123Module rec { pname = "gotemplate"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "coveooss"; repo = "gotemplate"; rev = "refs/tags/v${version}"; - hash = "sha256-Q/Bqb0wgKzR0WPUHge/hqIvib/TbGxv6s+eEpDLxqPY="; + hash = "sha256-ohF9NemIXTTzguQ2VfqFt9zeiE4Co+dVux9Kw5cDobs="; }; - vendorHash = "sha256-buRCG9I5zltIMTu5SLE98/pQAs3Vlfw4oz2BZXQxUAc="; + vendorHash = "sha256-iNH0YmmZ/Qlc7WDoIbORd+uVg0rbQVKL6hX7YvbL0BE="; # This is the value reported when running `gotemplate --version`, # see https://github.com/coveooss/gotemplate/issues/262 diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index 83d54b1e9155..7e3420a68396 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -22,11 +22,14 @@ lsb-release, mesa-demos, vdpauinfo, + + # passthru + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "gpu-viewer"; - version = "3.06"; + version = "3.08"; format = "other"; @@ -34,7 +37,7 @@ python3Packages.buildPythonApplication rec { owner = "arunsivaramanneo"; repo = "gpu-viewer"; rev = "refs/tags/v${version}"; - hash = "sha256-vFU2VdafY1HmPGRa20PwT6n+Xf4bKBzKJ5jWpvwyMWg="; + hash = "sha256-P1zA/sjE4w2pdRDtJ8pGi4Rf8o4EmiRo6j17BRNu0IA="; }; nativeBuildInputs = [ @@ -78,6 +81,10 @@ python3Packages.buildPythonApplication rec { ''${gappsWrapperArgs[@]} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://github.com/arunsivaramanneo/GPU-Viewer"; description = "Front-end to glxinfo, vulkaninfo, clinfo and es2_info"; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index bf91648b3411..95705fae3a8b 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -18,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-10-20"; + version = "0-unstable-2024-11-29"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "fe56302339bb28e3471632379d733547caec8103"; - hash = "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o="; + rev = "819f682269f4e002884702b87e445c82840c68f2"; + hash = "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index c24e35ba112d..3cfdf1b20f29 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -11,12 +11,12 @@ }: let pname = "homebox"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sysadminsmedia"; repo = "homebox"; rev = "v${version}"; - hash = "sha256-2jB2Oo0dK36n5tQPrGNyPO3Q0yNkUms4RPQzXiDzuks="; + hash = "sha256-d8SQWj7S6G1ZemMH6QL9QZuPQfxNRcfCurPaTnS0Iyo="; }; in buildGo123Module { @@ -38,7 +38,7 @@ buildGo123Module { pnpmDeps = pnpm.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-fOb3oboNlOv/TpIrs3BsSlxIqNbbtSCE8zLMia2RIDw="; + hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y="; }; pnpmRoot = "../frontend"; diff --git a/pkgs/os-specific/darwin/ios-deploy/default.nix b/pkgs/by-name/io/ios-deploy/package.nix similarity index 91% rename from pkgs/os-specific/darwin/ios-deploy/default.nix rename to pkgs/by-name/io/ios-deploy/package.nix index c405ac8e1c8b..21b6fc5b4f9c 100644 --- a/pkgs/os-specific/darwin/ios-deploy/default.nix +++ b/pkgs/by-name/io/ios-deploy/package.nix @@ -1,8 +1,8 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin -, testers +{ + lib, + stdenv, + fetchFromGitHub, + testers, }: let @@ -19,10 +19,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA="; }; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - ]; - buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 6cfa106b603c..92551ba9df55 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -14,7 +14,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.1"; + version = "10.10.3"; src = assert version == jellyfin.version; @@ -22,7 +22,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; + hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY="; }; postPatch = '' @@ -30,7 +30,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-kL57KmBHmBwJEhsUciPaj826qdoSQxZXxtFNGkddGZk="; + npmDepsHash = "sha256-qzjniTbJRNeZ2WFu8RBjcdZR96nvGRHMERdEiELLufg="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.nix b/pkgs/by-name/je/jellyfin/nuget-deps.nix index 721504ed0cec..f2b76a4af0ae 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.nix +++ b/pkgs/by-name/je/jellyfin/nuget-deps.nix @@ -12,13 +12,13 @@ (fetchNuGet { pname = "DiscUtils.Iso9660"; version = "0.16.13"; hash = "sha256-pMAQwrvqhzOOaAQChdxqPNw8Xx9YP60PNsetPRFNvm0="; }) (fetchNuGet { pname = "DiscUtils.Streams"; version = "0.16.13"; hash = "sha256-DSetHA56M/GLg0cXhMjLJk8GPRa5TAieaXSbOWrfnw8="; }) (fetchNuGet { pname = "DiscUtils.Udf"; version = "0.16.13"; hash = "sha256-zEtRSgTtH3xXbhUH7XaKUilhYOyur3xiIDKLTi7pk2A="; }) - (fetchNuGet { pname = "dotnet-ef"; version = "8.0.8"; hash = "sha256-DkzLxvD9WRuX6FA3jlbUz3lPW60WZ3MO2wdn9VdqrAk="; }) + (fetchNuGet { pname = "dotnet-ef"; version = "8.0.11"; hash = "sha256-LxLA79aQCxhNPU3fTw6w2aFCo5S2vqmkCeaGdMY3c9Y="; }) (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; hash = "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.3"; hash = "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.3"; hash = "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.3"; hash = "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.3"; hash = "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) (fetchNuGet { pname = "ICU4N"; version = "60.1.0-alpha.356"; hash = "sha256-1QyOgO7pNMeoEgBtl6o8IG4o91wD2hFUgRI0jM0ltxY="; }) (fetchNuGet { pname = "ICU4N.Transliterator"; version = "60.1.0-alpha.356"; hash = "sha256-RLNwQNVqNz8Omfb/mC/rzQWVq8c7uCnNdG2qi4xJmds="; }) @@ -30,8 +30,8 @@ (fetchNuGet { pname = "MetaBrainz.Common"; version = "3.0.0"; hash = "sha256-P+XTQhffqSVIn0ZbC5Npl80xlx1QYHoL0y20KTvKRy0="; }) (fetchNuGet { pname = "MetaBrainz.Common.Json"; version = "6.0.2"; hash = "sha256-4IcF9xZZmI3H7WAiuN2kK61BMXS4gh2T2WrCqkwQhX8="; }) (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.10"; hash = "sha256-VeUAe/OoV2zNDaiSKSv7tXR5barJzLbxS96DUb9bAz8="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.10"; hash = "sha256-SxnMOWJGgUUQyKaRezJQwMUt4eMfWjnhmfk8pldYGNA="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.11"; hash = "sha256-LHkaXHgK1aHl6sk+6fZralNRsY0GEoALkyRspJP0nyE="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.11"; hash = "sha256-P7U4DkTNjG8m2s/tVqWLJ6hm9LJhThBRi1hsp4JPecc="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; }) @@ -39,16 +39,16 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.10"; hash = "sha256-BzdKtEbOp8Sq31L8pin/uM7xtgq3aYtlNqCt2t2Bzxo="; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.10"; hash = "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.10"; hash = "sha256-kj/PFfEdCxygb8AYuD0U6F1VPo7jBicxC3N3p/U74rM="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.10"; hash = "sha256-OwqqkvChI8qSIabo17MNmcWyby6TT5ZXv5cnOeyVFGw="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.10"; hash = "sha256-8qxvGV3dQMM8vGxEi7YqOimfWDQYFp3QVMNe3ryiO7g="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.10"; hash = "sha256-Nbwn3aeVyDl7rGftchEzFcqnTNkvArqKafaarQiCWQw="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.10"; hash = "sha256-n9xRg8WYjNLB92wMVNL/I5D3AKvtM9w0ICJ+Tieq5VQ="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.10"; hash = "sha256-Y0OghTa4r7VSV3jE8ZXzP8zU2eIDx/9CLAnPoNzP+vE="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.10"; hash = "sha256-NYoX3vaq687M1VfJWBMzItsBqSuRPnrL/IOIRpy6W9c="; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.10"; hash = "sha256-Es4N6TP126rArsdhjbbEfJj8WQl2iaBLwgPIsJNUKQ4="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.11"; hash = "sha256-55TQhpJDkL7I4GH1cWYNEr1gNJ7pqHhmXzPGoseWsFg="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.11"; hash = "sha256-bYyxOTss74EVz+3ybmgl11fzX0Co3CVZbCDxv24y0/E="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.11"; hash = "sha256-uvcAmj7ob2X/JKLleNwanpNs0X3PkJl3je6ZsHeWooE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.11"; hash = "sha256-qKe+WBIlyZ1CS2H9JGWsYiWxkUzGjwIHtx/q3FPCDr8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.11"; hash = "sha256-eKhcGqCN34F2i7/FeKSq1gyMjNq3ikq+UpE/1SbXecY="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.11"; hash = "sha256-in7Ppl/tEEM/2r+l+uuSjWLXk7fHbJRVmLzskYfAhMQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.11"; hash = "sha256-st6V0S7j+FyK7r9X6uObpuhSoac/z5QOF1DUPnhffgE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.11"; hash = "sha256-DFAJxCxJeJghYL1Zl4d78i7/o8RFhLeCS+QFXvZulV4="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.11"; hash = "sha256-GUWuE0ZycKiOha8wq7qklol9KfiSB4WSCF3/OwiSiAQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.11"; hash = "sha256-i5BbbWFUTQmPRGhof/4DbwzKGFHmZaNAJhGZf6+2PpI="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; hash = "sha256-UMNREtQwHLsq72PvbOck9DV77qukda4L+q9Ej1k/RI0="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.0.0"; hash = "sha256-Eg1MES40kzkGW9tZmjaKtbWI00Kbv7fLJQmjrigjxqk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) @@ -75,9 +75,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.1"; hash = "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.1"; hash = "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.10"; hash = "sha256-flcifBprRlD8qEEa4v2BUxJZE7zrWVcPnGYtmqt28Dc="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.10"; hash = "sha256-bWOoqDxRJl/yRHvRiGYzWcvnuanu07mqcKx9pVCTpOs="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.10"; hash = "sha256-vSy5iUGOPGx+hqvpu7Cmjcz2MiPpzVAQK46w+y/IQis="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.11"; hash = "sha256-wS+5kN0lREre+gv7//VuVb9oVkEzWHxKGiZJukj4Z30="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.11"; hash = "sha256-JjWYaK5c+w8GUkNudYQKf2m3NwOQLYEeSFwL8kgTWC0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.11"; hash = "sha256-4fON6hI6uBeb/AWROYLgbbfxce1wazIt9WQbTUqwfi0="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) @@ -169,11 +169,11 @@ (fetchNuGet { pname = "Serilog.Sinks.Graylog"; version = "3.1.1"; hash = "sha256-H9DMxdRN6LVmlK95ywqRj3nuoEvGI+9LbmbmijC+eRU="; }) (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0.1"; hash = "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.9"; hash = "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.9"; hash = "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.9"; hash = "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.9"; hash = "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.9"; hash = "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="; }) (fetchNuGet { pname = "SmartAnalyzers.MultithreadingAnalyzer"; version = "1.1.31"; hash = "sha256-UOhn4T8f5cql/ix8IHecvP6sHUkw2PmnmEfV0jPRZeI="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; }) @@ -251,6 +251,6 @@ (fetchNuGet { pname = "TMDbLib"; version = "2.2.0"; hash = "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY="; }) (fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; hash = "sha256-9Dq7UE5OiuvciURQV8Aa13elolt1fzDhvF8c8Yxznhw="; }) (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; }) - (fetchNuGet { pname = "z440.atl.core"; version = "6.6.0"; hash = "sha256-tn1IEqmSwLbfAmNXk4pMiwKvVolTgwuv4bR8O5ZVMfA="; }) + (fetchNuGet { pname = "z440.atl.core"; version = "6.8.0"; hash = "sha256-eeiNzwXqDvw1xWOzubeKDth89MiU4q8qPesXWkvlPhc="; }) (fetchNuGet { pname = "zlib.net-mutliplatform"; version = "1.0.8"; hash = "sha256-1cLkZJJ+LyZ+s5eMCcTlANnF2+U7zmgNhhVn2o/r4z0="; }) ] diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index c65949d634e3..e89b8a7abc83 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.1"; # ensure that jellyfin-web has matching version + version = "10.10.3"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-jDiJ1tnCR3cZvNmvZ47Vvoqow1sC+xciHsO546yoIKY="; + hash = "sha256-kobe2hlcDzYHMMTaRtfC8L9f2W1eS2SNcYolWr+wsJQ="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index bcded90dc8a3..3cdf32cd4079 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.48.1"; + version = "0.49.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-jk+IUqM0/7qVKBMFntQFr52B3TJYEGrmT/DKcgfrw3Q="; + sha256 = "sha256-7/WSc3PeeFX05xwvtwpN3sjy91gUnnC8cTeYxJOsqoM="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubefetch/package.nix b/pkgs/by-name/ku/kubefetch/package.nix index 94db5128593d..7f35094fbedd 100644 --- a/pkgs/by-name/ku/kubefetch/package.nix +++ b/pkgs/by-name/ku/kubefetch/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "kubefetch"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jkulzer"; repo = "kubefetch"; rev = "${version}"; - hash = "sha256-ksnqlfm++Np5I7ZUXvVPgm3T2hHM6x9sAWdmK0Whn5k="; + hash = "sha256-p7YRE+o/omuGwXGpVUOvI7KbFyYGymYCRZk+Phh30RM="; }; vendorHash = "sha256-qsncOsCxepySJI+rJnzbIGxSWlxMzqShtzcEoJD2UPw="; diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix index b0f52143a7ff..1c1099752580 100644 --- a/pkgs/by-name/lc/lc0/package.nix +++ b/pkgs/by-name/lc/lc0/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lc0"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "LeelaChessZero"; repo = "lc0"; rev = "refs/tags/v${version}"; - hash = "sha256-VbWNc41CgsS0I64QHNp+k9cM/IEai9b3SyHorfmwvsE="; + hash = "sha256-8watDDxSyZ5khYqpXPyjQso2MkOzfI6o2nt0vkuiEUI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix index 7b457400f576..e184b18f128e 100644 --- a/pkgs/by-name/li/libfmvoice/package.nix +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfmvoice"; - version = "0-unstable-2024-11-03"; + version = "0-unstable-2024-11-08"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "libfmvoice"; - rev = "c4b069cf633e52d4b7dce6e0b4277a0daa057774"; - hash = "sha256-ZwqzrQ3kpOAZjJcstovmoNW8bG56w1YXm5ZMYIkjQ9M="; + rev = "1cd83789335ba7fcae4cd2081e873ad097e3270c"; + hash = "sha256-XzkFfrfXefbZLXWFDy0V6agDPjzCzG5d28znQWsmcuM="; }; outputs = [ diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index 8dd3d5e2f475..3475b7451fe0 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -5,14 +5,16 @@ automake, libusb1, }: - +let + version = "1.20.20240909"; +in stdenv.mkDerivation { pname = "libphidget22"; - version = "0-unstable-2024-04-11"; + inherit version; src = fetchurl { - url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22.tar.gz"; - hash = "sha256-mDoYVs0LhBb3+vzKjzYr9EmcrztmA4cy9xh5ONxHaxI="; + url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; + hash = "sha256-20Y7cukEzq/Rf2v91SYTC1yCtS4p5aaG4aK8x6/6ebk="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix index b67d2026b655..ec02cde4baaa 100644 --- a/pkgs/by-name/li/libphidget22extra/package.nix +++ b/pkgs/by-name/li/libphidget22extra/package.nix @@ -6,14 +6,16 @@ libusb1, libphidget22, }: - +let + version = "1.20.20240909"; +in stdenv.mkDerivation { pname = "libphidget22extra"; - version = "0-unstable-2024-04-11"; + inherit version; src = fetchurl { - url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra.tar.gz"; - hash = "sha256-UD6Crr1dl7c3NOAVNi3xrXJI3OYPLZBJX1MXVvbyEUE="; + url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra/libphidget22extra-${version}.tar.gz"; + hash = "sha256-/08pzaGeWSAbHezE0BOayWdp+iv+DtrHMVN7CJlZAJc="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 5fd5b3ad54d4..f7922663206a 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.11.0"; + version = "1.12.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-ByDtmKLdPSFGIPCdFlNr2yv3gnyfdjiuIuKcryvKwkY="; + hash = "sha256-pqkUaR/r9GKvTt8hEjqgSuEcNuSeRE+rtlj47uS5/dY="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/lo/logdy/package.nix b/pkgs/by-name/lo/logdy/package.nix index 9b2de9f74fe4..ac9d2ad1a141 100644 --- a/pkgs/by-name/lo/logdy/package.nix +++ b/pkgs/by-name/lo/logdy/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "logdy"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "logdyhq"; repo = "logdy-core"; rev = "v${version}"; - hash = "sha256-HlIl/4C1wheAxc0ReUN8xQrXJ0djoO7E0qhRwyFHEiE="; + hash = "sha256-lLQM9/QD/vB/KjyzSxVJzSMw0SQWyv/1qXbBBXatnCg="; }; vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU="; diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index e3ae239fbc87..679a0c7326db 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.8"; + version = "0.8.9"; src = fetchzip { urls = [ @@ -32,20 +32,10 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-XOUOIlFKxI7eL7KEEfLyYTsNqc2lc9sJNt9RqPavuW8="; + hash = "sha256-zFsKL9F6PGoYjxFfFs2Bkdm2ZCeJtnTygkgCL7AXl9o="; }; - cargoPatches = [ - (fetchpatch { - # https://git.meli-email.org/meli/meli/issues/522 - # https://git.meli-email.org/meli/meli/issues/524 - name = "fix test_fd_locks() on platforms without OFD support"; - url = "https://git.meli-email.org/meli/meli/commit/b7e215f9c238f8364e2a1f0d10ac668d0cfe91ad.patch"; - hash = "sha256-227vnFuxhQ0Hh5A/J8y7Ei89AxbNXReMn3c3EVRN4Tc="; - }) - ]; - - cargoHash = "sha256-SMvpmWEHUWo0snR/DiUmfZJnXy1QtVOowO8CErM9Xjg="; + cargoHash = "sha256-us/jlsRbg0Y6FwznbRZeqK1TwwgL1uBwBdyneyvdI6Q="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR=1; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 099b94377626..baea82b192fd 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "3.2.0"; + version = "3.3.2"; src = fetchFromGitHub { - owner = "coco33920"; + owner = "vanilla-extracts"; repo = "calc"; rev = version; - hash = "sha256-f2xmc6wzZ5MwwBDYQNoxbFmIclZWd/xOOI4/MCmrnEI="; + hash = "sha256-JAIqigELPu4ZCj1uDgGNSCIqVhJVH7tZwFiI/PSTjSI="; }; - cargoHash = "sha256-OiAU94URgOHZ/iNbCF5rE55zfZNkW3bdjPZo05kpIRo="; + cargoHash = "sha256-s35rR0nb5uX9J3rvEs15+FYBfhXycZwL90yeQf0esJA="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Fully-featured minimalistic configurable calculator written in Rust"; changelog = "https://github.com/coco33920/calc/blob/${version}/CHANGELOG.md"; - homepage = "https://calc.nwa2coco.fr"; + homepage = "https://calc.charlotte-thomas.me/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "mini-calc"; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index f5ca00cd6294..eae4efc8e1ec 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.10.0"; + version = "1.12.3"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-7rZwrnzoVkcXg3Z5lCMVEMyB3f5pS1t33lqogwY3I7w="; + hash = "sha256-TA6vnK1UAT66uPJzM4QJxjcpVZKPyAe4ZayYcrggzpc="; }; - vendorHash = "sha256-ymXpuCc1Pv12kFcBf1STT2wiUXTyT4R1DHnDCeBWbSs="; + vendorHash = "sha256-KN4jasuVP6WJjoqQNPhqvXcmgbj16sX//PxAloj1w20="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/motoc/Cargo.lock b/pkgs/by-name/mo/motoc/Cargo.lock index a5badfc41f7d..443a10bc9185 100644 --- a/pkgs/by-name/mo/motoc/Cargo.lock +++ b/pkgs/by-name/mo/motoc/Cargo.lock @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "motoc" -version = "0.3.3" +version = "0.3.4" dependencies = [ "anyhow", "bindgen 0.70.1", diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix index d33e2c60670a..009256fbfcca 100644 --- a/pkgs/by-name/mo/motoc/package.nix +++ b/pkgs/by-name/mo/motoc/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "motoc"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "galister"; repo = "motoc"; rev = "refs/tags/v${version}"; - hash = "sha256-AmHTnCUTHoeLsOJrD35BooU9mZr5ctoCJmjW5CaTYBY="; + hash = "sha256-CAKgh9uddDhaFp2O62o1nNZ/ZWJbCR/7dMaI9V992Xk="; }; cargoLock = { diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 29dfa2a7f7f6..83cbd4fa8fa9 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.65.1"; + version = "1.70.1"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-3fGsghGzqLb9B0qrqPuJV2pypd3kJVUrYohMe9quqG4="; + hash = "sha256-acbC6MO2wM9NsjqUqcs8jPNHfBg/P0wEYF5MxbnFhQQ="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-n+A7SGfjzvB9NOt8kqi7DswKSjCTef5SJItWtFzNpwA="; + hash = "sha256-h2hIOVK9H5OlyhyyoRs113CbE4z4SIxVVPha0Ia9I4A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 77b242ec9058..32da25af8253 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.6.0"; + version = "0.6.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-p7ajWY/eGWHPosxFXOKs2YeMAny+/PJ68IAU2NNgm0w="; + hash = "sha256-/EHg8YnsGwFlXEfdsh1eiWoNmapDHGOws4lkEGqjhoo="; }; - cargoHash = "sha256-F6titbFM0zsbbwZKcSx3U4cknea83TCITiGm7rPXmFE="; + cargoHash = "sha256-uqTSr+c+pDAi2r6roHeZfW0LCyN/1J0M2+8grdAtX7U="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 23b705e59df6..4e5133841fd6 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "novops"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "PierreBeucher"; repo = pname; rev = "v${version}"; - hash = "sha256-/sb9LqBZRkJeGyWZzz3RDgWm2tEtiaEXrEX/OO5ja6o="; + hash = "sha256-ToIIBLLwf9GLg+/2VF3DQTT1RokI6XHwdPmr+BtNFeU="; }; - cargoHash = "sha256-gvM0I+om4I8Yy+m0CzD5/WpL8xdIs3ecKQgmaq9S3VI="; + cargoHash = "sha256-3QB7iuzWlWDgFRrKiwq7Yh9PIW88m1N+nPQ8fdEQ7Ps="; buildInputs = [ openssl # required for openssl-sys diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index cf666d13b5b5..9511e75ebf90 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "24.07.19"; + version = "24.10.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-mHCQpFBBnJfmMA0o5BVt8IWhHIcMSaReCezVgVqVAw4="; + sha256 = "sha256-7pAVXaNH/qMmo7/CcDgeFbA6KHINAxu8sHMoQYecZKM="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix index 2db08263729a..d8d2942906d8 100644 --- a/pkgs/by-name/nw/nwg-clipman/package.nix +++ b/pkgs/by-name/nw/nwg-clipman/package.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonPackage rec { pname = "nwg-clipman"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-clipman"; rev = "refs/tags/v${version}"; - hash = "sha256-qpI/yg7yBSwcgpv6lOBysxxsX0pI+ixZghkm+U6XIrs="; + hash = "sha256-bAE9E6P+qfKrfRxb134k4r7DtIWGB+4JdiXKpI7gJ5M="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 96c39964a39f..86a01d3ce233 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.17.9"; + version = "0.18.0"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-R3zGYVa5ux3pcniuXzKwxJK/5/7YrVOrqC2H42P2fK0="; + hash = "sha256-lVcg7jSA8W2m98DgDEQJWetfNYvp/JYbRuo8jCsLLZs="; }; - cargoHash = "sha256-bFOaR48xdc4+DvlFnXCWtzqMbE1cTo7xrsf/aIBlRX0="; + cargoHash = "sha256-+uFLaN02iSQLdUAUh4qmUyfIrrMi1nnaNh3sR+N8KbU="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index cd1b5d574916..35116156f969 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.23"; + version = "1.13.24"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Fe4K6nBVg0l4Z3CW+k0OpUF8JEu+uINsA+jdAFJGmx8="; + hash = "sha256-rAiibbNsEH+mjRq2qDKk+8pdAfnCFRpAm1Opgmw+FTY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 03bb24119123..7f4d6e22c01b 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -103,12 +103,15 @@ let lib.mapAttrs ( _: provider: - # use opentofu plugin registry over terraform's - provider.override (oldArgs: { - provider-source-address = lib.replaceStrings [ "https://registry.terraform.io/providers" ] [ - "registry.opentofu.org" - ] oldArgs.homepage; - }) + if provider ? override then + # use opentofu plugin registry over terraform's + provider.override (oldArgs: { + provider-source-address = lib.replaceStrings [ "https://registry.terraform.io/providers" ] [ + "registry.opentofu.org" + ] oldArgs.homepage; + }) + else + provider ) ( removeAttrs terraform-providers [ diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index e1d7f2564ebb..96299502b6ae 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.24.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-6w/UcifseoajAOKZnn0GJiUzXAmLNGKLDCZkeZLK8NI="; + hash = "sha256-FuqzVMpv62Knbbhy9yExyjT2UVdH2KlaQ+ETW8/abWc="; # 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; diff --git a/pkgs/by-name/pa/parallel-hashmap/package.nix b/pkgs/by-name/pa/parallel-hashmap/package.nix index 5feab9c3c805..a84503ee2a14 100644 --- a/pkgs/by-name/pa/parallel-hashmap/package.nix +++ b/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "parallel-hashmap"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "greg7mdp"; repo = "parallel-hashmap"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-19rWcnMtWgqYlLylUjgI/p3aAM0Ois3CKoMuMmLQHmM="; + hash = "sha256-QDRy6YPoE34VpldN66V4mcF3PqK43RSlXThm+SzxRQ4="; }; postPatch = '' diff --git a/pkgs/by-name/pa/parlay/package.nix b/pkgs/by-name/pa/parlay/package.nix new file mode 100644 index 000000000000..5dc50220bf5b --- /dev/null +++ b/pkgs/by-name/pa/parlay/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "parlay"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "snyk"; + repo = "parlay"; + rev = "v${version}"; + hash = "sha256-hcNNW4/+AX06vkEbauHyMP5b2y/1YNlWhgqS5Rx8sS8="; + }; + + vendorHash = "sha256-Eo5MgdISiwbaJFg5XHAwe5x3D8GmgzswYmcUG4gvaQk="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Enriches SBOMs with data from third party services"; + homepage = "https://github.com/snyk/parlay"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kiike + ]; + mainProgram = "parlay"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 2b43f15bef2a..c4d3d758cbce 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -2,6 +2,8 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch +, fetchurl , testers , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format @@ -37,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM="; }; + patches = [ + (fetchpatch { + name = "pdal-tests-gdal-3.10-compatibility.patch"; + url = "https://github.com/PDAL/PDAL/commit/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f.patch"; + hash = "sha256-8AeWcMeZXth6y+Ox1rhK7cEySql//Jig46rHw7PyJh4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -109,6 +119,14 @@ stdenv.mkDerivation (finalAttrs: { "pdal_app_plugin_test" ]; + # Add binary test file that we can’t apply from the patch. + postPatch = '' + ln -s ${fetchurl { + url = "https://github.com/PDAL/PDAL/raw/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f/test/data/gdal/1234_red_0_green_0_blue.tif"; + hash = "sha256-x/jHMhZTKmQxlTkswDGszhBIfP/qgY0zJ8QIz+wR5S4="; + }} test/data/gdal/1234_red_0_green_0_blue.tif + ''; + checkPhase = '' runHook preCheck # tests are flaky and they seem to fail less often when they don't run in diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix index 6446c475f355..f48604a3b118 100644 --- a/pkgs/by-name/pe/pet/package.nix +++ b/pkgs/by-name/pe/pet/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-h6e7X93uU/rdTrCz5xJcNtpDbzcF/2Z186b4dHkp9jM="; + sha256 = "sha256-J6DrrCeuJrdVSBJNUcALiPOAP0SEjYYLSFEg7gEXvhs="; }; - vendorHash = "sha256-hf2I5xHloqcXDlC8frxtCiQx2PlTmKmyd1mrzF2UdDo="; + vendorHash = "sha256-VGhkhpqYJZZLCUMOE0eYBOICeFhRjgSXCGGUEYLDoQo="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 018ef07bbf25..e0280f932eaa 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -1,20 +1,21 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.13.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; - rev = "v${finalAttrs.version}"; - hash = "sha256-EITeApaQ1nmQb53/DrSidcmWUACapjTUuUYuJQDML0Y="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-U+E4AdxjBjuMEG5CDpyr4Avu/NzvQXdksPsl+tQMybM="; }; - vendorHash = "sha256-IWFOpsPcrPg2/QWemRJ8tP6k0sIc2OogETdiBFAQ5BI="; + vendorHash = "sha256-ROJrVhkq3A0ZOsWv8rNNlVmE8KYu+vDM201BECOgmik="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix index 28389dcc6c74..cad06f7aa4b6 100644 --- a/pkgs/by-name/pr/pritunl-client/package.nix +++ b/pkgs/by-name/pr/pritunl-client/package.nix @@ -17,12 +17,12 @@ , openvpn , electron }: let - version = "1.3.4066.51"; + version = "1.3.4083.88"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-yoPpDOcTv3kBTHscYn//KseZpfj1HArInODSxPKOFXY="; + sha256 = "sha256-6CKckRrf1TVhuYOJ7caTRDFWiX5b27kDjLjd709NKUs="; }; cli = buildGoModule { diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 336afd89ce3c..dcc926174838 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-Pup+A637FvsX4dV0G7K/LMB4HCruh5BT1iu4tIXRI7I="; + hash = "sha256-mfaZJ1XI07b90cbWvWFzyppJnJG+Q9LyViuQmt3XWvY="; }; - vendorHash = "sha256-I/OFpEa3aB+qDBS/sbX5WOgrlSyR7aZaQYrsaSVNAAk="; + vendorHash = "sha256-avtw9MtnDo/992JAhXKCr/FXv+9M2j/pBLDNRVGsseM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index be71ffd8bd75..e919aea61f50 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "pulldown-cmark"; - version = "0.12.1"; + version = "0.12.2"; src = fetchCrate { inherit pname version; - hash = "sha256-PfkmzmK98Mzay6P48NTEJhtpuoCiTb3JqUIYObcS41k="; + hash = "sha256-dsSt0JC3e1IItyY16tosxD83XUdttHVIT40QsW9iUFU="; }; - cargoHash = "sha256-BhlKFisM1ho7xcwBnjtODQdacE/B9UoqYXj3dIAeTXE="; + cargoHash = "sha256-siYwv14AzoQnub+Xcb3UCdEnCIOYremqNve5xyMhixc="; meta = { description = "Pull parser for CommonMark written in Rust"; diff --git a/pkgs/by-name/py/pyflyby/package.nix b/pkgs/by-name/py/pyflyby/package.nix index 271402c1a46f..d01a3716458e 100644 --- a/pkgs/by-name/py/pyflyby/package.nix +++ b/pkgs/by-name/py/pyflyby/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "1.9.6"; + version = "1.9.8"; in python3.pkgs.buildPythonApplication rec { inherit version; @@ -14,8 +14,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "deshaw"; repo = "pyflyby"; - rev = version; - hash = "sha256-QkoFr9tFtZ+ZEWlxe9csrzoYFl9/V2l4hKYfUWsXUdc="; + rev = "refs/tags/${version}"; + hash = "sha256-lMOLdPirPrld/DfX7YPdFJ+4K451aATz4vql4z+lLO0="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix index cfd80c6bdbe8..9142875eb8a2 100644 --- a/pkgs/by-name/qu/quba/package.nix +++ b/pkgs/by-name/qu/quba/package.nix @@ -7,20 +7,18 @@ let version = "1.4.0"; pname = "quba"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}.AppImage"; hash = "sha256-EsTF7W1np5qbQQh3pdqsFe32olvGK3AowGWjqHPEfoM="; }; - appimageContents = appimageTools.extractType1 { inherit name src; }; + appimageContents = appimageTools.extractType1 { inherit pname version src; }; in appimageTools.wrapType1 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace-fail 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix index bfe716b5aa51..164d48120124 100644 --- a/pkgs/by-name/ro/roadrunner/package.nix +++ b/pkgs/by-name/ro/roadrunner/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "roadrunner"; - version = "2024.1.2"; + version = "2024.2.1"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; rev = "refs/tags/v${version}"; - hash = "sha256-qaG7krLu6D08izPwRwqzSpnGVQjTgNwoSky3jmSwOdM="; + hash = "sha256-uZUC2+sdMka6Q++Xm5y0KZnOifW/WcFi+XqnuepdErI="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-vwOvp8hckamdN0qKnvaL2pm30nCMelQ8+LjqcPZR/ZQ="; + vendorHash = "sha256-JHJkL99Liz9qvh3oEDYBSMueh+OItXyuxk4uHYC31po="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 6c0c9b9b5dd8..110c780497ad 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -27,7 +27,7 @@ libGL, libxcrypt, libxml2, - llvm_16, + llvm_18, lsof, lz4, xz, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.08"; + version = "6.34.00"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-Ka1JRact/xoAnDJqZbb6XuJHhJiCMlHTzvhqLL63eyc="; + hash = "sha256-87APPblTgpyEkCnDnXZgqVZGivJH79lG6JByEBeWqwM="; }; clad_src = fetchgit { @@ -81,37 +81,37 @@ stdenv.mkDerivation rec { pkg-config git ]; - propagatedBuildInputs = [ nlohmann_json ]; buildInputs = [ davix ftgl + giflib gl2ps glew - pcre - zlib - zstd - lapack - libxcrypt - libxml2 - llvm_16 - lz4 - xz gsl gtest + lapack + libjpeg + libpng + libtiff + libxcrypt + libxml2 + llvm_18 + lz4 + nlohmann_json openblas openssl - xxHash - giflib - libjpeg - libtiff - libpng patchRcPathCsh patchRcPathFish patchRcPathPosix + pcre python3.pkgs.numpy tbb xrootd + xxHash + xz + zlib + zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -123,8 +123,6 @@ stdenv.mkDerivation rec { libGL ]; - patches = [ ./sw_vers.patch ]; - preConfigure = '' for path in builtins/*; do @@ -135,29 +133,17 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' - # We have to bypass the connection check, because it would disable clad. - # This should probably be fixed upstream with a flag to disable the - # connectivity check! - substituteInPlace CMakeLists.txt \ - --replace-fail 'if(clad AND NO_CONNECTION)' 'if(FALSE)' # Make sure that clad is not downloaded when building substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace-fail 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' + --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' # Make sure that clad is finding the right llvm version substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' + --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}' substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace-fail 'add_clang_symlink(''${link} clang)' "" - # Don't require textutil on macOS - : > cmake/modules/RootCPack.cmake - - # Hardcode path to fix use with cmake - sed -i cmake/scripts/ROOTConfig.cmake.in \ - -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' - - patchShebangs build/unix/ + patchShebangs cmake/unix/ '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks @@ -173,9 +159,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ + "-DCLAD_SOURCE_DIR=${clad_src}" "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" "-Dbuiltin_llvm=OFF" "-Dfail-on-missing=ON" "-Dfitsio=OFF" diff --git a/pkgs/by-name/ro/root/setup-hook.sh b/pkgs/by-name/ro/root/setup-hook.sh index 7affd21012eb..e8af80d602b0 100644 --- a/pkgs/by-name/ro/root/setup-hook.sh +++ b/pkgs/by-name/ro/root/setup-hook.sh @@ -1,13 +1,5 @@ thisroot () { - # Workaround thisroot.sh dependency on man - if [ -z "${MANPATH-}" ]; then - MANPATH=: - fi - local oldOpts="-u" - shopt -qo nounset || oldOpts="+u" - set +u source @out@/bin/thisroot.sh - set "$oldOpts" } postHooks+=(thisroot) diff --git a/pkgs/by-name/ro/root/sw_vers.patch b/pkgs/by-name/ro/root/sw_vers.patch deleted file mode 100644 index 2a0fcd757719..000000000000 --- a/pkgs/by-name/ro/root/sw_vers.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake ---- a/cmake/modules/SetUpMacOS.cmake -+++ b/cmake/modules/SetUpMacOS.cmake -@@ -8,17 +8,10 @@ - set(ROOT_PLATFORM macosx) - - if (CMAKE_SYSTEM_NAME MATCHES Darwin) -- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" -- COMMAND cut -d . -f 1-2 -- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -- - MESSAGE(STATUS "Found a macOS system ${MACOSX_VERSION}") - -- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) - set(libcxx ON CACHE BOOL "Build using libc++" FORCE) -- endif() - -- if(MACOSX_VERSION VERSION_GREATER 10.4) - #TODO: check haveconfig and rpath -> set rpath true - #TODO: check Thread, define link command - #TODO: more stuff check configure script -@@ -37,22 +30,7 @@ - SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") -- else() -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") -- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") -- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") - endif() -- endif() -- -- if(MACOSX_VERSION VERSION_GREATER 10.6) -- set(MACOSX_SSL_DEPRECATED ON) -- endif() -- if(MACOSX_VERSION VERSION_GREATER 10.7) -- set(MACOSX_ODBC_DEPRECATED ON) -- endif() -- if(MACOSX_VERSION VERSION_GREATER 10.8) -- set(MACOSX_GLU_DEPRECATED ON) -- endif() - - if (CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") -@@ -96,7 +74,6 @@ - endif() - - #---Set Linker flags---------------------------------------------------------------------- -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") - else (CMAKE_SYSTEM_NAME MATCHES Darwin) - MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.") - endif (CMAKE_SYSTEM_NAME MATCHES Darwin) -diff a/config/root-config.in b/config/root-config.in ---- a/config/root-config.in -+++ b/config/root-config.in -@@ -307,12 +307,6 @@ - ;; - macosx64|macosxarm64) - # MacOS X with gcc (GNU cc v4.x) in 64 bit mode -- macosx_major=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1 | sed -e 's/^[[:space:]]*//'` -- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -- # cannot find the one linked to libGraf if relocated after built -- if [ $macosx_major -eq 10 -a $macosx_minor -le 4 ]; then -- rootlibs="$rootlibs -lfreetype" -- fi - auxcflags="${cxxversionflag} -m64" - auxldflags="-m64" - auxlibs="-lm -ldl" -@@ -387,17 +381,11 @@ - done - ;; - macosx*) -- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then - auxcflags="-pthread $auxcflags" - auxlibs="-lpthread $auxlibs" -- else -- auxlibs="-lpthread $auxlibs" -- fi - for f in $features ; do - if test "x$f" = "xrpath" ; then -- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then - auxlibs="-Wl,-rpath,$libdir $auxlibs" -- fi - fi - if test "x$f" = "xlibcxx" ; then - auxcflags="-stdlib=libc++ $auxcflags" diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index ce77855b419e..69e972afa7b7 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -1,14 +1,14 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let - name = "saleae-logic-2"; + pname = "saleae-logic-2"; version = "2.4.13"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; hash = "sha256-0GIZQKQDY3arDUlxjQKWOHDB3j76xVwkx5H+8q+d0Rc="; }; desktopItem = makeDesktopItem { - inherit name; - exec = name; + name = "saleae-logic-2"; + exec = "saleae-logic-2"; icon = "Logic"; comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; @@ -17,11 +17,11 @@ let }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = let - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index 3939c25b67bf..4b7c7ec5dc99 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-Ynhom4WX1ME6/uI0HQ83S1DgLYN1HjUxKk5CUL/Fgzk="; + sha256 = "sha256-k+WfloaNr9qJE+y6ANgUvZnMWZjSa5YpZvHcOxk/79Q="; }; - vendorHash = "sha256-FHvppbAAKW2Nf5GKhMWoMuOgqAp6deOSE61hg7dASqo="; + vendorHash = "sha256-HMZfka92iT7350tE35Hlo6KMnA21sJZBvaFoclmMsYw="; ldflags = [ "-w" diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 7b5c1a9a989d..16b8eb29d2a9 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.51"; + version = "0.4.60"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-mimFOZjWiDodCopJ23RZxWijOT7bDPUOH+A8GL/UyXs="; + hash = "sha256-F5QFcXFK40Nz4/rwpk9HGuLr7ly8qjYne6521GtB93M="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-NXk3wH/XHohI7aYK+dvUmh+0hUrBNiH6xouT9EM8eiE="; + vendorHash = "sha256-RpOL45NtgYFFcQZviZKOihKXw1Ow7tRAkJ7lACyHsyE="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix index c3f053ae53a4..fa5244f91523 100644 --- a/pkgs/by-name/si/sig/package.nix +++ b/pkgs/by-name/si/sig/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "sig"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ynqa"; repo = "sig"; rev = "v${version}"; - hash = "sha256-nt/KV4ohFNZTJTwbNoSxb5v9zQwp+7ypvfMthL1yMus="; + hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4="; }; - cargoHash = "sha256-gZZ2aOsqVqGN3gCBZnBXzlFicMssNIEyRT688OuNMJc="; + cargoHash = "sha256-afsLf/WsCShjagYWDUA3ZgpgK1XjQiZzISZngzzYybg="; meta = { description = "Interactive grep (for streaming)"; diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index 59d40610178f..f5bfdbf4d9f7 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "spacectl"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-pO+jYuCyP6YrU9vE3//O0EyTDXYQ1WSpFI/8WbneDCA="; + hash = "sha256-puo44Si56MnpMst6yU8ZTMJTZ1yWVb1CiNXh1k/umbM="; }; vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo="; diff --git a/pkgs/by-name/ss/ssb-patchwork/package.nix b/pkgs/by-name/ss/ssb-patchwork/package.nix index 4e271534a642..6915cd1f6902 100644 --- a/pkgs/by-name/ss/ssb-patchwork/package.nix +++ b/pkgs/by-name/ss/ssb-patchwork/package.nix @@ -11,12 +11,11 @@ let }; binary = appimageTools.wrapType2 { - name = pname; - inherit src; + inherit pname version src; }; # we only use this to extract the icon appimage-contents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 70a4f00290c5..84a53d4ba3a6 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-9s7F3pcamzwAESA/mKnCnSPpSmAX+L81fDoDpR71gzA="; + hash = "sha256-oDy/imlRoMS1kVHlMSCHaurNJX5eSs6W2sj14ZpsF8k="; }; - vendorHash = "sha256-QNi98VRy5BtML8jTxaDR3ZQfkXqjmfCf5IrcvGKE+rc="; + vendorHash = "sha256-EWDtVs9H7e+HSyO1ZzCV5T+pGporQhRNlI9VkXc6j1E="; subPackages = [ "." ]; diff --git a/pkgs/by-name/st/steam-rom-manager/package.nix b/pkgs/by-name/st/steam-rom-manager/package.nix index 9b74ee139847..9406330b8bf0 100644 --- a/pkgs/by-name/st/steam-rom-manager/package.nix +++ b/pkgs/by-name/st/steam-rom-manager/package.nix @@ -1,7 +1,7 @@ { lib, appimageTools, fetchurl }: appimageTools.wrapType2 rec { - name = "steam-rom-manager"; + pname = "steam-rom-manager"; version = "2.5.22"; src = fetchurl { @@ -10,11 +10,11 @@ appimageTools.wrapType2 rec { }; extraInstallCommands = let - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in '' - install -m 444 -D ${appimageContents}/${name}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${name}.desktop \ - --replace 'Exec=AppRun' 'Exec=${name}' + install -m 444 -D ${appimageContents}/steam-rom-manager.desktop -t $out/share/applications + substituteInPlace $out/share/applications/steam-rom-manager.desktop \ + --replace 'Exec=AppRun' 'Exec=steam-rom-manager' cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index b340686b1313..8fc1395d6305 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -6,7 +6,7 @@ installShellFiles, }: let - version = "0.28.0"; + version = "0.28.2"; in buildGoModule { pname = "step-cli"; @@ -16,7 +16,7 @@ buildGoModule { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-G+/fc1qFXcNOxF+oyDmEZzzOUcODBvX+YfQ8Sx5JQK4="; + hash = "sha256-noANDVupzaoWfnESsu3ucd3ZvD3K/56YvYonyp2n0ho="; # this file change depending on git branch status (via .gitattributes) # https://github.com/NixOS/nixpkgs/issues/84312 postFetch = '' @@ -35,7 +35,7 @@ buildGoModule { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-yfaAms1reMGfLwiTJVRKvpNb4EzoN62W0oXoT7ErTN0="; + vendorHash = "sha256-rxUzvT5vEzZ5G+YGFEw4L25ZlwEn0wTZJgjsdfloFx8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 9f2af377e39a..8eee656831f7 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-PaOe24rXu6e8jhjwpuQquPQidQDSxI1WOAMYJSLjbSI="; + hash = "sha256-68BO4bTieh7nC8M821vbTP8SuFipLRwHOWdWvhCwoCo="; }; - vendorHash = "sha256-N8Wy4DHxP6yQOfWDmyVPSi9eHj8G01SSIxQmqKujRgo="; + vendorHash = "sha256-HOB4ODVD8lWHoejqykfRWx3g48ijMqgy9EPzCKYdIGg="; proxyVendor = true; diff --git a/pkgs/by-name/st/streamlink/ffmpeg-path.patch b/pkgs/by-name/st/streamlink/ffmpeg-path.patch index 6108c53dcf0b..8ebaa03547e0 100644 --- a/pkgs/by-name/st/streamlink/ffmpeg-path.patch +++ b/pkgs/by-name/st/streamlink/ffmpeg-path.patch @@ -1,13 +1,13 @@ diff --git a/src/streamlink/stream/ffmpegmux.py b/src/streamlink/stream/ffmpegmux.py -index 258b314a..c493e010 100644 +index 136c0b81..2dd00a20 100644 --- a/src/streamlink/stream/ffmpegmux.py +++ b/src/streamlink/stream/ffmpegmux.py -@@ -80,7 +80,7 @@ class MuxedStream(Stream, Generic[TSubstreams]): +@@ -83,7 +83,7 @@ class MuxedStream(Stream, Generic[TSubstreams]): class FFMPEGMuxer(StreamIO): -- __commands__: ClassVar[List[str]] = ["ffmpeg"] -+ __commands__: ClassVar[List[str]] = ["@ffmpeg@"] +- __commands__: ClassVar[list[str]] = ["ffmpeg"] ++ __commands__: ClassVar[list[str]] = ["@ffmpeg@"] + DEFAULT_LOGLEVEL = "info" DEFAULT_OUTPUT_FORMAT = "matroska" - DEFAULT_VIDEO_CODEC = "copy" diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 4b1763d6a337..765a7576dff6 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.11.0"; + version = "7.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Vi5ddTyhCeGVYgfeSsJ8M3zmuZ++ftcgO5RRBe1bL4Y="; + hash = "sha256-UaQGKGLmeV1pQEbKbnBUnW0TWDxkDRUFlmgEsOA/7/I="; }; patches = [ @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; + changelog = "https://streamlink.github.io/changelog.html"; description = "CLI for extracting streams from various websites to video player of your choosing"; homepage = "https://streamlink.github.io/"; longDescription = '' diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index 1fecbceb98cb..dfa6b854727a 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , buildPackages , coreutils @@ -17,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.16"; + version = "1.9.16p2"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-wNhNeX8GtzL8Vz0LeYroMSjCvDMFIFfwW1YOxry/oD0="; + hash = "sha256-l2qlbT47KnVZMweGQoit23SMnBNuJdlanMaZqvp3I5w="; }; prePatch = '' @@ -31,14 +30,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/Makefile.in --replace 04755 0755 ''; - patches = [ - # Fix for https://github.com/NixOS/nixpkgs/issues/354544 - (fetchpatch { - url = "https://www.sudo.ws/repos/sudo/raw-rev/71e3f5a288e1ac21151b1b9577f0fe3745671cf7"; - hash = "sha256-L4AF1ee+qW9QKLrUzL5+hC5EznNC9k7sNeVGNBAJ6S4="; - }) - ]; - configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index e5b37a527a60..c42f758e3df0 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.19"; + version = "0.3.20"; src = fetchCrate { inherit version pname; - hash = "sha256-5s4CPV6Tke37QlyMzI6WFDb9EdRfcFDoFrmuWblbp20="; + hash = "sha256-Sh3VnitkR72009kcD9u42UrDB1FKbHYllHGzM07eUTU="; }; - cargoHash = "sha256-VrOFu7LNFeH70VPdz9uJxXuRtTvxKiS1dlhCdr++7+g="; + cargoHash = "sha256-9QiDbJMWf4OWEVOVrz4uiyjmLHNhZg0VbM1/VKTjO9M="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 0c4ccbec89fc..489259700d21 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -997,10 +997,6 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { std::env::set_var("LOCALE_ARCHIVE", locale_archive); } - let current_system_bin = std::path::PathBuf::from("/run/current-system/sw/bin") - .canonicalize() - .context("/run/current-system/sw/bin is missing")?; - let os_release = parse_os_release().context("Failed to parse os-release")?; let distro_id_re = Regex::new(format!("^\"?{}\"?$", distro_id).as_str()) @@ -1072,6 +1068,11 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { std::process::exit(0); } + // Needs to be after the "boot" action exits, as this directory will not exist when doing a NIXOS_LUSTRATE install + let current_system_bin = std::path::PathBuf::from("/run/current-system/sw/bin") + .canonicalize() + .context("/run/current-system/sw/bin is missing")?; + let current_init_interface_version = std::fs::read_to_string("/run/current-system/init-interface-version").unwrap_or_default(); diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix index 9a93061b7749..3b97e030594d 100644 --- a/pkgs/by-name/th/thrift-ls/package.nix +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "thrift-ls"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "joyme123"; repo = "thrift-ls"; rev = "v${version}"; - hash = "sha256-hZpzez3xNnN76OcIzEswPbvw6QTU51Jnrry3AWCtbFk="; + hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0="; }; vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix index b0c19c703665..af2329ed8799 100644 --- a/pkgs/by-name/ti/tio/package.nix +++ b/pkgs/by-name/ti/tio/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tio"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${finalAttrs.version}"; - hash = "sha256-/eXy1roYmeZaQlY4PjBchwRR7JwyTvVIqDmmf6upJqA="; + hash = "sha256-8BeTC3rlDK6xmfguNlKQg48L03knU7sb1t8F1oLIi8s="; }; strictDeps = true; diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix index 6985ee6770b1..6444bc72df40 100644 --- a/pkgs/by-name/tr/transgui/package.nix +++ b/pkgs/by-name/tr/transgui/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "transgui"; - version = "5.18.0-unstable-2024-02-26"; + version = "5.18.0-unstable-2024-10-03"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "25df397d92fbd53b970ef72a6ffd9f644458f935"; - hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks="; + rev = "8854357ece266e749e8981a93c8002465a93d8f2"; + hash = "sha256-8ycivjjPeXBdPbqNNlO2hcre6T9sFhqg6vUfCREtd8k="; }; nativeBuildInputs = [ pkg-config unzip ]; diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index dae20c379d91..91e02485833a 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.8.3"; + version = "24.11.3"; suffix = { aarch64-linux = "linux-arm64"; @@ -18,8 +18,8 @@ let src = fetchurl { url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-od/OmYbPd3mmmyz131nQCVrhuSMU9znV8REHwbJLWVRoATMc21LSwCuAGZGRE1ijowJ1DI+TkLiLEq9rLldRmw="; - x86_64-linux = "sha512-IeEbscMGGaCaDQbNqmHYiKqdVm/QfyNDludiLWpcfnbN7udcxWIQG6tB9C9UY2BrimyNFvZgq1z9mZMfGScEYQ=="; + aarch64-linux = "sha512-erNWQTaj/WWoqy3TO7wb+ijQkwXjqfCjqvQN6/9gCVjbHswURWHX36P0rJg9vuQu6odi5EKtooDusIxjIUkQzA=="; + x86_64-linux = "sha512-BorpJI0Vi6fFRGo2lATcuBiI1vTLY8vfmnUXKckJkMCBiurs/ZR08ZxKPOTaoS61BzSanUCRwcovev294bcqkA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -42,7 +42,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/resources/images/desktop/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' # symlink system binaries instead bundled ones mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix new file mode 100644 index 000000000000..e27a1aa42848 --- /dev/null +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, +}: +let + pname = "ts_query_ls"; + version = "1.0.1"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "ribru17"; + repo = "ts_query_ls"; + rev = "v${version}"; + hash = "sha256-jhlFFNzGP9SNw4G2arGPQzQ7KQ4duCse/CQoK9lWaPk="; + }; + + nativeBuildInputs = [ cmake ]; + doCheck = false; # no tests + + useFetchCargoVendor = true; + cargoHash = "sha256-CgX8lPOX3ZvoSD4SuKR8MTpKvLrhIbzrXqlKrvY0xzE="; + + meta = { + description = "LSP implementation for Tree-sitter's query files"; + homepage = "https://github.com/ribru17/ts_query_ls"; + changelog = "https://github.com/ribru17/ts_query_ls/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ribru17 ]; + mainProgram = "ts_query_ls"; + }; +} diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 1487b5caa891..07248d814d14 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.7"; + version = "0.37.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-iRXBT3VpEVHna3GkMxVSVRqQ2HTK7gCd6LkthwrBMx4="; + sha256 = "sha256-n59OVlGR1KlfTFVcem6K/Qo/DMrPvTT654VykLFteL8="; }; - vendorHash = "sha256-1iyJ56YKu/WVb7dPP7YE07kdbJte2/Sww8cQu+epFNc="; + vendorHash = "sha256-u4TkDYMAfTKdgMW2jhzUen+sd4o2IB0hPvMDiA/p9TI="; proxyVendor = true; diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix index 696fc33df9bc..a81a48341afe 100644 --- a/pkgs/by-name/vi/viu/package.nix +++ b/pkgs/by-name/vi/viu/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "sha256-GJBJNtcCDO777NdxLBVj5Uc4PSJq3CE785eGKCPWt0I="; + sha256 = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo="; }; # tests need an interactive terminal doCheck = false; - cargoHash = "sha256-284ptMBVF4q57wTiCuTuYUiYMYItKf4Tyf6AtY0fqDk="; + cargoHash = "sha256-OyG4DAMoWdLBO0IOcbpD2Fmac0XIP7hdaeDdKiQ4PQA="; buildFeatures = lib.optional withSixel "sixel"; buildInputs = lib.optional withSixel libsixel; diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 08b67f3b70f3..84f3f9bc54a5 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.78.1"; + version = "0.78.2"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "vte"; rev = finalAttrs.version; - hash = "sha256-dVCvf4eTIJlrSzG6xLdKU47N9uAtHDwRrGkWtSmqbEU="; + hash = "sha256-ZUECInBRNYkXJtGveLq8SR6YdWqJA0y9UJSxmc8mVNk="; }; patches = [ diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index ecd4b9e06fa2..f5dbd07861fe 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.22"; + version = "2.2.23"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NzXIzOMc6rVX65FJe/S8rkYJbWNPWRz+mH7vP7Ch9Kw="; + hash = "sha256-zASb21C3GX4wQGf5V5Y+rKwq28S3CDi0gh696lspVnM="; }; subPackages = "."; - vendorHash = "sha256-GinKmXHXWEGmCz83AU3z5JBmPnWJ9Q2EqEPgaTUiDgs="; + vendorHash = "sha256-ihcIEoVNSPJzJGeH2bRot4fldIhZ0r/yuYU6Jp9F1Eo="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index e96bcd22fd8b..3bf64898b6f4 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -1,8 +1,26 @@ -{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages -, libidn2, zlib, pcre, libuuid, libiconv, libintl -, nukeReferences, python3, lzip, darwin -, withLibpsl ? false, libpsl -, withOpenssl ? true, openssl +{ + lib, + stdenv, + fetchurl, + + gettext, + pkg-config, + perlPackages, + libidn2, + zlib, + pcre2, + libuuid, + libiconv, + libintl, + nukeReferences, + python3, + lzip, + + withLibpsl ? false, + libpsl, + + withOpenssl ? true, + openssl, }: stdenv.mkDerivation rec { @@ -18,18 +36,36 @@ stdenv.mkDerivation rec { patchShebangs doc ''; - nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl nukeReferences ]; - buildInputs = [ libidn2 zlib pcre libuuid ] + nativeBuildInputs = [ + gettext + pkg-config + perlPackages.perl + lzip + nukeReferences + ]; + buildInputs = + [ + libidn2 + zlib + pcre2 + libuuid + libiconv + libintl + ] ++ lib.optional withOpenssl openssl ++ lib.optional withLibpsl libpsl - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + perlPackages.perl + ]; - configureFlags = [ - (lib.withFeatureAs withOpenssl "ssl" "openssl") - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html - "--without-included-regex" - ]; + configureFlags = + [ + (lib.withFeatureAs withOpenssl "ssl" "openssl") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html + "--without-included-regex" + ]; preBuild = '' # avoid runtime references to build-only depends @@ -41,47 +77,51 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; doCheck = true; - preCheck = '' - patchShebangs tests fuzz + preCheck = + '' + patchShebangs tests fuzz - # Work around lack of DNS resolution in chroots. - for i in "tests/"*.pm "tests/"*.px - do - sed -i "$i" -e's/localhost/127.0.0.1/g' - done - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # depending on the underlying filesystem, some tests - # creating exotic file names fail - for f in tests/Test-ftp-iri.px \ - tests/Test-ftp-iri-fallback.px \ - tests/Test-ftp-iri-recursive.px \ - tests/Test-ftp-iri-disabled.px \ - tests/Test-iri-disabled.px \ - tests/Test-iri-list.px ; - do - # just return magic "skip" exit code 77 - sed -i 's/^exit/exit 77 #/' $f - done - ''; - checkInputs = [ - perlPackages.HTTPDaemon - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - perlPackages.IOSocketSSL - ]; + # Work around lack of DNS resolution in chroots. + for i in "tests/"*.pm "tests/"*.px + do + sed -i "$i" -e's/localhost/127.0.0.1/g' + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # depending on the underlying filesystem, some tests + # creating exotic file names fail + for f in tests/Test-ftp-iri.px \ + tests/Test-ftp-iri-fallback.px \ + tests/Test-ftp-iri-recursive.px \ + tests/Test-ftp-iri-disabled.px \ + tests/Test-iri-disabled.px \ + tests/Test-iri-list.px ; + do + # just return magic "skip" exit code 77 + sed -i 's/^exit/exit 77 #/' $f + done + ''; + checkInputs = + [ + perlPackages.HTTPDaemon + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + perlPackages.IOSocketSSL + ]; - meta = with lib; { + meta = { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; homepage = "https://www.gnu.org/software/wget/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' - GNU Wget is a free software package for retrieving files using HTTP, + GNU Wget is a free software package for retrieving files using HTTP, HTTPS and FTP, the most widely-used Internet protocols. It is a non-interactive commandline tool, so it may easily be called from scripts, cron jobs, terminals without X-Windows support, etc. ''; mainProgram = "wget"; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 4011c7c29eaf..0434acd9ba12 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -21,6 +21,8 @@ , libXrender , libXtst , libXxf86vm +, util-linux +, socat }: let @@ -33,14 +35,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-0Cdu1ntG8ZPHbLOIFvVFO6Dj8ZBHl4Rb+MM46luRKj4="; + x86_64-linux = "sha256-up0iDqqQ4vnkFX/gWwhLijY6qBIyDuXCDiyoWm5YuFM="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "12.0"; + version = "13.2"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; @@ -74,6 +76,8 @@ in stdenvNoCC.mkDerivation rec { libXrender libXtst libXxf86vm + util-linux + socat ]; desktopItem = makeDesktopItem { @@ -110,9 +114,9 @@ in stdenvNoCC.mkDerivation rec { mv "$out/opt/$pkg/app/scripts/xpiped_debug.sh" "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh" makeShellWrapper "$out/opt/$pkg/app/bin/xpiped_raw" "$out/opt/$pkg/app/bin/xpiped" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fontconfig gtk3 udev ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fontconfig gtk3 udev util-linux socat ]}" makeShellWrapper "$out/opt/$pkg/app/scripts/xpiped_debug_raw.sh" "$out/opt/$pkg/app/scripts/xpiped_debug.sh" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fontconfig gtk3 udev ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fontconfig gtk3 udev util-linux socat ]}" runHook postInstall ''; diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix index 86103e75067c..7df5d8de1803 100644 --- a/pkgs/by-name/xv/xv/package.nix +++ b/pkgs/by-name/xv/xv/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-IFbR/1oksRkpJvvu+7TwLFtDujuAmV+sX8Njn6gpgBg="; + sha256 = "sha256-abmMrAxgccECsOi0eIy9/y0haPkUgbOl9wCgISLy5Rs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index b7b3817021c8..7f8d8a5e0a65 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - hash = "sha256-UjeLsc6pz1t798Qy6cliYjP0qjXvUIPotbnUm8dBrFs="; + hash = "sha256-6/3+FtHGyVmuOtmuKhboiQ40ECini/0OwvKcftIjIIM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b33641a3442a..dd589ddd7eaa 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,13 +3,13 @@ stdenv, callPackage, fetchFromGitHub, - fetchpatch, useMinimalFeatures ? false, useArmadillo ? (!useMinimalFeatures), useArrow ? (!useMinimalFeatures), useHDF ? (!useMinimalFeatures), useJava ? (!useMinimalFeatures), + useLibAvif ? (!useMinimalFeatures), useLibHEIF ? (!useMinimalFeatures), useLibJXL ? (!useMinimalFeatures), useMysql ? (!useMinimalFeatures), @@ -43,6 +43,7 @@ json_c, lerc, libaom, + libavif, libde265, libdeflate, libgeotiff, @@ -82,27 +83,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-8LY63s5vOVK0V37jQ60qFsaW/2D/13Xuy9/2OPLyTso="; + hash = "sha256-pb2xKTmJB7U1jIG80ENmZrR7vFw6YDoees43u/JhU3Y="; }; - patches = [ - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; - sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; - }) - (fetchpatch { - name = "arrow-18.patch"; - url = "https://github.com/OSGeo/gdal/commit/9a8c5c031404bbc81445291bad128bc13766cafa.patch"; - sha256 = "sha256-tF46DmF7ZReqY8ACTTPXohWLsRn8lVxhKF1s+r254KM="; - }) - ]; - nativeBuildInputs = [ bison @@ -150,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = let tileDbDeps = lib.optionals useTiledb [ tiledb ]; + libAvifDeps = lib.optionals useLibAvif [ libavif ]; libHeifDeps = lib.optionals useLibHEIF [ libheif dav1d @@ -218,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.numpy ] ++ tileDbDeps + ++ libAvifDeps ++ libHeifDeps ++ libJxlDeps ++ mysqlDeps @@ -301,7 +292,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" - "test_ogr_gpkg_arrow_stream_huge_array" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" diff --git a/pkgs/development/php-packages/vld/default.nix b/pkgs/development/php-packages/vld/default.nix index 1771f7b21514..3c7aaee8ae62 100644 --- a/pkgs/development/php-packages/vld/default.nix +++ b/pkgs/development/php-packages/vld/default.nix @@ -4,26 +4,21 @@ fetchFromGitHub, }: -let - version = "0.18.0"; -in buildPecl { - inherit version; - pname = "vld"; + version = "0.18.0-unstable-2024-08-22"; src = fetchFromGitHub { owner = "derickr"; repo = "vld"; - rev = version; - hash = "sha256-1xMStPM3Z5qIkrRGfCKcYT6UdF1j150nt7IleirjdBM="; + rev = "dc56f73a25b0230745afb5523871f2e8dd33fccd"; + hash = "sha256-pQ1KIdGtV7bN5nROOJHR7C1eFMqVioTNLPAsJzH86NI="; }; # Tests relies on PHP 7.0 doCheck = false; meta = { - changelog = "https://github.com/derickr/vld/releases/tag/${version}"; description = "Vulcan Logic Dumper hooks into the Zend Engine and dumps all the opcodes (execution units) of a script"; homepage = "https://github.com/derickr/vld"; license = lib.licenses.bsd2; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 1887ed1cebf1..ffeb8fcbf3c9 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks="; + hash = "sha256-E7N/FFUFsur0y9H5Pp7ol/9bytwUU5EG8E68TMF5tJ8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 2c0b156272d3..6f9c019e0188 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.14"; + version = "0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-sunqCWfXz91nqbJXGeivo3DoQOVgcA8grO5j3atrLbo="; + hash = "sha256-Bg5nHvUaW+cHZEzmZ08YuXwecVx6R8tys8ZBuqUEhTg="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/array-api-strict/default.nix b/pkgs/development/python-modules/array-api-strict/default.nix index 7450717251b2..c55e2140cdac 100644 --- a/pkgs/development/python-modules/array-api-strict/default.nix +++ b/pkgs/development/python-modules/array-api-strict/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "array-api-strict"; - version = "2.0.1"; + version = "2.2"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-strict"; rev = "refs/tags/${version}"; - hash = "sha256-sGuMhtxhXXFD6KAiujuWdDe2+gKYN3ijiXvi07a2AgA="; + hash = "sha256-9WIKN2mekJIOD076946xkNqMlfeTaLuuB9qqAJN8Xwc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 6ca2997257c9..9f8e737f2979 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -12,6 +12,7 @@ cython, cmake, setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -19,19 +20,23 @@ buildPythonPackage rec { version = "24.9.4"; pyproject = true; - build-system = [ setuptools ]; + + build-system = [ + setuptools + setuptools-scm + ]; disabled = pythonOlder "3.5"; src = fetchPypi { - pname = "BoltzTraP2"; + pname = "boltztrap2"; inherit version; hash = "sha256-BfGR7sY0E9r+RXA1fC9uy1GXC+EFV1RKOvMyvGcf+aE="; }; postPatch = '' - substituteInPlace setup.py \ - --replace-fail "USE_CYTHON = False" "USE_CYTHON = True" + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0" "numpy" ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 2c3243a11576..08668b89a777 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.4.0"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-8q5qWN+i2mGbzXvkop/G6mjZegzZ/6kr1Fl7FaHwLYA="; + hash = "sha256-Y0jI/06jVbivKkKd8ZXvotBBo+nvo7Wmp4VypTzDf5k="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 1fb63c59cd4c..aac9565e0556 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.10"; + version = "0.19.11"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-E3CaQx5SGOnxqjLFY0opcKZF4DMl2HKSUD0gOnA25RA="; + hash = "sha256-J/D0rHhxJMpOSGu9LQ6tPKnjBZhqTX6I5YcSkx5+qXk="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index adb0c89e3b94..d33143d829d5 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -8,9 +9,7 @@ # dependencies absl-py, - dm-tree, h5py, - markdown-it-py, ml-dtypes, namex, numpy, @@ -20,18 +19,28 @@ tensorflow, pythonAtLeast, distutils, + + # tests + dm-tree, + jax, + jaxlib, + pandas, + pydot, + pytestCheckHook, + tf-keras, + torch, }: buildPythonPackage rec { pname = "keras"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-zbeGa4g2psAofYAVuM7BNWI2gI21e739N5ZtxVfnVUg="; + hash = "sha256-qidY1OmlOYPKVoxryx1bEukA7IS6rPV4jqlnuf3y39w="; }; build-system = [ @@ -40,9 +49,7 @@ buildPythonPackage rec { dependencies = [ absl-py - dm-tree h5py - markdown-it-py ml-dtypes namex numpy @@ -57,14 +64,68 @@ buildPythonPackage rec { "keras._tf_keras" ]; - # Couldn't get tests working - doCheck = false; + nativeCheckInputs = [ + dm-tree + jaxlib + jax + pandas + pydot + pytestCheckHook + tf-keras + torch + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = + [ + # Tries to install the package in the sandbox + "test_keras_imports" + + # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects + "test_reloading_default_saved_model" + ] + ++ lib.optionals stdenv.isDarwin [ + # AttributeError: module 'numpy' has no attribute 'float128'. Did you mean: 'float16'? + "test_spectrogram_error" + ]; + + disabledTestPaths = [ + # Datasets are downloaded from the internet + "integration_tests/dataset_tests" + + # TypeError: test_custom_fit..CustomModel.train_step() missing 1 required positional argument: 'data' + "integration_tests/jax_custom_fit_test.py" + + # RuntimeError: Virtual devices cannot be modified after being initialized + "integration_tests/tf_distribute_training_test.py" + + # AttributeError: 'CustomModel' object has no attribute 'zero_grad' + "integration_tests/torch_custom_fit_test.py" + + # Fails for an unclear reason: + # self.assertLen(list(net.parameters()), 2 + # AssertionError: 0 != 2 + "integration_tests/torch_workflow_test.py" + + # Most tests require internet access + "keras/src/applications/applications_test.py" + + # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects + "keras/src/backend/tensorflow/saved_model_test.py" + "keras/src/export/export_lib_test.py" + + # KeyError: 'Unable to synchronously open object (bad object header version number)' + "keras/src/saving/file_editor_test.py" + ]; meta = { description = "Multi-backend implementation of the Keras API, with support for TensorFlow, JAX, and PyTorch"; homepage = "https://keras.io"; changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix index e5ee0bf3c36a..892e3b43a20c 100644 --- a/pkgs/development/python-modules/manga-ocr/default.nix +++ b/pkgs/development/python-modules/manga-ocr/default.nix @@ -8,7 +8,7 @@ with python3Packages; buildPythonPackage rec { pname = "manga-ocr"; - version = "0.1.12"; + version = "0.1.13"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "kha-white"; repo = "manga-ocr"; rev = "refs/tags/v${version}"; - hash = "sha256-uSWnrHS59fNcF7ve3imMwwNJ+/dmplBAavbDoBkEgGc="; + hash = "sha256-0EwXDMnA9SCmSsMVXnMenSFSzs74lorFNNym9y/NNsI="; }; build-system = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index c0e12faa851f..32566d057067 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.6"; + version = "0.32.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg="; + hash = "sha256-hgIgsimO2BIYyA7Wsosp1aY0JbA7u/ccuBLQnA8IMlo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index e27c94704edc..3cd0331e7fb3 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, # dependencies appdirs, @@ -30,6 +31,15 @@ buildPythonPackage rec { hash = "sha256-dxCGCPnk1IFKg8ZVqMJsojQL0KlNirKlHJoaaOYIzMU="; }; + patches = [ + # TODO: this has been merged in master and will thus be included in the next release. + (fetchpatch { + name = "migrate-from-nose-to-pytest"; + url = "https://github.com/openvax/mhcflurry/commit/8e9f35381a476362ca41cb71eb0a90f6573fe4b3.patch"; + hash = "sha256-PyyxGrjE3OZR8dKHEQBQGiRG9A8kcz/e14PRyrVvqrE="; + }) + ]; + # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. dependencies = [ appdirs @@ -94,7 +104,5 @@ buildPythonPackage rec { changelog = "https://github.com/openvax/mhcflurry/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; - # Requires a recent version of tensorflow - broken = lib.versionOlder tensorflow.version "2.15.0"; }; } diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 09261b23023a..cc5af52c241d 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-http"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-http-python"; rev = "refs/tags/v${version}"; - hash = "sha256-dtSTrsLVDNJ+s5B3wLvZ9qGerZ8fdYpEsqrBoPf7Lrk="; + hash = "sha256-0hntB9GSDE05l/ghWTzMrX1MAPdWNHJVIQFpskraDV8="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 98f091927bdb..0f24382261fe 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "3.0.0"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-V6QQCQcSSEt11+Xv6HtWZSH+/nPFRZZK1ThQJipIT0M="; + hash = "sha256-J7vcEuJC0fVYyalSm9jDT44mLThoMw78Xmj5Ap3Q9ME="; }; pythonRelaxDeps = [ "pillow" ]; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 2bfc6edf2944..903cfdfeef37 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.11.1"; + version = "5.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rEVNXqhDHy9/DJXijaIEPb0wNTjChH/uBXA55AfdGRE="; + hash = "sha256-UpNqmMyy8uHW48sYUospGfaDHn4/kk54i1hzutzlEps="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index 92900abd88f1..9d1e9bdbb972 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2024.9"; + version = "2024.10"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-R5OGnzcNHcSAbBAe/SiQ48PnA0Z9jSe7Wj2wBev7AI0="; + hash = "sha256-ikZlXlxbAYa15Sc5kRips0LxBRPrFCXEg/pPbQLogAw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 53c693974c2a..a49466bea784 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-9rYTBMVb664R9heOw/N/PUFotwOP1avdPUjPDhICkVU="; + hash = "sha256-WYgT0tRXdSR4qJA7UHotPn9qfnpaIJaqASBXVDG1kOU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 14241ea1465b..327bd997fad5 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-celery"; - version = "1.1.1"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "celery"; repo = "pytest-celery"; rev = "refs/tags/v${version}"; - hash = "sha256-LLbT2GjKvG8RisAgsCxI3iybJLLjbESZ9tCBKub8bj8="; + hash = "sha256-TUtKfGOxvVkiMhsUqyNDK08OTuzzKHrBiPU4JCKsIKM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 30dd05cffbdd..8c3f93fe617b 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.4.0"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-A8o8FYuhlzL6Wl6sfB7D2KRAKZl28E6K2AdUik9zmgs="; + hash = "sha256-YGSd0IG6TWnHmDiVEE3F2KNQ4dXJhkPqAJsIrWyuHos="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 99c7f3d12df8..22fdd998b8c5 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "7.0.1"; + version = "7.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "cogeotiff"; repo = "rio-tiler"; rev = "refs/tags/${version}"; - hash = "sha256-E8gKXPj1n9HZ+zvQPcG28+2Vuif4B6NBhtuS009x6rU="; + hash = "sha256-uVLizNkUL7wGF0vFjPXb2iW9ILVkJcbDssXtp3E8ubE="; }; build-system = [ hatchling ]; @@ -62,5 +62,8 @@ buildPythonPackage rec { homepage = "https://cogeotiff.github.io/rio-tiler/"; license = licenses.bsd3; maintainers = lib.teams.geospatial.members; + # Tests broken with gdal 3.10 + # https://github.com/cogeotiff/rio-tiler/issues/769 + broken = true; }; } diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix index 1664a05c2914..202aaea145d8 100644 --- a/pkgs/development/python-modules/tf-keras/default.nix +++ b/pkgs/development/python-modules/tf-keras/default.nix @@ -9,6 +9,8 @@ # dependencies numpy, tensorflow, + pythonAtLeast, + distutils, # tests pytestCheckHook, @@ -16,13 +18,13 @@ buildPythonPackage rec { pname = "tf-keras"; - version = "2.17.0"; + version = "2.18.0"; pyproject = true; src = fetchPypi { pname = "tf_keras"; inherit version; - hash = "sha256-/al8GNow2g9ypafoDz7uNDsJ9MIG2tbFfJRPss0YVg4="; + hash = "sha256-6/dEUZsyKv6tMwhqKrqHIkVHMpSv/UCXNpTz63x6130="; }; build-system = [ @@ -32,7 +34,7 @@ buildPythonPackage rec { dependencies = [ numpy tensorflow - ]; + ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; pythonImportsCheck = [ "tf_keras" ]; diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index f2811a8c53e3..bb077e1da978 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.41.2"; + version = "0.42.0"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-d2/N/NqtRglRN/3E7B5FOMpcQXP/taKFYodc6mhW7A4="; + hash = "sha256-cxC60kV95B2fcD6fuqWe0+KEVhcwWuaUDKpcmaQshO0="; }; - vendorHash = "sha256-hy2w1Ix202gSJyp/EQ6uKJC8y16nw8Y78kDaP9LbU/4="; + vendorHash = "sha256-/aSP4bn4wiJtgLKKfdLTYl2FLUatrV02wAZZfzJwVqw="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index c0dd2e133f9d..ed3602aa6d59 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9e3prTe7mHQJfSeIL+bEkW6GykvxA8ryD3GHgxk56Us="; + sha256 = "sha256-Uf5Itclc43E8tsgS8rR8F2Dq9gNVIagoB5KfEqqd7MI="; }; vendorHash = null; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 5a5918c6f815..34ba117bf51e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -1,35 +1,51 @@ -{ lib -, beamPackages -, buildNpmPackage -, fetchFromGitHub -, nodejs -, nixosTests -, ... +{ + lib, + beamPackages, + buildNpmPackage, + rustPlatform, + fetchFromGitHub, + nodejs, + runCommand, + nixosTests, + npm-lockfile-fix, + brotli, + tailwindcss, + esbuild, + ... }: let pname = "plausible"; - version = "2.0.0"; + version = "2.1.4"; + mixEnv = "ce"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - hash = "sha256-yrTwxBguAZbfEKucUL+w49Hr6D7v9/2OjY1h27+w5WI="; - }; - - # TODO consider using `mix2nix` as soon as it supports git dependencies. - mixFodDeps = beamPackages.fetchMixDeps { - pname = "${pname}-deps"; - inherit src version; - hash = "sha256-CAyZLpjmw1JreK3MopqI0XsWhP+fJEMpXlww7CibSaM="; + hash = "sha256-wV2zzRKJM5pQ06pF8vt1ieFqv6s3HvCzNT5Hed29Owk="; + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json + sed -ie ' + /defp deps do/ { + n + /\[/ a\ + \{:rustler, ">= 0.0.0", optional: true \}, + } + ' $out/mix.exs + cat >> $out/config/config.exs <> config/config.exs < $dir/package.json - -tarball_meta="$(nix-prefetch-github plausible analytics --rev "$latest")" -tarball_hash="$(jq -r '.hash' <<< "$tarball_meta")" -tarball_path="$(nix-build -E 'with import ./. {}; { p }: fetchFromGitHub (builtins.fromJSON p)' --argstr p "$tarball_meta")" -fake_hash="$(nix-instantiate --eval -A lib.fakeHash | xargs echo)" - -sed -i "$dir/default.nix" \ - -e 's,version = ".*",version = "'"$nix_version"'",' \ - -e '/^ src = fetchFromGitHub/,+4{;s#hash = "\(.*\)"#hash = "'"$tarball_hash"'"#}' \ - -e '/^ mixFodDeps =/,+3{;s#hash = "\(.*\)"#hash = "'"$fake_hash"'"#}' - -mix_hash="$(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" - -sed -i "$dir/default.nix" -e '/^ mixFodDeps =/,+3{;s#hash = "\(.*\)"#hash = "'"$mix_hash"'"#}' - -tmp_setup_dir="$(mktemp -d)" -trap "rm -rf $tmp_setup_dir" EXIT - -cp -r $tarball_path/* $tmp_setup_dir/ -cp -r "$(nix-build -A plausible.mixFodDeps)" "$tmp_setup_dir/deps" -chmod -R u+rwx "$tmp_setup_dir" - -pushd $tmp_setup_dir/assets -yarn -yarn2nix > "$dir/yarn.nix" -cp yarn.lock "$dir/yarn.lock" -popd - -nix-build -A plausible diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 1f54a01527b4..101438c8fbb7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.32"; + version = "1.4.34"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-wNpbjnP44eDjKygG+0VhUj8fhiRXGwfdV33H39o7asc="; + sha256 = "sha256-Dwnrpsk8cx51b702SXCEwfGGk4bZ8w4EPcfWpKd5RDI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 58ad000ae2c1..b0e67470f570 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.11.1"; + version = "2024.11.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mjZNwkJgEb9jbndGCoq1b/SggKW/TcZSpjqwg3/hZEQ="; + hash = "sha256-zxFP7QXZbX/kj17po3tMNHoc7OfCdFSQ73e1umf+QA8="; }; build-systems = with python.pkgs; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81883ab5875a..e781876bdb92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1926,8 +1926,8 @@ with pkgs; lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; plausible = callPackage ../servers/web-apps/plausible { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + elixir = elixir_1_17; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); }; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 768e908a361c..3bd8248805d2 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 + ios-deploy = throw "'darwin.ios-deploy' has been renamed to 'ios-deploy'"; # added 2024-11-28 ### L ### diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9c9cb9043591..89e10d8b0ab0 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -237,8 +237,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; - ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - # See doc/packages/darwin-builder.section.md linux-builder = lib.makeOverridable ({ modules }: let