diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index aa50affb51a2..4dd7e05f972d 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -128,6 +128,8 @@ See . - [services.resolved](#opt-services.resolved.enable) module was converted to RFC42-style settings. The moved options have also been renamed to match the upstream names. Aliases mean current configs will continue to function, but users should move to the new options as convenient. +- Support for Bluetooth audio based on `bluez-alsa` has been added to the `hardware.alsa` module. It can be enabled with the new [enableBluetooth](#opt-hardware.alsa.enableBluetooth) option. + - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix. - `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options. diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index c1ee7023aa1f..7bd0200e3c02 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -44,9 +44,15 @@ let in lib.forEach options (i: "options ${i.driver} index=${toList i.ids} id=${toList i.names}"); - defaultDeviceVars = { + pluginsPath = pkgs.symlinkJoin { + name = "alsa-with-plugins"; + paths = cfg.plugins; + }; + + alsaVariables = { "ALSA_AUDIO_OUT" = cfg.defaultDevice.playback; "ALSA_AUDIO_IN" = cfg.defaultDevice.capture; + "ALSA_PLUGIN_DIR" = lib.mkIf (cfg.plugins != [ ]) "${pluginsPath}/lib/alsa-lib"; }; in @@ -106,6 +112,8 @@ in enableOSSEmulation = lib.mkEnableOption "the OSS emulation"; + enableBluetooth = lib.mkEnableOption "Bluetooth audio support via BlueALSA"; + enableRecorder = lib.mkOption { type = lib.types.bool; default = false; @@ -125,6 +133,15 @@ in ''; }; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + example = lib.literalExpression "[ pkgs.bluez-alsa ]"; + description = '' + List of ALSA plugins to be added to the search path. + ''; + }; + defaultDevice.playback = lib.mkOption { type = lib.types.str; default = ""; @@ -392,8 +409,8 @@ in }; # Set default PCM devices - environment.sessionVariables = defaultDeviceVars; - systemd.globalEnvironment = defaultDeviceVars; + environment.sessionVariables = alsaVariables; + systemd.globalEnvironment = alsaVariables; environment.etc."asound.conf".text = cfg.config; @@ -412,6 +429,33 @@ in environment.systemPackages = [ pkgs.alsa-utils ]; }) + (lib.mkIf (cfg.enable && cfg.enableBluetooth) { + + users.users.bluealsa = { + description = "BlueALSA daemons user"; + isSystemUser = true; + group = "audio"; + }; + + # Link ALSA configuration + environment.etc."alsa/conf.d/20-bluealsa.conf".source = + "${pkgs.bluez-alsa}/etc/alsa/conf.d/20-bluealsa.conf"; + + # Install plugin + hardware.alsa.plugins = [ pkgs.bluez-alsa ]; + + # Install CLI tools and systemd units + environment.systemPackages = [ pkgs.bluez-alsa ]; + systemd.packages = [ pkgs.bluez-alsa ]; + + # See Nixpkgs issue #81138 + systemd.services."bluealsa".wantedBy = [ "bluetooth.target" ]; + + # Note: bluealsa-aplay is available but we don't start it + # by default, it's only needed to make the machine act as + # bluetooth speaker + }) + (lib.mkIf config.hardware.alsa.enablePersistence { # Install udev rules for restoring card settings on boot diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 315f536a8039..dc1900f52c1e 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -406,15 +406,14 @@ in http = { # https://www.home-assistant.io/integrations/http/ server_host = mkOption { - type = types.nullOr (types.either types.str (types.listOf types.str)); - default = null; - example = [ - "::1" - "127.0.0.1" + type = types.either types.str (types.listOf types.str); + default = [ + "0.0.0.0" + "::" ]; + example = "::1"; description = '' - Only listen to incoming requests on specific IP/host. - The option is unset by default, meaning that Home Assistant listens on all available addresses. + Only listen to incoming requests on specific IP/host. The default listed assumes support for IPv4 and IPv6. ''; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index e853d55840c5..c017dd333e1a 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -356,16 +356,6 @@ in "d '${cfg.stateDir}/public/plugin_assets' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.stateDir}/themes' 0750 ${cfg.user} ${cfg.group} - -" "d '${cfg.stateDir}/tmp' 0750 ${cfg.user} ${cfg.group} - -" - - "d /run/redmine/public - - - - -" - "L+ /run/redmine/config - - - - ${cfg.stateDir}/config" - "L+ /run/redmine/files - - - - ${cfg.stateDir}/files" - "L+ /run/redmine/log - - - - ${cfg.stateDir}/log" - "L+ /run/redmine/plugins - - - - ${cfg.stateDir}/plugins" - "L+ /run/redmine/public/assets - - - - ${cfg.stateDir}/public/assets" - "L+ /run/redmine/public/plugin_assets - - - - ${cfg.stateDir}/public/plugin_assets" - "L+ /run/redmine/themes - - - - ${cfg.stateDir}/themes" - "L+ /run/redmine/tmp - - - - ${cfg.stateDir}/tmp" ]; systemd.services.redmine = { @@ -392,6 +382,19 @@ in ++ lib.optional cfg.components.ghostscript ghostscript; preStart = '' + # Create symlinks for the basic directory layout the redmine package + # expects. This part must be done in preStart rather than tmpfiles, + # because /run/redmine is re-created when the service is restarted + mkdir /run/redmine/public + ln -s "${cfg.stateDir}/config" /run/redmine/config + ln -s "${cfg.stateDir}/files" /run/redmine/files + ln -s "${cfg.stateDir}/log" /run/redmine/log + ln -s "${cfg.stateDir}/plugins" /run/redmine/plugins + ln -s "${cfg.stateDir}/public/assets" /run/redmine/public/assets + ln -s "${cfg.stateDir}/public/plugin_assets" /run/redmine/public/plugin_assets + ln -s "${cfg.stateDir}/themes" /run/redmine/themes + ln -s "${cfg.stateDir}/tmp" /run/redmine/tmp + rm -rf "${cfg.stateDir}/plugins/"* rm -rf "${cfg.stateDir}/themes/"* diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix index 9a1e255441c7..003ed7595fb8 100644 --- a/nixos/modules/services/security/crowdsec.nix +++ b/nixos/modules/services/security/crowdsec.nix @@ -625,7 +625,6 @@ in services.crowdsec.settings.general = { common = { - daemonize = false; log_media = "stdout"; }; config_paths = { diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index dd1af128b386..1d87c18d8cb3 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -46,4 +46,30 @@ in name = "pgsql"; type = "postgresql"; }; + + restart = makeTest { + name = "redmine-restart"; + nodes.machine = + { config, pkgs, ... }: + { + services.redmine = { + enable = true; + package = pkgs.redmine; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("redmine.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000/") + + machine.systemctl("stop redmine.service") + machine.systemctl("start redmine.service") + + machine.wait_for_unit("redmine.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000/") + ''; + }; } diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 8230f8c72f3a..f38479423581 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "6d182b22f6b9430c76ea71579ffb2eee0e2e9521"; - hash = "sha256-QHkG5CSZgaakblOgp5HxGvtWg8K4Nbag481nhG4UjoY="; + rev = "52675734da114a19b3705f03906b1455f3d76644"; + hash = "sha256-hITofg0UB5sGNOKAijfORz3ZtHY5CCdqFmbT4nMkmG8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix index ab1231313be8..2751ae53e473 100644 --- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix @@ -12,13 +12,13 @@ }: mkLibretroCore { core = "mupen64plus-next"; - version = "0-unstable-2025-11-14"; + version = "0-unstable-2026-01-20"; src = fetchFromGitHub { owner = "libretro"; repo = "mupen64plus-libretro-nx"; - rev = "680e033fc8ed1a49df7b156d97164e0050ee13bc"; - hash = "sha256-oBsOC1YtHx+mTgi9rwucU7rVeFt6RbxKrxHyPDx0eXg="; + rev = "bc43bcedc276861254b48526f56799d63a30723b"; + hash = "sha256-0dofQP35EmVY6i5muwIARuF1G4+92jhFjAiWcwyJDTs="; }; # Fix for GCC 14 diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/applications/emulators/libretro/cores/np2kai.nix index 6ba98244a320..7f2c4c501b3a 100644 --- a/pkgs/applications/emulators/libretro/cores/np2kai.nix +++ b/pkgs/applications/emulators/libretro/cores/np2kai.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "np2kai"; - version = "0-unstable-2024-11-03"; + version = "0-unstable-2026-01-19"; src = fetchFromGitHub { owner = "AZO234"; repo = "NP2kai"; - rev = "4b109eaac4f79b04065ff5025319fce51537e04d"; - hash = "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU="; + rev = "e2138c44ea539b36b2d1fc17b70c14fcedfd9784"; + hash = "sha256-59u8UWk2KNtZNAUcMql0BaCY+VtDs7GssrQRbXbqB3c="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 551d2a0ef2cb..7c1c08bea20d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -724,11 +724,11 @@ "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-DvWlf3FHYDcNxUZUOoslQjhuwGvElAEu/duDsX4xbKs=", + "hash": "sha256-1GqI6cFy386osELaG474OeQX33wIAIEABb/bL5ezs6Q=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.87.1", + "rev": "v1.87.2", "spdx": "MPL-2.0", "vendorHash": "sha256-vKu5ytMAhIYKoPNfuxpyBT9gRdSAR4wFI/7A9K+RiAo=" }, diff --git a/pkgs/applications/version-management/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix deleted file mode 100644 index ccd202fa3fe3..000000000000 --- a/pkgs/applications/version-management/cgit/common.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - pname, - version, - src, - gitSrc, - buildInputs ? [ ], - homepage, - description, - maintainers, - passthru ? { }, -}: - -{ - lib, - stdenv, - openssl, - zlib, - asciidoc, - libxml2, - libxslt, - docbook_xsl, - pkg-config, - coreutils, - gnused, - groff, - docutils, - gzip, - bzip2, - lzip, - xz, - zstd, - python3Packages, -}: - -stdenv.mkDerivation { - inherit - pname - version - src - gitSrc - passthru - ; - - separateDebugInfo = true; - - nativeBuildInputs = [ - pkg-config - asciidoc - ] - ++ (with python3Packages; [ - python - wrapPython - ]); - buildInputs = buildInputs ++ [ - openssl - zlib - libxml2 - libxslt - docbook_xsl - ]; - pythonPath = with python3Packages; [ - pygments - markdown - ]; - - postPatch = '' - sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ - -e 's|"lzip"|"${lzip}/bin/lzip"|' \ - -e 's|"xz"|"${xz.bin}/bin/xz"|' \ - -e 's|"zstd"|"${zstd}/bin/zstd"|' \ - -i ui-snapshot.c - - substituteInPlace filters/html-converters/man2html \ - --replace 'groff' '${groff}/bin/groff' - - substituteInPlace filters/html-converters/rst2html \ - --replace 'rst2html.py' '${docutils}/bin/rst2html.py' - ''; - - # Give cgit a git source tree and pass configuration parameters (as make - # variables). - preBuild = '' - mkdir -p git - tar --strip-components=1 -xf "$gitSrc" -C git - ''; - - makeFlags = [ - "prefix=$(out)" - "CGIT_SCRIPT_PATH=$(out)/cgit/" - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ]; - - # Install manpage. - postInstall = '' - # xmllint fails: - #make install-man - - # bypassing xmllint works: - a2x --no-xmllint -f manpage cgitrc.5.txt - mkdir -p "$out/share/man/man5" - cp cgitrc.5 "$out/share/man/man5" - - wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" - - for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${ - lib.makeBinPath [ - coreutils - gnused - ] - }' - done - ''; - - stripDebugList = [ "cgit" ]; - - enableParallelBuilding = true; - - meta = { - inherit homepage description; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]); - }; -} diff --git a/pkgs/applications/version-management/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix index 9fcd94ccf5e1..06b801a9dcbf 100644 --- a/pkgs/applications/version-management/cgit/default.nix +++ b/pkgs/applications/version-management/cgit/default.nix @@ -1,17 +1,34 @@ { lib, + stdenv, fetchurl, - callPackage, + openssl, + zlib, + asciidoc, + libxml2, + libxslt, luajit, + docbook_xsl, + pkg-config, + coreutils, + gnused, + groff, + docutils, + gzip, + bzip2, + lzip, + xz, + zstd, + python3Packages, nixosTests, }: -callPackage (import ./common.nix rec { +stdenv.mkDerivation { pname = "cgit"; version = "1.2.3"; src = fetchurl { - url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz"; sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"; }; @@ -23,11 +40,95 @@ callPackage (import ./common.nix rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - buildInputs = [ luajit ]; + separateDebugInfo = true; + + nativeBuildInputs = [ + pkg-config + asciidoc + ] + ++ (with python3Packages; [ + python + wrapPython + ]); + buildInputs = [ + openssl + zlib + libxml2 + libxslt + luajit + docbook_xsl + ]; + pythonPath = with python3Packages; [ + pygments + markdown + ]; + + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ + -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ + -i ui-snapshot.c + + substituteInPlace filters/html-converters/man2html \ + --replace 'groff' '${groff}/bin/groff' + + substituteInPlace filters/html-converters/rst2html \ + --replace 'rst2html.py' '${docutils}/bin/rst2html.py' + ''; + + # Give cgit a git source tree and pass configuration parameters (as make + # variables). + preBuild = '' + mkdir -p git + tar --strip-components=1 -xf "$gitSrc" -C git + ''; + + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$(out)/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + # Install manpage. + postInstall = '' + # xmllint fails: + #make install-man + + # bypassing xmllint works: + a2x --no-xmllint -f manpage cgitrc.5.txt + mkdir -p "$out/share/man/man5" + cp cgitrc.5 "$out/share/man/man5" + + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + + for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do + wrapProgram $script --prefix PATH : '${ + lib.makeBinPath [ + coreutils + gnused + ] + }' + done + ''; + + stripDebugList = [ "cgit" ]; + + enableParallelBuilding = true; passthru.tests = { inherit (nixosTests) cgit; }; - homepage = "https://git.zx2c4.com/cgit/about/"; - description = "Web frontend for git repositories"; - maintainers = with lib.maintainers; [ bjornfor ]; -}) { } + meta = { + homepage = "https://git.zx2c4.com/cgit/about/"; + description = "Web frontend for git repositories"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + bjornfor + qyliss + sternenseemann + ]; + }; +} diff --git a/pkgs/applications/version-management/cgit/pink.nix b/pkgs/applications/version-management/cgit/pink.nix deleted file mode 100644 index 3ff143326027..000000000000 --- a/pkgs/applications/version-management/cgit/pink.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchurl, - callPackage, -}: - -callPackage (import ./common.nix rec { - pname = "cgit-pink"; - version = "1.4.1"; - - src = fetchurl { - url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz"; - sha256 = "1ma6j3r4ba5fhd47pc6xn5bmxaqr8ci2pvky9v100n1hh5n6q97i"; - }; - - # cgit-pink is tightly coupled with git and needs a git source tree to build. - # IMPORTANT: Remember to check which git version cgit-pink needs on every - # version bump (look for "GIT_VER" in the top-level Makefile). - gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz"; - sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"; - }; - - homepage = "https://git.causal.agency/cgit-pink/about/"; - description = "cgit fork aiming for better maintenance"; - maintainers = with lib.maintainers; [ sternenseemann ]; -}) { } diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index bc7500df3b5b..3bdce7e545e1 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -16,6 +16,8 @@ readline, sbc, python3, + systemdSupport ? true, + systemdLibs, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook pkg-config python3 - ]; + ] + ++ lib.optional systemdSupport systemdLibs; buildInputs = [ alsa-lib @@ -49,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: { libbsd ncurses ] - ++ lib.optionals aacSupport [ - fdk_aac - ]; + ++ lib.optional aacSupport fdk_aac; configureFlags = [ (lib.enableFeature aacSupport "aac") @@ -59,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature true "rfcomm") (lib.withFeatureAs true "alsaplugindir" "${placeholder "out"}/lib/alsa-lib") (lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.enableFeature systemdSupport "systemd") + (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system") + (lib.withFeatureAs systemdSupport "bluealsauser" "bluealsa") + (lib.withFeatureAs systemdSupport "bluealsaaplayuser" "bluealsa") ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix index fec13b3acec1..23230e8dfcc7 100644 --- a/pkgs/by-name/ca/cantus/package.nix +++ b/pkgs/by-name/ca/cantus/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cantus"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "CodedNil"; repo = "cantus"; tag = version; - hash = "sha256-/gwZqr66rpD7w9EuN03vKRWVH/DYDLUvijEkmrN2E+c="; + hash = "sha256-dAMphU+voDUwFzlPuV6nCUg0RaVVyRJLoM6IwjUtvA4="; }; - cargoHash = "sha256-vC/07gvVMH/UATFl7NvJTRLzIOSjrelzINmQ6zUBSos="; + cargoHash = "sha256-0RVjHKg2msoxY+0WZHOPOAXK2nNne7CA9owmNUf8x6I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index 649c575bb045..4d985f925915 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,13 +7,13 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-20"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "35615c7feafbc8005e160e7609888a97f5d3b031"; - hash = "sha256-Kj3gUKFsfgUVVWuz7nuc7djRvfyvXc3wkHt1DxYIw30="; + rev = "edde4d30f76bb6ff2e0684be4da496ed5d8166c4"; + hash = "sha256-cBpGhkpqAnzjUHyzuTWkUxMpFjGIdxrXu7TZRbomK9A="; }; npmDepsHash = "sha256-PgMgpVoKmhuqtSV73wSdqdQ5Bt5AeRwbn71mIulBh8Y="; diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 3dbd8cc625a3..82615f81051b 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -5,18 +5,18 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "crowdsec"; - version = "1.7.2"; + version = "1.7.6"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "crowdsec"; - tag = "v${version}"; - hash = "sha256-f0SxOXxXqKft3Nnf9y7itpPXJOjBrEpImbPANFNx4BM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Qd5EHn7G7bTV+S4bVXfHytoCI5L/gHxAKB9emeKoSLc="; }; - vendorHash = "sha256-v1UECFfgx1zFCzSyazxFRWMP/0fayVnrC+pJHio5z+Q="; + vendorHash = "sha256-txiZmUd/GQQu7XiI4iE25aCmOLe2sC0uQ8Gne76cw+Q="; nativeBuildInputs = [ installShellFiles ]; @@ -28,9 +28,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${version}" + "-X github.com/crowdsecurity/go-cs-lib/version.Version=v${finalAttrs.version}" "-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=1970-01-01_00:00:00" - "-X github.com/crowdsecurity/go-cs-lib/version.Tag=v${version}" + "-X github.com/crowdsecurity/go-cs-lib/version.Tag=v${finalAttrs.version}" "-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec" "-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data" @@ -56,7 +56,7 @@ buildGoModule rec { preCheck = '' version=$($GOPATH/bin/cscli version 2>&1 | sed -nE 's/^version: (.*)/\1/p') - if [ "$version" != "v${version}" ]; then + if [ "$version" != "v${finalAttrs.version}" ]; then echo "Invalid version string: '$version'" exit 1 fi @@ -64,7 +64,7 @@ buildGoModule rec { meta = { homepage = "https://crowdsec.net/"; - changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}"; + changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${finalAttrs.version}"; description = "Free, open-source and collaborative IPS"; longDescription = '' CrowdSec is a free, modern & collaborative behavior detection engine, @@ -82,4 +82,4 @@ buildGoModule rec { jk ]; }; -} +}) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 4284db117572..726abf3fe66b 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.300.4"; + version = "0.300.5"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-f2whzEq0LOyvNVLjSNvA19azbtJnOMJqu5EJQXnzZyg="; + hash = "sha256-TRd7usz3+a9h8f/waLKqlu6RuF/GsU9LdCx1NRGWIDA="; }; vendorHash = "sha256-IB3DqaUbdrqnYQpyHtnvY37xjbRvTvNOV39b8wciuTA="; diff --git a/pkgs/by-name/ex/exactaudiocopy/package.nix b/pkgs/by-name/ex/exactaudiocopy/package.nix index 52dcb505b482..d341a353994f 100644 --- a/pkgs/by-name/ex/exactaudiocopy/package.nix +++ b/pkgs/by-name/ex/exactaudiocopy/package.nix @@ -77,7 +77,7 @@ let }; in symlinkJoin { - name = "${pname}-${version}"; + inherit pname version; paths = [ wrapper diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index e7af4af3334b..b10568e8d94b 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-network-displays"; - version = "0.98.0"; + version = "0.99.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-3M42vuzgtTFFQJBswGn4KP5XtSWuv0LlhREFiHxiu2c="; + sha256 = "sha256-Hs5KG8gix+v3JeiEe4zomYtH0ewXFaS03bnd1xaR7YU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 147c87770256..3ffad3a901a7 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "49.2"; + version = "49.3"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-0TuFXY35nev37M+BC24FT9sK64fvixMZGKbkyRl6Asc="; + hash = "sha256-KPDb1kRS8AVxKfImdTyV0nJt4H8fX0c63cfDxQem0xo="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index cadf6b5f04b1..7a25118f6a5d 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY="; + hash = "sha256-8ESPJHu1l5pQxgIixExFEYgK1HTiVJV2Xl7SJG5U27E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix index 37d0508c7e88..fe1159cba73a 100644 --- a/pkgs/by-name/gn/gnote/package.nix +++ b/pkgs/by-name/gn/gnote/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "49.1"; + version = "49.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-l845YCx31l3w1d0z4HtbhtakWFdtzh5rbtGx5If14HM="; + hash = "sha256-lC8CsXIFff4HbdBNDwNlLqafNjg3Lsbrn8p3CBYEp7U="; }; buildInputs = [ diff --git a/pkgs/by-name/gn/gns3-server/package.nix b/pkgs/by-name/gn/gns3-server/package.nix index b08cdbef2527..c817deb471de 100644 --- a/pkgs/by-name/gn/gns3-server/package.nix +++ b/pkgs/by-name/gn/gns3-server/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "gns3-server"; - version = "2.2.55"; + version = "2.2.56"; pyproject = true; src = fetchFromGitHub { owner = "GNS3"; repo = "gns3-server"; tag = "v${version}"; - hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4="; + hash = "sha256-akA6P/ONPioce4pJbg4wAzSvb7aSYGM8NfCs7q9svic="; }; # GNS3 2.3.26 requires a static BusyBox for the Docker integration diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index e4542e23efd5..32235dd82c6a 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gthumb"; - version = "3.12.8.2"; + version = "3.12.9"; src = fetchurl { url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-q8V7EQMWXdaRU1eW99vbp2hiF8fQael07Q89gA/oh5Y="; + sha256 = "sha256-13+ItWneSSV4BzDnhnspB3GNpmBowkLd6bvaEH4YP/o="; }; strictDeps = true; diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix index 599b30fe749c..99e6a02ca5bf 100644 --- a/pkgs/by-name/ha/harmonoid/package.nix +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -16,11 +16,12 @@ mpv-unwrapped, }: let - version = "0.3.10"; + version = "0.3.21"; url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; url = rec { x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz"; + aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz"; x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; aarch64-darwin = x86_64-darwin; } @@ -28,8 +29,9 @@ let or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); hash = rec { - x86_64-linux = "sha256-GTF9KrcTolCc1w/WT0flwlBCBitskFPaJuNUdxCW9gs="; - x86_64-darwin = "sha256-7qcUnYBasUqisEW56fq4JGgojBmfqycrDIMpCCWLxlc="; + x86_64-linux = "sha256-RZDRb/afXbalNbLBGaQgx5Qd4UEbNrvIsa3h+e6osJE="; + aarch64-linux = "sha256-1ys7uyCjXe4IBeXRk8mFjqmP9OottNefQrrtTkxq/qU="; + x86_64-darwin = "sha256-mo7Rj6c89KZrsL29i99x4E7b6soWlGUsC6KpSB7y5iY="; aarch64-darwin = x86_64-darwin; } .${stdenv.hostPlatform.system}; @@ -90,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ivyfanchiang ]; platforms = [ "x86_64-linux" + "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index a0c25284f576..afb7e2c9256f 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -26,6 +26,8 @@ writeShellScript, common-updater-scripts, xmlstarlet, + makeDesktopItem, + copyDesktopItems, }: let @@ -67,6 +69,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip makeWrapper + copyDesktopItems ]; unpackCmd = '' @@ -81,7 +84,23 @@ stdenv.mkDerivation { dontBuild = true; + # Upstream doesn't seem to have a desktop item out of the box + desktopItems = [ + (makeDesktopItem { + name = "netsoft-com.netsoft.hubstaff"; + desktopName = "Hubstaff"; + exec = "HubstaffClient"; + icon = "hubstaff"; + comment = "Time tracking software"; + categories = [ + "Office" + "ProjectManagement" + ]; + }) + ]; + installPhase = '' + runHook preInstall # remove files for 32-bit arch to skip building for this arch # but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch) rm -rf x86 x86_64/lib64 @@ -100,6 +119,7 @@ stdenv.mkDerivation { # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources + runHook postInstall ''; # to test run: diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 7856f5f43204..b3f3dc55b5b4 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -50,7 +50,7 @@ }: let - nix = nixVersions.nix_2_32; + nix = nixVersions.nix_2_33; perlDeps = buildEnv { name = "hydra-perl-deps"; @@ -132,14 +132,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-11-06"; + version = "0-unstable-2026-01-23"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "241ab718002ca5740b7e3f659d0fbd483ab40523"; - hash = "sha256-ifmzQS+u/dODQXmMVQLIb4AF4dkWI9s7VGYpV6x/Iq4="; + rev = "8bc95a96f787eb36f29ceec773f5bf48bd121097"; + hash = "sha256-Ro+qOHWmWuKJiUwX8bmNuGpb0cLUaPr0vsuZGAi2QCI="; }; outputs = [ diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index c52c91176037..9071d99bfa8e 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.26.0"; + version = "4.27.0"; # Using a vendored version rather than nixpkgs' version to match the exact version required by # Lean. Apparently, even a slight version change can impact greatly the final performance. @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "leanprover"; repo = "lean4"; tag = "v${finalAttrs.version}"; - hash = "sha256-KDHE2RX1H+QKojrOUbJjIiKlv2kCvAwp4H8V81tDHbQ="; + hash = "sha256-nxAznaWQEilzn93SZTKLKL7TZEPD5LRcJLFmgoCWsXA="; }; postPatch = diff --git a/pkgs/by-name/li/lix-diff/package.nix b/pkgs/by-name/li/lix-diff/package.nix index 04cc71c5a9ce..8653b5ef8264 100644 --- a/pkgs/by-name/li/lix-diff/package.nix +++ b/pkgs/by-name/li/lix-diff/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lix-diff"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tgirlcloud"; repo = "lix-diff"; tag = "v${finalAttrs.version}"; - hash = "sha256-uZd8xoQWsvJCmHtxtKJzKtaupUdXMXKWqSjXnK/BZco="; + hash = "sha256-ehASke8ZpvHkQI9bCV3/9i1QG67hjSIMoIMQDlbODxU="; }; - cargoHash = "sha256-ydB65V879tW42FXSgdoUDeQbovsVf8qXku9uW4mqAfs="; + cargoHash = "sha256-ghwCwIg0PDfUfiHnwiUy8kNjPEgVWk92zA5ZnlD8BO8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index ede2467705d7..0fb06be38266 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; - version = "1.3.37"; + version = "1.3.38"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-4cz1icY7i8RFdh/HhG/y6UzR/zkhsp4+G2dplm4g+wo="; + hash = "sha256-xp3CdKoQnnbv+UNfjQskifLn7w+LINCIBaUdSZfTCK4="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-sU0EBSNwpjqyBsvyJim8Qz90dht7xc6f52HaY0sBPds="; + hash = "sha256-yXd9EF20aQr1YUqRyc3QeEVwsMLaT6Xhh/izT/JCVa0="; }; env = { diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 7e4936322523..7dce4468738a 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "49.2"; + version = "49.3"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-J2ORoIDlCVaSQKyGECVdd4q2qIoyUPmxd0AlXxNOPAo="; + hash = "sha256-nvH2HW/kAcyj/L5tmjsqT5tCY4y/hENzVmamGWSo8MM="; }; mesonFlags = [ diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 3697d51d3be0..e3311a3f7ac8 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.44.1"; + version = "0.44.2"; buildType = if withDebug then "debug" else "release"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-pZYlx1OVh0Gwvje8GqNV6U7ATy1/mxx6+8jSLqm5jDE="; + hash = "sha256-5Ch3j9URjf9MsGeH7x5CYojnDFQeLXJqcixcGJeDvT4="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index ed47b1b9a8de..094502ca5e3d 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.39.0"; + version = "1.41.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-Sg9NtXRuQ0ZruK8a8k5EkeDOJ9v6uzpNzEQ/FY56ioY="; + hash = "sha256-/XLGvEut0TsFkq0U+evPOumjBYahEL29kjJ0u2iBkx8="; }; - cargoHash = "sha256-sgIarCuUmSTAVPVr82rp4dQwzDMWESIbGgkCYEExz6o="; + cargoHash = "sha256-8Q94e9zZRdOMd7WVzS6kE31gBHCG8KC4SteaxnxDjHo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index 7c81a11d3f35..fa7a961ae617 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "par-lang"; - version = "0-unstable-2026-01-18"; + version = "0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "faiface"; repo = "par-lang"; - rev = "e10c1e4be92162fefdb515f321a2699c73726005"; - hash = "sha256-/Rz0D7zAxjJgm/61/M3iGZ6XwHEHGT6tTmispUjSbW4="; + rev = "d2de05c1dd7e6020727900e4e7c638ece3435fef"; + hash = "sha256-adR6M3EINAtGExkHmL7TiUlSHuFUk92+/F2u+SAK6oQ="; }; cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo="; diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index fad0e753dba9..2f11e053304b 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2025.10"; + version = "1.2026.1"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-fUFZrW8LD6M1WV6I2pYigr9rJaDlo0OLY8NZdB+w2yk="; + hash = "sha256-QzZ4N2bSZNPaBzt8pG1q3wM/E/XC3bTAOrmeRHHA2uA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index c765a02c6b9f..7528527e0ae2 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3-image"; - version = "3.2.6"; + version = "3.4.0"; outputs = [ "lib" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL_image"; tag = "release-${finalAttrs.version}"; - hash = "sha256-CnUCqFq9ZaM/WQcmaCpQdjtjR9l5ymzgeqEJx7ZW/s4="; + hash = "sha256-XRPHDcJ49sZa7y8TCWfS2gPOhpGyUnMMXVqvjV9f8E0="; }; strictDeps = true; @@ -46,21 +46,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ sdl3 libtiff + libpng libwebp libjxl ] ++ (lib.optional (!stdenv.hostPlatform.isDarwin) libavif) - ++ (lib.optionals (!enableSTB) [ - libpng - libjpeg - ]); + ++ (lib.optional (!enableSTB) libjpeg); cmakeFlags = [ # fail when a dependency could not be found (lib.cmakeBool "SDLIMAGE_STRICT" true) # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise. (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false) - # disable stbi + # enable stb conditionally (lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB) # enable imageio backend (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) diff --git a/pkgs/by-name/sh/shaarli/package.nix b/pkgs/by-name/sh/shaarli/package.nix index 33a73693af60..44a7c63d0983 100644 --- a/pkgs/by-name/sh/shaarli/package.nix +++ b/pkgs/by-name/sh/shaarli/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "shaarli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "sha256-+UEtbEYHQrLtClk6VemMhSNx0OPh/JDVlDIfeIzdmRI="; + sha256 = "sha256-e/iZ+SPMt6HphEbLY2hM7pnvXHxsCOYZoXyGpA5FMtg="; }; outputs = [ diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 79f295fa92ba..84cd09529bda 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.24.3"; + version = "2026.1"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-bLD7EOebKx3lbmJUBBUQEOWArNRjmdsKUwXV7taQHQA="; + hash = "sha256-1cNa25Gv2fbUYa7PRN8nHbiFtjSk03GbEhIIekMln2Q="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 216e75ef17cb..9657e11a93ca 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.8.10"; + version = "6.0.2"; src = fetchurl { - url = "https://web.archive.org/web/20251119083726/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - hash = "sha256-kIGpIxlX+qyiXeOWq9DjKLZL4fPZdgsro9P6SqrPQHo="; + url = "https://web.archive.org/web/20251220113913/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-tzgGUYaY6mIZXs3xxGC3b3AoJ/DcaESYr49zcDS7+Fo="; }; dontUnpack = true; diff --git a/pkgs/by-name/st/stegsolve/package.nix b/pkgs/by-name/st/stegsolve/package.nix index bd03768e4dea..0124cefd0dc6 100644 --- a/pkgs/by-name/st/stegsolve/package.nix +++ b/pkgs/by-name/st/stegsolve/package.nix @@ -1,24 +1,50 @@ { lib, - stdenvNoCC, - fetchurl, - jre, + stdenv, + fetchFromGitHub, + jdk, makeWrapper, copyDesktopItems, makeDesktopItem, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "stegsolve"; - version = "1.3"; + version = "1.3.1"; - src = fetchurl { - # No versioned binary is published :( - url = "https://web.archive.org/web/20230319054116if_/http://www.caesum.com/handbook/Stegsolve.jar"; - sha256 = "0np5zb28sg6yzkp1vic80pm8iiaamvjpbf5dxmi9kwvqcrh4jyq0"; + src = fetchFromGitHub { + owner = "fee1-dead"; + repo = "Stegsolve"; + rev = finalAttrs.version; + hash = "sha256-WiIZymeYnub0JilWGLXKhQKEoO1hce5DarbEjp+rTGQ=="; }; - dontUnpack = true; + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + buildInputs = [ jdk ]; + + buildPhase = '' + runHook preBuild + + mkdir -p out/ + javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/ + mv out $out/lib/stegsolve + + makeWrapper ${jdk}/bin/java $out/bin/stegsolve \ + --add-flags "-classpath $out/lib/stegsolve stegsolve.StegSolve" + + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -31,33 +57,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - installPhase = '' - runHook preInstall - - export JAR=$out/share/java/stegsolve/stegsolve.jar - install -D $src $JAR - makeWrapper ${jre}/bin/java $out/bin/stegsolve \ - --add-flags "-jar $JAR" - - runHook postInstall - ''; - meta = { description = "Steganographic image analyzer, solver and data extractor for challanges"; homepage = "https://www.wechall.net/forum/show/thread/527/Stegsolve_1.3/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = { - fullName = "Cronos License"; - url = "http://www.caesum.com/legal.php"; - free = false; - redistributable = true; - }; - maintainers = with lib.maintainers; [ emilytrau ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + emilytrau + fee1-dead + ]; platforms = lib.platforms.all; mainProgram = "stegsolve"; }; diff --git a/pkgs/by-name/su/sus-compiler/Cargo.lock b/pkgs/by-name/su/sus-compiler/Cargo.lock index ce89dd8e534d..fae47081f0bb 100644 --- a/pkgs/by-name/su/sus-compiler/Cargo.lock +++ b/pkgs/by-name/su/sus-compiler/Cargo.lock @@ -4,18 +4,18 @@ version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "aliasable" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "android_system_properties" @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -58,22 +58,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -100,38 +100,38 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.3" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "cc" -version = "1.2.34" +version = "1.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" +checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", @@ -147,9 +147,9 @@ checksum = "b67261db007b5f4cf8cba393c1a5c511a5cc072339ce16e12aeba1d7b9b77946" [[package]] name = "clap" -version = "4.5.46" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -157,9 +157,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.46" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -170,21 +170,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.45" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" [[package]] name = "colorchoice" @@ -194,11 +194,11 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "colored" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -223,24 +223,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -251,7 +251,34 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", +] + +[[package]] +name = "dtoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" + +[[package]] +name = "env_filter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +dependencies = [ + "log", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "log", ] [[package]] @@ -262,14 +289,20 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -281,32 +314,38 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.3+wasi-0.2.4", + "wasip2", ] [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heck" @@ -316,9 +355,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -350,9 +389,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -363,9 +402,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -376,11 +415,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -391,42 +429,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -457,9 +491,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", @@ -467,21 +501,21 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", @@ -489,37 +523,37 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.175" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libredox" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", "libc", ] [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lsp-server" @@ -549,9 +583,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "num-traits" @@ -570,9 +604,48 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ouroboros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.114", +] [[package]] name = "percent-encoding" @@ -582,9 +655,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -600,18 +673,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.40" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", + "version_check", + "yansi", +] + +[[package]] +name = "quote" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -644,29 +730,29 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.11.2" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -676,9 +762,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -687,9 +773,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "replace_with" @@ -699,15 +785,15 @@ checksum = "51743d3e274e2b18df81c4dc6caf8a5b8e15dbe799e0dca05c7617380094e884" [[package]] name = "rustix" -version = "1.0.8" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -717,42 +803,56 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] -name = "ryu" -version = "1.0.20" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "indexmap", "itoa", "memchr", - "ryu", "serde", + "serde_core", + "zmij", ] [[package]] @@ -763,7 +863,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] @@ -780,9 +880,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -804,7 +904,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "sus-proc-macro" -version = "0.3.0-devel" +version = "0.3.7" dependencies = [ "quote", "regex", @@ -815,25 +915,33 @@ dependencies = [ [[package]] name = "sus_compiler" -version = "0.3.0-devel" +version = "0.3.7" dependencies = [ "ariadne", "chrono", "circular-buffer", "clap", "colored", - "dirs-next", + "crossbeam-channel", + "dirs", + "dtoa", + "env_logger", "ibig", + "log", "lsp-server", "lsp-types", + "ordered-float", + "ouroboros", "rand", "replace_with", + "same-file", "serde", "serde_json", "sus-proc-macro", "tree-sitter", "tree-sitter-sus", "typed-arena", + "unescape", ] [[package]] @@ -849,9 +957,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.106" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -866,7 +974,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] @@ -881,29 +989,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -911,9 +1019,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.25.8" +version = "0.25.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7b8994f367f16e6fa14b5aebbcb350de5d7cbea82dc5b00ae997dd71680dd2" +checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87" dependencies = [ "cc", "regex", @@ -925,13 +1033,13 @@ dependencies = [ [[package]] name = "tree-sitter-language" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8" +checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce" [[package]] name = "tree-sitter-sus" -version = "0.3.0-devel" +version = "0.3.7" dependencies = [ "cc", "tree-sitter", @@ -944,10 +1052,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] -name = "unicode-ident" -version = "1.0.18" +name = "unescape" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-width" @@ -957,14 +1071,15 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -979,6 +1094,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -986,45 +1107,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.3+wasi-0.2.4" +name = "wasip2" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.106", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1032,53 +1140,40 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.106", - "wasm-bindgen-backend", + "syn 2.0.114", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "winapi-util" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-sys 0.61.2", ] -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -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-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -1089,208 +1184,144 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] name = "windows-link" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets", ] [[package]] -name = "windows-targets" -version = "0.52.6" +name = "windows-sys" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ "windows-link", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "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" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "yansi" @@ -1300,11 +1331,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -1312,34 +1342,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] [[package]] @@ -1359,15 +1389,15 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", "synstructure", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -1376,9 +1406,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -1387,11 +1417,17 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.114", ] + +[[package]] +name = "zmij" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" diff --git a/pkgs/by-name/su/sus-compiler/build.rs.patch b/pkgs/by-name/su/sus-compiler/build.rs.patch index a8a3b3bf6ed1..0cf2a100f256 100644 --- a/pkgs/by-name/su/sus-compiler/build.rs.patch +++ b/pkgs/by-name/su/sus-compiler/build.rs.patch @@ -1,24 +1,22 @@ -diff --git i/build.rs w/build.rs -index 2174a43..cf93c2f 100644 ---- i/build.rs -+++ w/build.rs -@@ -14,17 +14,8 @@ fn main() { - // Print the path to make it available during the build - println!("cargo:rustc-env=SUS_HOME={}", home_dir.to_str().unwrap()); - -- // note: add error checking yourself. -- let output = std::process::Command::new("git") -- .args(["rev-parse", "HEAD"]) -- .output() -- .unwrap(); -- let git_hash = String::from_utf8(output.stdout).unwrap(); -- println!("cargo:rustc-env=GIT_HASH={}", git_hash); -- println!( -- "cargo:rustc-env=BUILD_DATE={}", -- chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, false) -- ); -+ println!("cargo:rustc-env=GIT_HASH=@GIT_HASH@"); -+ println!("cargo:rustc-env=BUILD_DATE=@GIT_DATE@"); - } - - fn get_sus_dir() -> PathBuf { +diff --git a/build.rs b/build.rs +index d7c26bb..ffaed27 100644 +--- a/build.rs ++++ b/build.rs +@@ -22,16 +22,8 @@ fn main() -> Result<(), String> { + } else { + " without LSP Support" + }; +- let git_hash = std::process::Command::new("git") +- .args(["rev-parse", "HEAD"]) +- .output() +- .unwrap(); +- let git_hash = String::from_utf8(git_hash.stdout).unwrap(); +- let git_hash = git_hash.trim(); +- let build_date = chrono::Local::now().format("%Y-%m-%d_%H:%M:%S"); +- + println!( +- "cargo:rustc-env=EXTRA_VERSION_STRING= ({git_hash}) built at {build_date}{build_features}" ++ "cargo:rustc-env=EXTRA_VERSION_STRING= (@GIT_HASH@) committed at @GIT_DATE@{build_features}" + ); + } else { + println!("cargo:rustc-env=EXTRA_VERSION_STRING="); diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index cd06a419ba49..a837a462b05b 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -9,17 +9,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sus-compiler"; - version = "0.3.0-unstable-2025-08-28"; + version = "0.3.7"; src = fetchFromGitHub { owner = "pc2"; repo = "sus-compiler"; - rev = "bc46d911a71d0248a88586c10057206ffadc82ca"; - hash = "sha256-Wnj303B4G09qGOecZfFsicjNcfRkISfo9JDYJeFubVM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-O4aBVN7jbPm7iqMpxCRYWJ+89zcMCZTKyhRLBcQDKa8="; fetchSubmodules = true; leaveDotGit = true; # Manual patch phase with replacement of Git details just before they're deleted. + # Also ensures reproducibility by removing build time. postFetch = '' cp ${./build.rs.patch} build.rs.patch PATCH="$(realpath build.rs.patch)" @@ -42,7 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoLock.lockFile = ./Cargo.lock; preBuild = '' - export HOME="$TMPDIR"; + export INSTALL_SUS_HOME="$out/share/sus-compiler"; + mkdir -p "$INSTALL_SUS_HOME" ''; postPatch = '' diff --git a/pkgs/by-name/up/upower/installed-tests-path.patch b/pkgs/by-name/up/upower/installed-tests-path.patch index 367f3eab096b..d787b559a39d 100644 --- a/pkgs/by-name/up/upower/installed-tests-path.patch +++ b/pkgs/by-name/up/upower/installed-tests-path.patch @@ -1,10 +1,10 @@ diff --git a/meson_options.txt b/meson_options.txt -index eec3659..f064a1b 100644 +index 7220d2f..92fa778 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,6 +6,10 @@ option('gtk-doc', type : 'boolean', - value : 'true', + value : true, description : 'Build developer documentation') +option('installed_test_prefix', + type: 'string', @@ -14,10 +14,10 @@ index eec3659..f064a1b 100644 type : 'feature', value : 'auto', diff --git a/src/meson.build b/src/meson.build -index a2352ac..c1f25ac 100644 +index bf36c2d..2419ac2 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -85,6 +85,7 @@ install_subdir('does-not-exist', install_dir: historydir, strip_directory : true +@@ -90,6 +90,7 @@ install_emptydir(historydir) cdata = configuration_data() cdata.set('libexecdir', get_option('prefix') / get_option('libexecdir')) @@ -25,26 +25,26 @@ index a2352ac..c1f25ac 100644 cdata.set('historydir', historydir) configure_file( -@@ -147,16 +148,16 @@ if os_backend == 'linux' and gobject_introspection.found() - 'linux/integration-test.py', - 'linux/output_checker.py', - ], -- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' -+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' - ) - install_subdir('linux/tests/', -- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' -+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' - ) +@@ -154,16 +155,16 @@ if os_backend == 'linux' and gobject_introspection.found() + 'linux/integration-test.py', + 'linux/output_checker.py', + ], +- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' ++ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' + ) + install_subdir('linux/tests/', +- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' ++ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' + ) - configure_file( - input: 'upower-integration.test.in', - output: 'upower-integration.test', -- install_dir: get_option('datadir') / 'installed-tests' / 'upower', -+ install_dir: get_option('installed_test_prefix') / 'share' / 'installed-tests' / 'upower', - configuration: cdata - ) - endif + configure_file( + input: 'upower-integration.test.in', + output: 'upower-integration.test', +- install_dir: get_option('datadir') / 'installed-tests' / 'upower', ++ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower', + configuration: cdata + ) + endif diff --git a/src/upower-integration.test.in b/src/upower-integration.test.in index 151ded0..b0a9bec 100644 --- a/src/upower-integration.test.in diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix index cd8b8c27f487..56fcb2d9d919 100644 --- a/pkgs/by-name/up/upower/package.nix +++ b/pkgs/by-name/up/upower/package.nix @@ -38,7 +38,7 @@ assert withDocs -> withIntrospection; stdenv.mkDerivation (finalAttrs: { pname = "upower"; - version = "1.90.10"; + version = "1.91.0"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upower"; repo = "upower"; rev = "v${finalAttrs.version}"; - hash = "sha256-08lAt91RJ/sFIGlq1gfn4wUiwNxWyTO+pX41HKzQTG8="; + hash = "sha256-naKklfBtwBorfSLPLc/XYC4M22G6X5So4Q3SXZtT4pI="; }; patches = diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index c6fe08a53e84..985240c16377 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "2.17.0"; + version = "2.17.1"; in buildGoLatestModule { pname = "wakapi"; @@ -16,10 +16,10 @@ buildGoLatestModule { owner = "muety"; repo = "wakapi"; tag = version; - hash = "sha256-aQh1Jn718sk/Wvsjk9xFJ5NBSmsF6OOYtj22g6kwY8k="; + hash = "sha256-/7jYfLs9IcAWYVWISdDeXWV+PfHGFjkxcFkpqH2lxS8="; }; - vendorHash = "sha256-wlpTC050EYEjA5fteaGOGVKonMNOr7Ym2uoGUj0fw/M="; + vendorHash = "sha256-AA9gIIUsoJG4RnDZ1fAJu+iqeXXbRbprBVxuVvR1tzo="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index 6df5bd7519a3..33d263ee91ff 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wesnoth${suffix}"; - version = if enableDevel then "1.19.19" else "1.18.6"; + version = if enableDevel then "1.19.20" else "1.18.6"; src = fetchFromGitHub { owner = "wesnoth"; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { tag = finalAttrs.version; hash = if enableDevel then - "sha256-9MExXXRnkjEWzOW7TPtNmwExoW7s0/u8w34n7DIS0YU=" + "sha256-G0MsCXZRwryGjl6h9KVtMBsQiljYVInPz6wxSQ0jSyw=" else "sha256-y2ceN7rX8j+pNlaajw32ZxwFrUxqAuILADZvum03NhU="; }; diff --git a/pkgs/by-name/xc/xcursor-viewer/package.nix b/pkgs/by-name/xc/xcursor-viewer/package.nix index 5f3c20580090..0d4236da4139 100644 --- a/pkgs/by-name/xc/xcursor-viewer/package.nix +++ b/pkgs/by-name/xc/xcursor-viewer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "xcursor-viewer"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-01-23"; src = fetchFromGitHub { owner = "drizt"; repo = "xcursor-viewer"; - rev = "216ed3b6b4694f75fc424862874dc5e2b66fb685"; - hash = "sha256-faQuxHrUAqqSODDKZrRlMnWRj0NeM8hSHSbec7KSo50="; + rev = "c7aad6c662eab1a0907489d44afbc84ea3aa8de6"; + hash = "sha256-iHnWRcM6UYuhNykH4uiXFmVKnFUiyrLNKtjaAh6ilnw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index dc33dd6669a9..bf3c3f60a7b1 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2026.01.16.post1"; + version = "2026.01.24.post1"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-G48veVi4aeDngpJeYiY5ri0Vv/tg2GzVIzrtoqlGjwc="; + hash = "sha256-MxnJVglteXALiEeNisZiK3pXoD/eyj1irenUKPywEnc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index ef7ce9b8b9f8..261309e70c68 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -13,25 +13,25 @@ hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "astropy-healpix"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchPypi { - inherit version; - pname = lib.replaceStrings [ "-" ] [ "_" ] pname; - hash = "sha256-A2cd8So27Ds1fCRNUVS2eGNi/12AdwZ1x7JIFRAQZuQ="; + inherit (finalAttrs) version; + pname = "astropy_healpix"; + hash = "sha256-9SDYOr6CFdPo4aN7K9kRce42pvVfEQ1aLbhj112Bs7c="; }; - nativeBuildInputs = [ + build-system = [ extension-helpers numpy setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ numpy astropy ]; @@ -52,7 +52,8 @@ buildPythonPackage rec { meta = { description = "BSD-licensed HEALPix for Astropy"; homepage = "https://github.com/astropy/astropy-healpix"; + changelog = "https://github.com/astropy/astropy-healpix/blob/v${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.smaret ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 45bd445be5c5..4ead484e8b06 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.9.0"; + version = "0.10.3"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; tag = "v${version}"; - hash = "sha256-I/bMpqTaAHs0XnYOYjFRgXv3qB06LItkaSxtRjk55js="; + hash = "sha256-uTlz41eIcEqMvD9d9jvn7g9sZs4uEKUdsmZ0fwWkIuY="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 48a0a4e8cf2b..00943ac47256 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202601231"; + version = "0.1.202601241"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-85ogu9BYQqacBHR44BT7pQuv9DpUxk1Cl8/VBDF/lqg="; + hash = "sha256-LItzSttudJs1VmcXabxD38omsuK8+RsFMDYCPmm/+Ok="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 061e669dafca..c466b2a2ee58 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchPypi { pname = "insteon_frontend_home_assistant"; inherit version; - hash = "sha256-oBTk7gblJA6/w0wSx+efdEmY5ioJiRMUfDqjyg0LkFg="; + hash = "sha256-r6xXEZFAGgXByl+urpXfzhuCedBPjqkwT8Q0sEHQA2w="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/modelscope/default.nix b/pkgs/development/python-modules/modelscope/default.nix index ff1c4506b532..4b16aa46e833 100644 --- a/pkgs/development/python-modules/modelscope/default.nix +++ b/pkgs/development/python-modules/modelscope/default.nix @@ -9,7 +9,7 @@ }: let - version = "1.33.0"; + version = "1.34.0"; in buildPythonPackage { pname = "modelscope"; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "modelscope"; repo = "modelscope"; tag = "v${version}"; - hash = "sha256-CEaeO6oD1enGKT87anc3qSynDaN8pTC4utNoMBTvL84="; + hash = "sha256-Uq8qmU8ZmNRegaWHn1hlDDpRjWjgfecBvJklmhW36eM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix index 92189df1ff8d..9684ce32e156 100644 --- a/pkgs/development/python-modules/music-assistant-client/default.nix +++ b/pkgs/development/python-modules/music-assistant-client/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "music-assistant-client"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "client"; tag = version; - hash = "sha256-7u7P3uYFxx1UFzPIOgo0fCEEJrEEdBbBE7INhinkgLQ="; + hash = "sha256-f5+25MWuovG/g3PscWt0jls/5Y/Qdt2kq9Ai7/9P4aI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index cb50b72e6a94..2f9ebf8addda 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "music-assistant-models"; # Must be compatible with music-assistant-client package # nixpkgs-update: no auto update - version = "1.1.70"; + version = "1.1.89"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; tag = version; - hash = "sha256-yJ0MaXbzhvbqdMA1M2l7QC+0ExAHuTU1N4XIkJOj6pg="; + hash = "sha256-/eNCgAB5G8g1r2fcW27lySEqg+q/1bJvwwyntigGWjo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 117ac904cf18..e8f455f7650c 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "opower"; - version = "0.16.4"; + version = "0.16.5"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${finalAttrs.version}"; - hash = "sha256-r1evfPKvuMXlOvpwqqOSyC80TpZWphYhDVQCi9IiI+8="; + hash = "sha256-MeHM6ro6SNz9w4PTCJhc3zZAIkXKujthEJaq9A5zbI8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 43584ef7e16f..2b6aec691cde 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "4.14.1"; + version = "4.14.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-xyCjzcSasLGm2DMMViI1wpzcLd0mmaBvIyI1HrtW+Gg="; + hash = "sha256-yWiUiR0us+ISa9cdjfN4IzlbiZEzUlndNFy/BpfHYqk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index db72b957efb4..a2e63e597ffa 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -1,31 +1,31 @@ { lib, - fetchFromGitHub, buildPythonPackage, - isPy3k, - zope-interface, - twisted, + fetchFromGitHub, greenlet, + setuptools, + twisted, + zope-interface, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python3-eventlib"; - version = "0.3.0"; - format = "setuptools"; - - disabled = !isPy3k; + version = "0.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "AGProjects"; repo = "python3-eventlib"; - rev = version; - hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ="; + tag = finalAttrs.version; + hash = "sha256-jN9nn+rI4TJLrEiEIoVxQ3XnXWSws1FenGUfG3doc94="; }; - propagatedBuildInputs = [ - zope-interface - twisted + build-system = [ setuptools ]; + + dependencies = [ greenlet + twisted + zope-interface ]; pythonImportsCheck = [ "eventlib" ]; @@ -33,13 +33,13 @@ buildPythonPackage rec { meta = { description = "Networking library written in Python"; homepage = "https://github.com/AGProjects/python3-eventlib"; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ chanley ]; longDescription = '' Eventlib is a networking library written in Python. It achieves high scalability by using non-blocking I/O while at the same time retaining high programmer usability by using coroutines to make the non-blocking io operations appear blocking at the source code level. ''; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ chanley ]; }; -} +}) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 9f1af2a96d3b..f413c8958260 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.11.0"; + version = "4.11.1"; pyproject = true; src = fetchFromGitHub { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-jp+ac2tqNrL9uxdfzyrm5F2+0zvxfDvMEYCq0yQSZqE="; + hash = "sha256-N9loKQ+xcUtug98K2nsCs5kXUnLLtxCqNH8L8wStb74="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index 1f50f904b9ef..4e509ec84296 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.4.1"; + version = "5.4.5"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 490cb5b6116c..87500e110e07 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-b4xxh2Pva5+Qwv5DyifJohEY73wOO/eFc1dJeQSN3QY="; + hash = "sha256-HGASKQHQWXPzMcTHylRG94ZdL2gwLyHyfoTywllMTdA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-2VXS6SQjYx61D8b42TjS5OJxcg4+e+T6dEsZfRA/gRk="; + hash = "sha256-i5hbXk+CFrsnIhT3DjnWbP2GaIqJxll8fbxCFz/21M8="; }; build-system = [ diff --git a/pkgs/development/python-modules/yourdfpy/default.nix b/pkgs/development/python-modules/yourdfpy/default.nix index fa770f6a243e..625b2dbee0bb 100644 --- a/pkgs/development/python-modules/yourdfpy/default.nix +++ b/pkgs/development/python-modules/yourdfpy/default.nix @@ -19,16 +19,16 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yourdfpy"; - version = "0.0.59"; + version = "0.0.60"; pyproject = true; src = fetchFromGitHub { owner = "clemense"; repo = "yourdfpy"; - tag = "v${version}"; - hash = "sha256-9GSDD/RjLGlmuncyH97TqKZrPU8WpmbSKGT7sDKy9FA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tXFrwtxjLvHNxT/MhrAiV2CGcbKj1JRi/Yo8Qt6UBfk="; }; build-system = [ @@ -55,9 +55,9 @@ buildPythonPackage rec { meta = { description = "Python parser for URDFs"; homepage = "https://github.com/clemense/yourdfpy/"; - changelog = "https://github.com/clemense/yourdfpy/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/clemense/yourdfpy/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nim65s ]; mainProgram = "yourdfpy"; }; -} +}) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b35dccf0ef82..dfa6dd19b2d0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2026.1.2"; + version = "2026.1.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 5cdbfaa03631..575c12ab8d8d 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.4.4"; + version = "4.4.5"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-8a5P+eoa3iEER4b2SlsYi+feyPnc4n4RYzl6Lg+nqmQ="; + hash = "sha256-NO0ZRNSKE3fSSTpw9cwyD8jmKVV986bEKh27d4iiJpk="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix index 31ff24b090f3..416bea768d9f 100644 --- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix +++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix @@ -7,16 +7,16 @@ pydantic, }: -buildHomeAssistantComponent { +buildHomeAssistantComponent rec { owner = "NewsGuyTor"; domain = "fellow"; - version = "0-unstable-2026-01-11"; + version = "1.2.1"; src = fetchFromGitHub { owner = "NewsGuyTor"; repo = "FellowAiden-HomeAssistant"; - rev = "3a999d0e761fa1e791339753d3ccc9938adf27f6"; - hash = "sha256-2sR8LQsV+qXrmuhr2uKuzBhM6G9IySJVA/UjRr4crDQ="; + tag = "v${version}"; + hash = "sha256-cGyGobR0lMNReWCxK7RzeqsnYJZQNRPjYqirLHjeCFI="; }; passthru.updateScript = unstableGitUpdater { }; @@ -27,6 +27,7 @@ buildHomeAssistantComponent { ]; meta = { + changelog = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant/releases/tag/${src.tag}"; description = "Home Assistant integration for Fellow Aiden coffee brewer"; homepage = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant"; license = lib.licenses.gpl3Only; diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix index 58d1d6b962e9..2ba2941f7cc9 100644 --- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -19,13 +19,13 @@ buildHomeAssistantComponent rec { owner = "signalkraft"; domain = "mypyllant"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "signalkraft"; repo = "mypyllant-component"; tag = "v${version}"; - hash = "sha256-4IfLd+NEaWyxgdnAz7YGM/6i0usoqwgKlBJFzDOlJ4A="; + hash = "sha256-wkUz5pPO50yfWbZBa+Z+9WKIZKCJhJVn8/HlzZwSZVY="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index ff32f454dd45..1f9dd2efd282 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -17,13 +17,13 @@ buildHomeAssistantComponent rec { owner = "bramstroker"; domain = "powercalc"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-powercalc"; tag = "v${version}"; - hash = "sha256-NzWivgvDUv41fSA/6g4mYIuoUCobVUdf3bbfmKl0kWg="; + hash = "sha256-z66VHJ/ZzQKvx4l00XGKvTBt9o4T+hv64oCGZNDRUng="; }; dependencies = [ numpy ]; diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index e62f8cf5d07e..80cb2a78c9de 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "8.6.0"; + version = "8.6.1"; src = fetchFromGitHub { inherit owner; repo = domain; tag = version; - hash = "sha256-rzNznV2YfBUxgYdc+qZeDIBVeMfwPwvDyYVON980SCg="; + hash = "sha256-yQMTuNinRVHIsaS8Q7aqGozN1sTbkLGvXFhEw47jUkA="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index d4b236d96e60..02183f329bf2 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.4.1"; + version = "5.4.5"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-nlidbT5dILw4rin4uUDQ8OSqUijpQuoePk20UIl5Uvo="; + hash = "sha256-Ye++ialp9ryC6J+ZXrRqLkuLct6sbk3+NknZo4sx4hc="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 1bf1381bc89e..f22ee11a4fac 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-0B+rG2h2OMb363t0529/XjqZ9ORaT7XXk4qVyEAfNx8="; + hash = "sha256-S1rkrNf1rV9TDjcAfFxFj/IlHMngjp4qysx+8pN0TdI="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c41d1d010d3b..5b99da4241ab 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -293,7 +293,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2026.1.2"; + hassVersion = "2026.1.3"; in python.pkgs.buildPythonApplication rec { @@ -314,13 +314,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-+H+ujcJ7uYLNFfm05V7FBdogGGUSkC1b6PaWJ5Zu24k="; + hash = "sha256-zmS5OZaUFe45rbCil7sbVlhy0wwA+F9tBO10KvBM2PY="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-uWcSCmarOtfYIVYPz8wAgO8tx15MJcEP1Wv3h8YT0xI="; + hash = "sha256-gs5YyR1MofSMV8TDeBGp9keIREcszZGcLvtnHOYR7uc="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 226ab2f0217e..80f78b7ecdc6 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.307"; + version = "0.13.308"; pyproject = true; disabled = pythonOlder "3.13"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-E3kZEwyEmUxeRzwXQgI769mikyL1FkazmZXQFaknvlA="; + hash = "sha256-ErRtbRwlke4UMJuXgfvEz6rM5VY583a7Jn+sU0nLnNo="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 9f11580de57e..180bb49fdaf5 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2026.1.2"; + version = "2026.1.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-f1decOoOyavabUC2KnScB+bnuernkyKMnKwnilViuRQ="; + hash = "sha256-BfowhNb9A6zyCSsSJevjEal6PXkIwmnhm4a2tNt0Qg4="; }; build-system = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 335b1b78a00d..0f368af3c9b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -415,6 +415,7 @@ mapAliases { cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12 cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12 certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27 + cgit-pink = throw "cgit-pink has been removed, as it is unmaintained upstream"; # Added 2026-01-21 challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27 charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 charybdis = throw "charybdis was removed since its upstream repo was archived in 2021"; # Added 2026-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6dd6fff9b5..e1d1a5cc8623 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1154,8 +1154,6 @@ with pkgs; cgit = callPackage ../applications/version-management/cgit { }; - cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; - datalad = with python3Packages; toPythonApplication datalad; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;