diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 06c637723ef4..c31f9eacd01c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15295,6 +15295,12 @@ githubId = 1104419; name = "Lucas Hoffmann"; }; + luckshiba = { + email = "luckshiba@protonmail.com"; + github = "luckshiba"; + githubId = 43530291; + name = "LuckShiba"; + }; lucperkins = { email = "lucperkins@gmail.com"; github = "lucperkins"; diff --git a/nixos/lib/test-driver/src/test_driver/vlan.py b/nixos/lib/test-driver/src/test_driver/vlan.py index 03ecbe25e8a2..89ca33165b4d 100644 --- a/nixos/lib/test-driver/src/test_driver/vlan.py +++ b/nixos/lib/test-driver/src/test_driver/vlan.py @@ -1,12 +1,43 @@ +import datetime as dt +import fcntl import io import os -import pty +import select import subprocess +import typing from pathlib import Path from test_driver.logger import AbstractLogger +def readline_with_timeout( + readable: typing.IO[str], timeout: dt.timedelta +) -> typing.Generator[str]: + """ + Read a line from `readable` within the given `timeout`, otherwise raises `TimeoutError`. + + Note: while the generator is running, `readable` will be in nonblocking mode. + """ + fd = readable.fileno() + og_flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, og_flags | os.O_NONBLOCK) + + try: + while True: + ready, _, _ = select.select([readable], [], [], timeout.total_seconds()) + if len(ready) == 0: + raise TimeoutError() + + # Under the hood, `readline` may read more than one line from the file descriptor, + # so we cannot just return to the `select`, as it may block, despite there being more + # lines buffered. So, read all the lines before returning to the select. This only + # works if the file descriptor is in non-blocking mode! + while line := readable.readline(): + yield line + finally: + fcntl.fcntl(fd, fcntl.F_SETFL, og_flags) + + class VLan: """This class handles a VLAN that the run-vm scripts identify via its number handles. The network's lifetime equals the object's lifetime. @@ -33,33 +64,62 @@ class VLan: os.environ[f"QEMU_VDE_SOCKET_{self.nr}"] = str(self.socket_dir) self.logger.info("start vlan") - pty_master, pty_slave = pty.openpty() - # The --hub is required for the scenario determined by - # nixos/tests/networking.nix vlan-ping. - # VLAN Tagged traffic (802.1Q) seams to be blocked if a vde_switch is - # used without the hub mode (flood packets to all ports). self.process = subprocess.Popen( - ["vde_switch", "-s", self.socket_dir, "--dirmode", "0700", "--hub"], - stdin=pty_slave, + [ + "vde_switch", + "--sock", + self.socket_dir, + "--dirmode", + "0700", + # The --hub is required for the scenario determined by + # nixos/tests/networkd-and-scripted.nix vlan-ping. + # VLAN Tagged traffic (802.1Q) seems to be blocked if a vde_switch is + # used without the hub mode (flood packets to all ports). + "--hub", + ], + bufsize=1, # Line buffered. + stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - shell=False, + stderr=None, # Do not swallow stderr. + text=True, ) self.pid = self.process.pid - self.fd = os.fdopen(pty_master, "w") - self.fd.write("version\n") - # TODO: perl version checks if this can be read from - # an if not, dies. we could hang here forever. Fix it. + assert self.process.stdin is not None + self.process.stdin.write("showinfo\n") + + # showinfo's output looks like this: + # + # ``` + # vde$ showinfo + # 0000 DATA END WITH '.' + # VDE switch V.2.3.3 + # (C) Virtual Square Team (coord. R. Davoli) 2005,2006,2007 - GPLv2 + # + # pid 82406 MAC 00:ff:62:25:47:55 uptime 45 + # . + # 1000 Success + # ``` + # + # We read past all the output until we get to the `1000 Success`. + # This serves 2 purposes: + # 1. It's a nice sanity check that `vde_switch` is actually working. + # 2. By the time we're done, `vde_switch` will have created the + # `ctl` socket in `socket_dir`, so we don't have to wait for it to exist. assert self.process.stdout is not None - self.process.stdout.readline() - if not (self.socket_dir / "ctl").exists(): - self.logger.error("cannot start vde_switch") + for line in readline_with_timeout( + self.process.stdout, timeout=dt.timedelta(seconds=5) + ): + if "1000 Success" in line: + break + + assert (self.socket_dir / "ctl").exists(), "cannot start vde_switch" self.logger.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") def stop(self) -> None: self.logger.info(f"kill vlan (pid {self.pid})") - self.fd.close() + assert self.process.stdin is not None + self.process.stdin.close() self.process.terminate() diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c05bdb3b5149..e70f9d0675bb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./programs/direnv.nix ./programs/dmrconfig.nix ./programs/droidcam.nix + ./programs/dsearch.nix ./programs/dublin-traceroute.nix ./programs/ecryptfs.nix ./programs/environment.nix @@ -340,6 +341,7 @@ ./programs/vivid.nix ./programs/vscode.nix ./programs/wavemon.nix + ./programs/wayland/dms-shell.nix ./programs/wayland/dwl.nix ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix @@ -605,6 +607,7 @@ ./services/development/zammad.nix ./services/display-managers/cosmic-greeter.nix ./services/display-managers/default.nix + ./services/display-managers/dms-greeter.nix ./services/display-managers/gdm.nix ./services/display-managers/greetd.nix ./services/display-managers/lemurs.nix diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix new file mode 100644 index 000000000000..c6d7509c91dd --- /dev/null +++ b/nixos/modules/programs/dsearch.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + types + ; + + cfg = config.programs.dsearch; +in +{ + options.programs.dsearch = { + enable = mkEnableOption "dsearch, a fast filesystem search service with fuzzy matching"; + + package = mkPackageOption pkgs "dsearch" { }; + + systemd = { + enable = mkEnableOption "systemd user service for dsearch" // { + default = true; + }; + + target = mkOption { + type = types.str; + default = "default.target"; + description = '' + The systemd target that will automatically start the dsearch service. + + By default, dsearch starts with the user session (`default.target`). + You can change this to `graphical-session.target` if you only want + it to run in graphical sessions. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.packages = [ cfg.package ]; + + systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix new file mode 100644 index 000000000000..a49330fddcf5 --- /dev/null +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -0,0 +1,202 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + types + optional + optionals + ; + + cfg = config.programs.dms-shell; + + optionalPackages = + optionals cfg.enableSystemMonitoring [ pkgs.dgop ] + ++ optionals cfg.enableClipboard [ + pkgs.cliphist + pkgs.wl-clipboard + ] + ++ optionals cfg.enableVPN [ + pkgs.glib + pkgs.networkmanager + ] + ++ optional cfg.enableBrightnessControl pkgs.brightnessctl + ++ optional cfg.enableColorPicker pkgs.hyprpicker + ++ optional cfg.enableDynamicTheming pkgs.matugen + ++ optional cfg.enableAudioWavelength pkgs.cava + ++ optional cfg.enableCalendarEvents pkgs.khal + ++ optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia; +in +{ + options.programs.dms-shell = { + enable = mkEnableOption "DankMaterialShell, a complete desktop shell for Wayland compositors"; + + package = mkPackageOption pkgs "dms-shell" { }; + + systemd = { + target = mkOption { + type = types.str; + default = "graphical-session.target"; + description = '' + The systemd target that will automatically start the DankMaterialShell service. + + Common targets include: + - `graphical-session.target` for most desktop environments + - `wayland-session.target` for Wayland-specific sessions + ''; + }; + + restartIfChanged = mkOption { + type = types.bool; + default = true; + description = '' + Whether to restart the dms.service when the DankMaterialShell package or + configuration changes. This ensures the latest version is always running + after a system rebuild. + ''; + }; + }; + + enableSystemMonitoring = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for system monitoring widgets. + This includes process list viewers and system resource monitors. + + Requires: dgop + ''; + }; + + enableClipboard = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for clipboard management widgets. + This enables clipboard history and clipboard manager functionality. + + Requires: cliphist, wl-clipboard + ''; + }; + + enableVPN = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for VPN widgets. + This enables VPN status monitoring and management through NetworkManager. + + Requires: glib, networkmanager + ''; + }; + + enableBrightnessControl = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for brightness and backlight control. + This enables screen brightness adjustment widgets. + + Requires: brightnessctl + ''; + }; + + enableColorPicker = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for color picking functionality. + This enables on-screen color picker tools. + + Requires: hyprpicker + ''; + }; + + enableDynamicTheming = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for dynamic theming support. + This enables automatic theme generation based on wallpapers and other sources. + + Requires: matugen + ''; + }; + + enableAudioWavelength = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for audio wavelength visualization. + This enables audio spectrum and waveform visualizer widgets. + + Requires: cava + ''; + }; + + enableCalendarEvents = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for calendar events support. + This enables calendar widgets that display events and reminders via khal. + + Requires: khal + ''; + }; + + enableSystemSound = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install dependencies required for system sound support. + This enables audio playback for system notifications and events. + + Requires: qtmultimedia + ''; + }; + + quickshell = { + package = mkPackageOption pkgs "quickshell" { }; + }; + }; + + config = mkIf cfg.enable { + environment.etc."xdg/quickshell/dms".source = "${cfg.package}/share/quickshell/dms"; + + systemd.packages = [ cfg.package ]; + + systemd.user.services.dms = { + wantedBy = [ cfg.systemd.target ]; + restartTriggers = optional cfg.systemd.restartIfChanged "${cfg.package}/share/quickshell/dms"; + path = lib.mkForce [ ]; + }; + + environment.systemPackages = [ + cfg.package + cfg.quickshell.package + pkgs.ddcutil + pkgs.libsForQt5.qt5ct + pkgs.kdePackages.qt6ct + ] + ++ optionalPackages; + + fonts.packages = with pkgs; [ + fira-code + inter + material-symbols + ]; + + hardware.graphics.enable = lib.mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/modules/programs/wayland/niri.nix b/nixos/modules/programs/wayland/niri.nix index b571326acd9b..58b36fe42ab8 100644 --- a/nixos/modules/programs/wayland/niri.nix +++ b/nixos/modules/programs/wayland/niri.nix @@ -23,9 +23,10 @@ in { environment.systemPackages = [ cfg.package - ] + ]; + # Required for xdg-desktop-portal-gnome's FileChooser to work properly - ++ lib.optionals cfg.useNautilus [ + services.dbus.packages = lib.mkIf cfg.useNautilus [ pkgs.nautilus ]; diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix new file mode 100644 index 000000000000..1355291516fa --- /dev/null +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -0,0 +1,261 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + mkEnableOption + mkOption + mkIf + mkDefault + mkPackageOption + literalExpression + getExe + makeBinPath + optionalString + concatMapStringsSep + ; + + cfg = config.services.displayManager.dms-greeter; + cfgAutoLogin = config.services.displayManager.autoLogin; + + greeterScript = pkgs.writeShellScriptBin "dms-greeter-start" '' + export PATH=$PATH:${ + makeBinPath [ + cfg.quickshell.package + config.programs.${cfg.compositor.name}.package + ] + } + exec ${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ + --command ${cfg.compositor.name} \ + -p ${cfg.package}/share/quickshell/dms \ + --cache-dir /var/lib/dms-greeter \ + ${ + optionalString ( + cfg.compositor.customConfig != "" + ) "-C ${pkgs.writeText "dms-greeter-compositor-config" cfg.compositor.customConfig}" + } \ + ${optionalString cfg.logs.save ">> ${cfg.logs.path} 2>&1"} + ''; + + configFilesFromHome = + if cfg.configHome != null then + [ + "${cfg.configHome}/.config/DankMaterialShell/settings.json" + "${cfg.configHome}/.local/state/DankMaterialShell/session.json" + "${cfg.configHome}/.cache/DankMaterialShell/dms-colors.json" + ] + else + [ ]; +in +{ + options.services.displayManager.dms-greeter = { + enable = mkEnableOption "DankMaterialShell greeter"; + + package = mkPackageOption pkgs "dms-shell" { }; + + compositor = { + name = mkOption { + type = types.enum [ + "niri" + "hyprland" + "sway" + ]; + example = "niri"; + description = '' + The Wayland compositor to run the greeter in. + + The specified compositor must be enabled via its corresponding + `programs..enable` option. + + Supported compositors: + - niri: A scrollable-tiling Wayland compositor + - hyprland: A dynamic tiling Wayland compositor + - sway: An i3-compatible Wayland compositor + ''; + }; + + customConfig = mkOption { + type = types.lines; + default = ""; + example = '' + # Niri example + input { + keyboard { + xkb { + layout "us" + } + } + } + ''; + description = '' + Custom compositor configuration to use for the greeter session. + + This configuration is written to a file and passed to the compositor + when launching the greeter. The format and available options depend + on the selected compositor. + + Leave empty to use the system's default compositor configuration. + ''; + }; + }; + + configFiles = mkOption { + type = types.listOf types.path; + default = [ ]; + example = literalExpression '' + [ + "/home/user/.config/DankMaterialShell/settings.json" + "/home/user/.local/state/DankMaterialShell/session.json" + ] + ''; + description = '' + List of DankMaterialShell configuration files to copy into the greeter + data directory at `/var/lib/dms-greeter`. + + This is useful for preserving user preferences like wallpapers, themes, + and other settings in the greeter screen. + + ::: {.tip} + Use {option}`configHome` instead if your configuration files are in + standard XDG locations. + ::: + ''; + }; + + configHome = mkOption { + type = types.nullOr types.str; + default = null; + example = "/home/alice"; + description = '' + Path to a user's home directory from which to copy DankMaterialShell + configuration files. + + When set, the following files will be automatically copied to the greeter: + - `~/.config/DankMaterialShell/settings.json` + - `~/.local/state/DankMaterialShell/session.json` + - `~/.cache/DankMaterialShell/dms-colors.json` + + If your configuration files are in non-standard locations, use the + {option}`configFiles` option instead. + ''; + }; + + quickshell = { + package = mkPackageOption pkgs "quickshell" { }; + }; + + logs = { + save = mkEnableOption "saving logs from the DMS greeter to a file"; + + path = mkOption { + type = types.path; + default = "/tmp/dms-greeter.log"; + example = "/var/log/dms-greeter.log"; + description = '' + File path where DMS greeter logs will be saved. + + This is useful for debugging greeter issues. Logs will include + output from both the greeter and the compositor. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = config.programs.${cfg.compositor.name}.enable or false; + message = '' + DankMaterialShell greeter: The compositor "${cfg.compositor.name}" is not enabled. + + Please enable the compositor via: + programs.${cfg.compositor.name}.enable = true; + ''; + } + ]; + + services.greetd = { + enable = true; + settings = { + default_session = { + user = "dms-greeter"; + command = getExe greeterScript; + }; + initial_session = mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) { + inherit (cfgAutoLogin) user command; + }; + }; + }; + + environment.systemPackages = [ cfg.package ]; + + fonts.packages = with pkgs; [ + fira-code + inter + material-symbols + ]; + + systemd.tmpfiles.settings."10-dms-greeter"."/var/lib/dms-greeter".d = { + user = "dms-greeter"; + group = "dms-greeter"; + mode = "0750"; + }; + + systemd.services.greetd.preStart = + let + allConfigFiles = cfg.configFiles ++ configFilesFromHome; + in + '' + set -euo pipefail + + cd /var/lib/dms-greeter || exit 1 + + ${concatMapStringsSep "\n" (f: '' + if [[ -f "${f}" ]]; then + cp "${f}" . || true + fi + '') allConfigFiles} + + # Handle session.json wallpaper path + if [[ -f session.json ]]; then + if wallpaper=$(${getExe pkgs.jq} -r '.wallpaperPath' session.json 2>/dev/null); then + if [[ -f "$wallpaper" ]]; then + cp "$wallpaper" wallpaper.jpg || true + mv session.json session.orig.json + ${getExe pkgs.jq} '.wallpaperPath = "/var/lib/dms-greeter/wallpaper.jpg"' \ + session.orig.json > session.json || true + fi + fi + fi + + # Rename colors file if it exists + [[ -f dms-colors.json ]] && mv dms-colors.json colors.json || true + + # Fix ownership of all files + chown -R "dms-greeter:dms-greeter" . || true + ''; + + users.groups.dms-greeter = { }; + users.users.dms-greeter = { + description = "DankMaterialShell greeter user"; + isSystemUser = true; + home = "/var/lib/dms-greeter"; + homeMode = "0750"; + createHome = true; + group = "dms-greeter"; + extraGroups = [ "video" ]; + }; + + security.pam.services.dms-greeter = { }; + + hardware.graphics.enable = mkDefault true; + services.libinput.enable = mkDefault true; + }; + + meta.maintainers = with lib.maintainers; [ luckshiba ]; +} diff --git a/nixos/tests/geoserver.nix b/nixos/tests/geoserver.nix index 3e9416961e90..b29d6d60cd10 100644 --- a/nixos/tests/geoserver.nix +++ b/nixos/tests/geoserver.nix @@ -76,9 +76,11 @@ in _, stdout = machine.execute(f"cat {log_file}") print(stdout.replace("\\n", "\n")) assert "GDAL Native Library loaded" in stdout, "gdal" - assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf" assert "Unable to load library 'netcdf'" not in stdout, "netcdf" + # libjpeg-turbo is disabled as of 2.28.1. + # assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" + ''; } diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix index 40e0f0be620e..abbbc6361e88 100644 --- a/nixos/tests/slipshow.nix +++ b/nixos/tests/slipshow.nix @@ -25,11 +25,9 @@ start_all() # it may take around a minute to compile the file and serve it - machine.succeed("slipshow serve /etc/slipshow/bbslides.md &>/dev/null &") + machine.succeed("slipshow serve -p 6000 /etc/slipshow/bbslides.md &>/dev/null &") - # slipshow serves defaultly on :8080 and unfortunately cannot - # be changed currently - machine.wait_for_open_port(8080) - machine.succeed("curl -i 0.0.0.0:8080") + machine.wait_for_open_port(6000) + machine.succeed("curl -i 0.0.0.0:6000") ''; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index e6868cc03407..8a63c3dbb084 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -81,14 +81,14 @@ let ]; in mkDerivation rec { - version = "3.44.4"; + version = "3.44.5"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-G9atxBBANlUDGl39bkwTo6L04/+0o5A5ake4KvIY70E="; + hash = "sha256-VrI3pk7Qi0A9D7ONl18YeX9cFS6NfSU2Hvrzx8JIoXo="; }; passthru = { diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 8ddbb3e0510a..2ada60594b5e 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.10.0"; + version = "0.10.1"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY="; + hash = "sha256-yiqtnsXxvC7vk22ZQ5OFt5uX40FCRGWpfZrax9GItAg="; }; postPatch = '' diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index 3e3f6c9adfb8..69d47d589998 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -29,11 +29,6 @@ let ''; license = lib.licenses.cc-by-30; homepage = "https://durian.blender.org/"; - - # Reported in https://github.com/NixOS/nixpkgs/pull/458193#issuecomment-3575753211 that these - # tests are causing Hydra to spin for hours. They all pass locally, and we don't care too much - # about running them on Hydra. - hydraPlatforms = [ ]; }; # Via https://webtorrent.io/free-torrents @@ -64,10 +59,20 @@ let popd ''; - # Fixed output derivation hash is identical for all derivations: the empty - # directory. fetchtorrentWithHash = - args: fetchtorrent ({ hash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; } // args); + args: + fetchtorrent ( + { + # Fixed output derivation hash is identical for all derivations: the empty directory. + hash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # Reported in https://github.com/NixOS/nixpkgs/pull/458193#issuecomment-3575753211 + # that these tests are causing Hydra to spin for hours on macOS. + # They all pass locally, and we don't care too much about running them on Hydra. + meta.hydraPlatforms = [ ]; + } + // args + ); in # Seems almost but not quite worth using lib.mapCartesianProduct... builtins.mapAttrs (n: v: testers.invalidateFetcherByDrvHash fetchtorrentWithHash v) { diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index b407ba2b7c57..9563f50ebcdd 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.82"; + version = "0.2.83"; in buildGoModule { pname = "act"; @@ -18,7 +18,7 @@ buildGoModule { owner = "nektos"; repo = "act"; tag = "v${version}"; - hash = "sha256-NIslUM0kvgS4szejCngb1zJ+cjlJ970XkeegDjyOYIs="; + hash = "sha256-3z6+WcfxHyPTgsOHs2NPd4x7buMBr3jCA2zqd6kBb6k="; }; vendorHash = "sha256-EQgW+I0HjJhKioN0Moke9i+OggyJOSOHyatYnED4NX4="; diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix index 9ee50a47a602..08469ca6f0a4 100644 --- a/pkgs/by-name/ar/artix-games-launcher/package.nix +++ b/pkgs/by-name/ar/artix-games-launcher/package.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { description = "Launcher for games by Artix Entertainment"; homepage = "https://www.artix.com/downloads/artixlauncher"; license = lib.licenses.unfree; - mainProgram = "artix-game-launcher"; + mainProgram = "artix-games-launcher"; maintainers = with lib.maintainers; [ jtliang24 ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index 1d4e0db9b8d0..84d4445c5f64 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ps.pillow ps.setuptools ps.psycopg2 + ps.webrtcvad ])) ] ++ runtimeProgDeps; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 4774de09fa63..e9707cb6561a 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.84.141"; + version = "1.85.111"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-hB+sy+jeI+c2EE6nty2awmKmNRCldQ98JtjNh9eXVxQ="; + hash = "sha256-qBxlZ4xgjRb2zWrbwd+HKJXWoJxk4OICQtvutoNME00="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Pp/jZmu6vTMJctVYGUeRZYhzWc2LS9jC4Niz9cPvkoE="; + hash = "sha256-+Lz9Bv2Llc2twk0QzHmozxhsJzdlTKAakY/j2NaF7a0="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-Y/r8rFog2lyqBSBgqI1dIOsHZHTF2W8YckCJPFJ5mzc="; + hash = "sha256-39/nuKXnsslcVhy4i/YN4XEor5csMk2Ej1hsygChjXo="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-GDr1U40jT5nJscmqotluA/Wln/v9UnPVJoy2ViWAy+A="; + hash = "sha256-us6FnZZ980SnGW+1fNSajRgAUxhBQA2dcM+iKb8TWaE="; }; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 4a8a6839e94c..64543f14f4fa 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.53.0"; + version = "1.54.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-iiKfS1r62G9cBKa/KEW/SPwhZ/Pebw0mUvHy40DFCqA="; + hash = "sha256-c7q6VTXoToUSx8gsOLcsLUvriZYYyYwGAjO8VTF3JFk="; }; - cargoHash = "sha256-Hp+Fx1b0bQptNJKQeThZ3W7lSGdo6YsVAHAu69/YTX4="; + cargoHash = "sha256-jErnCexuu8PPUugsI+fRqWpqtpspDiVjnfn3it5jeK4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cachix/package.nix b/pkgs/by-name/ca/cachix/package.nix new file mode 100644 index 000000000000..b0f3203c5956 --- /dev/null +++ b/pkgs/by-name/ca/cachix/package.nix @@ -0,0 +1,13 @@ +{ + lib, + haskell, + haskellPackages, +}: +let + inherit (haskell.lib) compose; +in +lib.pipe haskellPackages.cachix [ + compose.justStaticExecutables + (compose.overrideCabal { mainProgram = "cachix"; }) + lib.getBin +] diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix index 400c97e58db7..1f6b7ebe1d97 100644 --- a/pkgs/by-name/ca/cargo-insta/package.nix +++ b/pkgs/by-name/ca/cargo-insta/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.44.2"; + version = "1.44.3"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; tag = version; - hash = "sha256-Wi68dVKPsCCzt726N21pga73hW1WDDUtSv+o/sJMWpk="; + hash = "sha256-xXp5XqE6teDK519IKM1FAZAAXcQHXlQF2kdRIhS7mYA="; }; - cargoHash = "sha256-ks/icINVa7oVfK5yO8H0sUCRFWWzTwURHVALUVZ8uw0="; + cargoHash = "sha256-XdeQ4BQb0/X3R4ST3ZrOo/XvSCzhRR1eqcp3uRWgX9g="; checkFlags = [ # Depends on `rustfmt` and does not matter for packaging. diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/by-name/cm/cmake-format/package.nix similarity index 66% rename from pkgs/development/tools/cmake-format/default.nix rename to pkgs/by-name/cm/cmake-format/package.nix index 37d7b3219701..3070e55bc021 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/by-name/cm/cmake-format/package.nix @@ -1,16 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - autopep8, - flake8, - jinja2, - pylint, - pyyaml, - six, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cmake-format"; version = "0.6.13"; # The source distribution does not build because of missing files. @@ -18,12 +12,11 @@ buildPythonApplication rec { src = fetchPypi { inherit version format; - python = "py3"; pname = "cmakelang"; sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ autopep8 flake8 jinja2 @@ -34,12 +27,11 @@ buildPythonApplication rec { doCheck = false; - meta = with lib; { + meta = { description = "Source code formatter for cmake listfiles"; homepage = "https://github.com/cheshirekow/cmake_format"; - license = licenses.gpl3; - maintainers = [ maintainers.tobim ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tobim ]; mainProgram = "cmake-format"; - platforms = platforms.all; }; } diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix new file mode 100644 index 000000000000..cb04ca653be3 --- /dev/null +++ b/pkgs/by-name/dg/dgop/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, +}: + +buildGoModule rec { + pname = "dgop"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "AvengeMedia"; + repo = "dgop"; + tag = "v${version}"; + hash = "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc="; + }; + + vendorHash = "sha256-kO8b/eV5Vm/Fwzyzb0p8N9SkNlhkJLmEiPYmR2m5+po="; + + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/{cli,dgop} + + installShellCompletion --cmd dgop \ + --bash <($out/bin/dgop completion bash) \ + --fish <($out/bin/dgop completion fish) \ + --zsh <($out/bin/dgop completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "API & CLI for System & Process Monitoring"; + homepage = "https://github.com/AvengeMedia/dgop"; + changelog = "https://github.com/AvengeMedia/dgop/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luckshiba ]; + mainProgram = "dgop"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix new file mode 100644 index 000000000000..a9ad173a1c62 --- /dev/null +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -0,0 +1,74 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + makeWrapper, + procps, + nix-update-script, + bashNonInteractive, +}: + +buildGoModule rec { + pname = "dms-shell"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "AvengeMedia"; + repo = "DankMaterialShell"; + tag = "v${version}"; + hash = "sha256-dLbiTWsKoF0if/Wqet/+L90ILdAaBqp+REGOou8uH3k="; + }; + + sourceRoot = "${src.name}/core"; + + vendorHash = "sha256-nc4CvEPfJ6l16/zmhnXr1jqpi6BeSXd3g/51djbEfpQ="; + + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + + subPackages = [ "cmd/dms" ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + postInstall = '' + mkdir -p $out/share/quickshell + cp -r ${src}/quickshell $out/share/quickshell/dms + + wrapProgram $out/bin/dms --add-flags "-c $out/share/quickshell/dms" + + install -Dm644 ${src}/quickshell/assets/systemd/dms.service \ + $out/lib/systemd/user/dms.service + substituteInPlace $out/lib/systemd/user/dms.service \ + --replace-fail /usr/bin/dms $out/bin/dms \ + --replace-fail /usr/bin/pkill ${procps}/bin/pkill + + substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ + --replace-fail /bin/bash ${bashNonInteractive}/bin/bash + + installShellCompletion --cmd dms \ + --bash <($out/bin/dms completion bash) \ + --fish <($out/bin/dms completion fish) \ + --zsh <($out/bin/dms completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Desktop shell for wayland compositors built with Quickshell & GO"; + homepage = "https://danklinux.com"; + changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luckshiba ]; + mainProgram = "dms"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ds/dsearch/package.nix b/pkgs/by-name/ds/dsearch/package.nix new file mode 100644 index 000000000000..a6d3b8348a0e --- /dev/null +++ b/pkgs/by-name/ds/dsearch/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, +}: + +buildGoModule rec { + pname = "dsearch"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "AvengeMedia"; + repo = "danksearch"; + tag = "v${version}"; + hash = "sha256-rtfymtzsxEuto1mOm8A5ubREJzXKCai6dw9Na1Fa21Q="; + }; + + vendorHash = "sha256-65NFlAtix5ehyaRok3/0Z6+j6U7ccc0Kdye0KFepLLM="; + + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + install -Dm744 ./assets/dsearch.service $out/lib/systemd/user/dsearch.service + substituteInPlace $out/lib/systemd/user/dsearch.service \ + --replace-fail /usr/local/bin/dsearch $out/bin/dsearch + + installShellCompletion --cmd dsearch \ + --bash <($out/bin/dsearch completion bash) \ + --fish <($out/bin/dsearch completion fish) \ + --zsh <($out/bin/dsearch completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Fast, configurable filesystem search with fuzzy matching"; + homepage = "https://github.com/AvengeMedia/danksearch"; + changelog = "https://github.com/AvengeMedia/danksearch/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luckshiba ]; + mainProgram = "dsearch"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json index 4f899019cf40..9207cc69b455 100644 --- a/pkgs/by-name/er/ersatztv/nuget-deps.json +++ b/pkgs/by-name/er/ersatztv/nuget-deps.json @@ -46,8 +46,8 @@ }, { "pname": "BlazorSortable", - "version": "5.1.3", - "hash": "sha256-gQVWDsjj09hp1KlLW7Du9GQo8RMN3XU1x3wwbhNgp/4=" + "version": "5.1.6", + "hash": "sha256-aRw6nbwi8LnS2I7jlt75cH0ECnmhQkU7o8JoUKNpOns=" }, { "pname": "Blurhash.Core", @@ -69,10 +69,25 @@ "version": "4.1.0", "hash": "sha256-L/aMCcmE7xLEtap5/H56VwCsDI4N/m8jgoj6SkxM7x8=" }, + { + "pname": "Castle.Core", + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" + }, + { + "pname": "Chronic.Core", + "version": "0.4.0", + "hash": "sha256-5XUJ1kmVfeFjV4o9zBaHtHPQ03GoUBDPnQANQU+DZ6w=" + }, { "pname": "CliWrap", - "version": "3.9.0", - "hash": "sha256-WC1bX8uy+8VZkrV6eK8nJ24Uy81Bj4Aao27OsP1sGyE=" + "version": "3.10.0", + "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" }, { "pname": "Dapper", @@ -84,6 +99,16 @@ "version": "5.1.0", "hash": "sha256-WG4tbTGOz8INa1TAovAv+wvNIhzwGdLimyjhkT3NZ2o=" }, + { + "pname": "DiffEngine", + "version": "11.3.0", + "hash": "sha256-aZbLawtOytbKPrF2DQ3dZOwgxjuaGsXKC0LwmlAw6V0=" + }, + { + "pname": "DotNet.Glob", + "version": "3.1.3", + "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84=" + }, { "pname": "EFCore.BulkExtensions", "version": "9.0.2", @@ -121,23 +146,28 @@ }, { "pname": "Elastic.Clients.Elasticsearch", - "version": "9.2.0", - "hash": "sha256-m79ubD/K1EU9XFeLmYsRxfjymVm6r5r39rjDCXoIt0w=" + "version": "9.2.2", + "hash": "sha256-5wzN9SoLH/zU3WScLryzfVmk078TpO/5EY2iUflB5IY=" }, { "pname": "Elastic.Transport", "version": "0.10.1", "hash": "sha256-eX9H+arnuPnIzOFQvle4pdDTTpZ0Rw+t7rJ1ohlxbh0=" }, + { + "pname": "EmptyFiles", + "version": "4.4.0", + "hash": "sha256-2ej6ZYSr/KSz/Mmh0RavjIMMyHzzTVtyjd9nbW17IwY=" + }, { "pname": "ExtendedNumerics.BigDecimal", - "version": "3001.0.1.201", - "hash": "sha256-c/ujs7UUGwmVwWHYyG0XbvVmgjThbKwMM/MsCQtUMrk=" + "version": "3001.1.0.233", + "hash": "sha256-XP9qmY+lYNWQ4NVvhZ4wPrIXS0Dj6DTaS9wkTfQdryc=" }, { "pname": "FluentValidation", - "version": "12.0.0", - "hash": "sha256-BaOvGqRZ9BYCpsU+A/kqu25JfN2zr01aWtulSwZfGQ4=" + "version": "12.1.0", + "hash": "sha256-9I30avP9CoS1usoqOuGrpJW/OuSa6b2M5/z935182kQ=" }, { "pname": "FluentValidation.AspNetCore", @@ -156,8 +186,8 @@ }, { "pname": "Hardware.Info", - "version": "101.1.0", - "hash": "sha256-kVOIbxKjjt5BGGAC5x697DTDp3bhhtrnUTDZOqsWTCc=" + "version": "101.1.0.1", + "hash": "sha256-R2kxac5rNQ9mEsD3OR5LmXiBP4uakmcRBrHazzs+EMU=" }, { "pname": "HarfBuzzSharp", @@ -181,33 +211,48 @@ }, { "pname": "Heron.MudCalendar", - "version": "3.2.0", - "hash": "sha256-XjLkX52jvZpuqFnnsFZELfEvTvJXoH1VWOE5Geg6clo=" + "version": "3.3.0", + "hash": "sha256-1QVTu7VuJeBNqf0wBc9wPJBQ352Ko7neC+4iL5Tiolw=" }, { "pname": "HtmlSanitizer", - "version": "9.0.886", - "hash": "sha256-OgCbsMn3ci6he1ZlnJnAtJ+/Rr3sFIuBCL2ZVfHRhUk=" + "version": "9.0.889", + "hash": "sha256-0U6K39KkovhpFujGNhjUCv5/JCbESCiiAJbvHCYi9f0=" }, { "pname": "Humanizer.Core", "version": "2.14.1", "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" }, + { + "pname": "Humanizer.Core", + "version": "3.0.1", + "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww=" + }, { "pname": "J2N", "version": "2.1.0", "hash": "sha256-PKRqOMIgQEJfCm9qa59NdyHeNul0iZkWQnu7TlA5SCg=" }, { - "pname": "JetBrains.ReSharper.GlobalTools", - "version": "2025.2.3", - "hash": "sha256-O0391kuA/ds8C7WmtbeMYi4eNiO3DKFPDYsUDHfVFUA=" + "pname": "Jint", + "version": "4.4.2", + "hash": "sha256-T8r7EJrTfzfevHwfcOBGSacRpRnIyRm/KTyMVsJQ8go=" }, { - "pname": "Jint", - "version": "4.4.1", - "hash": "sha256-4ojG4dhMwlk9Sx52/YByKIu39cQ4lnYl+8S5VsE1Ut0=" + "pname": "Json.More.Net", + "version": "2.1.1", + "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU=" + }, + { + "pname": "JsonPointer.Net", + "version": "5.3.1", + "hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE=" + }, + { + "pname": "JsonSchema.Net", + "version": "7.4.0", + "hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0=" }, { "pname": "LanguageExt.Core", @@ -256,8 +301,8 @@ }, { "pname": "Markdig", - "version": "0.43.0", - "hash": "sha256-lUdjtLzSxAI0BEMdIgEc3fZ/VR8NO0gKSs1k6mgy6zU=" + "version": "0.44.0", + "hash": "sha256-EVuUTv5l68t7bP2vJ2njypxuRzH52AztXyBF9LUJrrI=" }, { "pname": "MedallionTopologicalSort", @@ -289,85 +334,75 @@ "version": "5.0.0", "hash": "sha256-THQ8Z7DAoMDEqAS7feAmAt82NvU7H90Y+jYwC7NwL+0=" }, + { + "pname": "Microsoft.ApplicationInsights", + "version": "2.23.0", + "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Internal.Assets", + "version": "10.0.0", + "hash": "sha256-IyY5Ymdkmf9S9qRwYXX9rWpzcU3fuDR+ITeaaeJQ/Dk=" + }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", - "version": "9.0.10", - "hash": "sha256-6l1ldFyaaj3s068Va9/dB1r/bwz28yvXFrRqqeApO1o=" + "version": "10.0.0", + "hash": "sha256-VJREi/phDmn2toJiTvyFbUO0qXG/Ef4QtbeVHLNJNw0=" + }, + { + "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", + "version": "9.0.11", + "hash": "sha256-uz9t6volHVoUM0j1GFXXfWU157ba05TvZBnres47roA=" }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "9.0.10", - "hash": "sha256-60LP/JjEanENkOHuC+A2uRnH8LX836p1SWeCGz7WI4I=" + "version": "10.0.0", + "hash": "sha256-2AYzgmFvXc1YU/sdQ/c9fLpM2Gs5AMsZbxIquVNZJbw=" }, { - "pname": "Microsoft.AspNetCore.Authorization", - "version": "9.0.1", - "hash": "sha256-r4kREQ8EBu0ca0mLWURXK+eRXxPDtw3ygkV6gKZHHcU=" - }, - { - "pname": "Microsoft.AspNetCore.Components", - "version": "8.0.6", - "hash": "sha256-UnN6Mp/ZCpyem4IEGLPeit/CM6R9sIZ4t8byhuaBAD8=" - }, - { - "pname": "Microsoft.AspNetCore.Components", - "version": "9.0.1", - "hash": "sha256-dkUlF8cmEplWR5IwkUC9TIDoseFKMkO+KzxGS5VAwVs=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Analyzers", - "version": "9.0.1", - "hash": "sha256-M5EP1+9d2ndDLursIcTGG9eiTst/npb9WlsdNigs8MQ=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Forms", - "version": "8.0.6", - "hash": "sha256-0pj0SSYltkS6LYizVbIixNxJm7mnOen/ZS2pc1qoDZ4=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Forms", - "version": "9.0.1", - "hash": "sha256-R1ZbsMvlu0QL4XUvdg56GJ0ipCwg8NJCpgChR3eVG0o=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "8.0.0", - "hash": "sha256-dsCb4B6r5iHPbEp8+uFzAfD1txGI5dEIWgwtT9+GgU8=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "8.0.6", - "hash": "sha256-p4HCxjja7i5ZBM65+p7QJ50/7xYnH+glDn92dWEzaPc=" - }, - { - "pname": "Microsoft.AspNetCore.Components.Web", - "version": "9.0.1", - "hash": "sha256-6x+220UK4IeHH52cIDjtcsVq99++4b/rJdpdYi5aqbU=" + "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", + "version": "9.0.11", + "hash": "sha256-RhcnttgtQtLpNkX+yqrKu8wqlrS9muxSA0GLGAfRMJI=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "9.0.10", - "hash": "sha256-LYa47siOO6avqUiPU7oix1N1n0rg9uBCoOGxjQ+pcCo=" + "version": "10.0.0", + "hash": "sha256-CRq0x0z6ox2i4+RX2uthtjBzmBgxjMWk68cAO670v1k=" }, { - "pname": "Microsoft.AspNetCore.Metadata", - "version": "9.0.1", - "hash": "sha256-QZbltYEjfOxrY991+bu+5fh/37N39eQnIMz30hhvHzc=" + "pname": "Microsoft.AspNetCore.JsonPatch", + "version": "9.0.11", + "hash": "sha256-MeQFvZt5GIEs9IQILjDwC72GlgyIMUH52nxsJbKCNdo=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "9.0.10", - "hash": "sha256-Oyz6w/aj7/l9bw1W3WGX9nzm0hF9jcQE9cFxcrNC/d0=" + "version": "10.0.0", + "hash": "sha256-9ZUxFNG00RU0O9e9LTJjIBSZgnWBTZI1sbDy6uXLwBw=" + }, + { + "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", + "version": "9.0.11", + "hash": "sha256-+WtuaFv9zL11yQpFDYv87BeXulu63UkqvH+cNJa3EY4=" }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "9.0.10", - "hash": "sha256-Wq3M/6lQmLozVE40miheZMbc/3Bx8gotSL8wyiUkbYM=" + "version": "10.0.0", + "hash": "sha256-mf3kOdkliLF4OD+CrmEhMNNDGOPKWGBOBWtX2EV5YEU=" + }, + { + "pname": "Microsoft.AspNetCore.OpenApi", + "version": "9.0.11", + "hash": "sha256-FvIqXjGE0RqejaBu43zcdCA3toYLTELPCRpnJp4kYuk=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", - "version": "9.0.10", - "hash": "sha256-2eY4Z9hzQiqQGCdl6BpQGRLjHnbCtxNG21oSNjwLrhQ=" + "version": "10.0.0", + "hash": "sha256-Sl0m0+8UGRmmSQcbP5OWznCvXnrrhIvotLL3DbbIgEE=" + }, + { + "pname": "Microsoft.AspNetCore.SpaServices.Extensions", + "version": "9.0.11", + "hash": "sha256-xD0gi4AGjRnIALAUC+YbugVHEmt9sa4m9JOlf2/NuUs=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -430,9 +465,9 @@ "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" }, { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + "pname": "Microsoft.CodeCoverage", + "version": "18.0.1", + "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY=" }, { "pname": "Microsoft.Data.SqlClient", @@ -451,8 +486,8 @@ }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "9.0.10", - "hash": "sha256-prsCR2WzQAhbhdZ30xk+/wvLt6rDj0M3k1tvyoD6uYM=" + "version": "9.0.11", + "hash": "sha256-cz4FkzDDKEINNzVWLt3j8nbi5kKzs2dbbbqF1uGnTzA=" }, { "pname": "Microsoft.Data.Sqlite.Core", @@ -466,23 +501,23 @@ }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "9.0.10", - "hash": "sha256-Zm4oMVeloK2WmPskzg4l3SXjJuC+sRg3O5aiTK5rHvw=" + "version": "9.0.11", + "hash": "sha256-c5RiSd/QPerOYUueN8G4wcmJG8/TmOiJniYI9gf2j8Q=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "9.0.10", - "hash": "sha256-FB+8WtFYKn1PH9R3pgKw7dNJiJDCcS78UkeRkxdOuCk=" + "version": "9.0.11", + "hash": "sha256-60/92aSe/qZcKqDOTf8uNBXea6/lqrjW2WnFSdvCTdk=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "9.0.10", - "hash": "sha256-q6w0uQ4qMAe2EuA65a3rk18rhGXuGVYMrdrIzD5Z+tw=" + "version": "9.0.11", + "hash": "sha256-hAiDz5WksFapSdV3N4Db7zAH7M+sBvEiO4I1BmQu+MY=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "9.0.10", - "hash": "sha256-Zb5u2PySq+VuISn4bSTTDp6sN05ml94eK5O3dZAGO9g=" + "version": "9.0.11", + "hash": "sha256-unGkfYBpPbLlieZULtFBaVzGWvX29MYnj32QrVFSmVo=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -496,8 +531,8 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "9.0.10", - "hash": "sha256-2XHQOKvs4mAXwl8vEZpdi6ZtDFhK2hPusRMFemu3Shw=" + "version": "9.0.11", + "hash": "sha256-mqsnHzVpFTlVyd/vLqAuM8Js0Q7CBJN2K8iYKmq/VXY=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -506,13 +541,13 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "9.0.10", - "hash": "sha256-LunzXQSLdZZL1aTlg8E8Jj58oKXniJwYx9zQasPbM2I=" + "version": "9.0.11", + "hash": "sha256-IMbQVABUUIox18jABD75ywKXqb4K1BE69TEhkYYCqGc=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "9.0.10", - "hash": "sha256-3uBgFul0W3+7MaxwRjZoowQ9iSw58jYPUChyWG/3UF4=" + "version": "9.0.11", + "hash": "sha256-o6yLDDyptXAvwTwMjhe6KLRfYqvh64OWhwABNa47UDU=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", @@ -536,18 +571,33 @@ }, { "pname": "Microsoft.Extensions.ApiDescription.Server", - "version": "9.0.10", - "hash": "sha256-PRhLCquUa3IE7i31aHMGBap7vlLFC7HPAJRnCyhBQDI=" + "version": "10.0.0", + "hash": "sha256-fgJ4g1gRX2W+TmNWxboxATYnZQxAGIpvl0EZD3BMVM0=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Server", + "version": "9.0.11", + "hash": "sha256-6+v6bVecvv1q47FscMLdEuMYJmpwonIWmMXGo5td5Sg=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "9.0.10", - "hash": "sha256-W/9WhAG5t/hWPZxIL5+ILMsPKO/DjprHRymZUmU5YOA=" + "version": "10.0.0", + "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI=" + }, + { + "pname": "Microsoft.Extensions.Caching.Abstractions", + "version": "9.0.11", + "hash": "sha256-+1PEeH8he6Yk0r/6UpQ69ej38vYtuVyS4JJdKEkrheQ=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.10", - "hash": "sha256-HIXNiUnBJaYN+QGzpTlHzkvkBwYmcU0QUlIgQDhVG5g=" + "version": "10.0.0", + "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4=" + }, + { + "pname": "Microsoft.Extensions.Caching.Memory", + "version": "9.0.11", + "hash": "sha256-/ZHjoBvGkq5a6kNvqBTkz5JfBOu1zLFbuTMBsPXUYwY=" }, { "pname": "Microsoft.Extensions.Caching.Memory", @@ -559,15 +609,20 @@ "version": "9.0.9", "hash": "sha256-Vd64P8RygTRObuy+R0htLqLZK6d4gogKfoC7eR9c1JQ=" }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "10.0.0", + "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg=" + }, { "pname": "Microsoft.Extensions.Configuration", "version": "9.0.10", "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw=" }, { - "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.7", - "hash": "sha256-Su+YntNqtLuY0XEYo1vfQZ4sA0wrHu0ZrcM33blvHWI=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "10.0.0", + "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -586,14 +641,19 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "9.0.7", - "hash": "sha256-45ZR8liM/A6II+WPX9X6v9+g2auAKInPbVvY6a79VLk=" + "version": "9.0.11", + "hash": "sha256-bBvR5XeJpoim/4JUsDtp+z7GU2vx37NwjAjeXLc+Ycg=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.9", "hash": "sha256-Qmi+ftu17qqVVHJ+SgKvLrXCHJDrP5h4ZgTflgDWgzc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "10.0.0", + "hash": "sha256-YSiWoA3VQR22k6+bSEAUqeG7UDzZlJfHWDTubUO5V8U=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", @@ -604,15 +664,10 @@ "version": "9.0.10", "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4=" }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "9.0.7", - "hash": "sha256-9iT3CPY6Vpwi1RCVwveHVteTgpAXloBAo8KCwIPsePg=" - }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "10.0.0", + "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -621,23 +676,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.1", - "hash": "sha256-Kt9fczXVeOIlvwuxXdQDKRfIZKClay0ESGUIAJpYiOw=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.10", - "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk=" + "version": "9.0.11", + "hash": "sha256-A77to45DYqDT5vCHAa2RBqTVOKND1KdYTX3PCTd2shA=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "6.0.0", - "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + "version": "10.0.0", + "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -654,11 +699,6 @@ "version": "9.0.0", "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.1", - "hash": "sha256-2tWVTPHsw1NG2zO0zsxvi1GybryqeE1V00ZRE66YZB4=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.10", @@ -666,8 +706,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.7", - "hash": "sha256-Ltlh01iGj6641DaZSFif/2/2y3y9iFk7GEd+HuRnxPs=" + "version": "9.0.11", + "hash": "sha256-7ybl+oJ7NkkOX3Ns7KAgaHy3CP2LvI1VBTJ9WbMIYC0=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "10.0.0", + "hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI=" }, { "pname": "Microsoft.Extensions.DependencyModel", @@ -676,8 +721,8 @@ }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "9.0.10", - "hash": "sha256-isJHVIKcWkwi+CqwNBVlz2ISKzZj+TilVpmVNOonNWo=" + "version": "9.0.11", + "hash": "sha256-nKxWogDgMM/JqgqEP0vfNOfjrPB/KWcyr5V1UnCZaac=" }, { "pname": "Microsoft.Extensions.DependencyModel", @@ -691,13 +736,13 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.1", - "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + "version": "10.0.0", + "hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ=" }, { - "pname": "Microsoft.Extensions.Diagnostics", - "version": "9.0.10", - "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog=" + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "10.0.0", + "hash": "sha256-cix7QxQ/g3sj6reXu3jn0cRv2RijzceaLLkchEGTt5E=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", @@ -705,9 +750,9 @@ "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" }, { - "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "9.0.10", - "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0=" + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "10.0.0", + "hash": "sha256-CHDs2HCN8QcfuYQpgNVszZ5dfXFe4yS9K2GoQXecc20=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", @@ -715,59 +760,24 @@ "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" }, { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.10", - "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.10", - "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0=" - }, - { - "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.10", - "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ=" + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "10.0.0", + "hash": "sha256-Sub3Thay/+eR84cEODk/nPh1oYIYtawvDX6r0duReqo=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "9.0.0", "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "9.0.10", - "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ=" - }, { "pname": "Microsoft.Extensions.Http", - "version": "8.0.1", - "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" - }, - { - "pname": "Microsoft.Extensions.Http", - "version": "9.0.10", - "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA=" - }, - { - "pname": "Microsoft.Extensions.Localization", - "version": "9.0.1", - "hash": "sha256-xUjj12JrGno5SMFvElI83InMMAsg2IEmOvnSG0StPGM=" - }, - { - "pname": "Microsoft.Extensions.Localization.Abstractions", - "version": "9.0.1", - "hash": "sha256-TfMJ/RDIzihOh5zt30adc2clcUQMyDoWB173CW87KXg=" + "version": "10.0.0", + "hash": "sha256-gnsO9erEi7xLS3QwYukcrzPDpcUgRkNFnGzPARHVjrs=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "6.0.0", - "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "8.0.1", - "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + "version": "10.0.0", + "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs=" }, { "pname": "Microsoft.Extensions.Logging", @@ -781,14 +791,19 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "9.0.7", - "hash": "sha256-7n8guHFss8HPnJuAByfzn9ipguDz7dack/udL1uH3h0=" + "version": "9.0.11", + "hash": "sha256-AGNOGjQ1xEM3ct5iM21TeaJ/zdLtt+UduTUUs5WQi1E=" }, { "pname": "Microsoft.Extensions.Logging", "version": "9.0.9", "hash": "sha256-NdiJIyXqS4+uE/UPDxLfPt3qCvmapTBVuP3jUcsBb74=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "10.0.0", + "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.2", @@ -804,11 +819,6 @@ "version": "9.0.0", "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.1", - "hash": "sha256-aFZeUno9yLLbvtrj53gA7oD41vxZZYkrJhlOghpMEjo=" - }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "9.0.10", @@ -816,39 +826,39 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.7", - "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ=" + "version": "9.0.11", + "hash": "sha256-hk1zL4wTkoix+681q7MC/B9VLThibu4L01Pj6ZtNy14=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "9.0.7", - "hash": "sha256-ZgS/4d6hmFtCLWdBL4DtlEFXV84295jWJrgzUPQ1IVI=" + "version": "9.0.10", + "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "9.0.7", - "hash": "sha256-KUsy31YvvO8CTwHoNw4DbBOp+/o2sYscvQL7fvCPUvQ=" + "version": "9.0.10", + "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E=" + }, + { + "pname": "Microsoft.Extensions.Logging.Debug", + "version": "10.0.0", + "hash": "sha256-n/+KRVlsgKm17cJImaoAPHAObHpApW/hf6mMsQFGrvY=" }, { "pname": "Microsoft.Extensions.Logging.TraceSource", - "version": "9.0.7", - "hash": "sha256-CTh9gA1if0ejMNZs/sz8KHCABqtJHCK0/KNqzmFE0YY=" + "version": "9.0.10", + "hash": "sha256-VrOfGKu31ySmSAPq0A+bE+ZfQytKGEe2A8dfKq1idK0=" }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.2", - "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + "version": "10.0.0", + "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA=" }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.0", "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "9.0.1", - "hash": "sha256-wOKd/0+kRK3WrGA2HmS/KNYUTUwXHmTAD5IsClTFA10=" - }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.10", @@ -856,8 +866,13 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.7", - "hash": "sha256-nfUnZxx1tKERUddNNyxhGTK7VDTNZIJGYkiOWSHCt/M=" + "version": "9.0.11", + "hash": "sha256-e7yi+sje07SUUxbZ6+ZjvcFMgUtpLZ8vz1KdPinF310=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "10.0.0", + "hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", @@ -865,9 +880,9 @@ "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ=" }, { - "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "9.0.7", - "hash": "sha256-96ycmW7aMb9i0GFXoLVUlb0cc3IIpYXRJ3Pymz/QJi4=" + "pname": "Microsoft.Extensions.Primitives", + "version": "10.0.0", + "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -881,13 +896,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.1", - "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.10", - "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w=" + "version": "9.0.11", + "hash": "sha256-T1t0dsPVxP0TrmXfPXsA+wZKgS7TecZXvRS261G+KY8=" }, { "pname": "Microsoft.Identity.Client", @@ -970,35 +980,25 @@ "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo=" }, { - "pname": "Microsoft.JSInterop", - "version": "8.0.6", - "hash": "sha256-lKOvph7MvyvGuuNZZGa0ZGcSH87n6vVxUgc9C/rsC3E=" - }, - { - "pname": "Microsoft.JSInterop", - "version": "9.0.1", - "hash": "sha256-eDXtCDVi6LO2MA04ytmmOSVtvpINq0Km84hu6LOBa2A=" + "pname": "Microsoft.NET.Test.Sdk", + "version": "18.0.1", + "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, { "pname": "Microsoft.OpenApi", "version": "1.6.17", "hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk=" }, + { + "pname": "Microsoft.OpenApi", + "version": "2.0.0", + "hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k=" + }, { "pname": "Microsoft.SqlServer.Server", "version": "1.0.0", @@ -1009,21 +1009,56 @@ "version": "160.1000.6", "hash": "sha256-XU5s3iwz8JIwIrG5Xe8wZJ8cuCUx7q3fOLYzNHmA9jg=" }, + { + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.9.0", + "hash": "sha256-JT91ThKLEyoRS/8ZJqZwlSTT7ofC2QhNqPFI3pYmMaw=" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.9.0", + "hash": "sha256-oscZOEKw7gM6eRdDrOS3x+CwqIvXWRmfmi0ugCxBRw0=" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.9.0", + "hash": "sha256-CadXLWD093sUDaWhnppzD9LvpxSRqqt93ZEOFiIAPyw=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.9.0", + "hash": "sha256-6nzjoYbJOh7v/GB7d+TDuM0l/xglCshFX6KWjg7+cFI=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.9.0", + "hash": "sha256-/bileP4b+9RZp8yjgS6eynXwc2mohyyzf6p/0LZJd8I=" + }, + { + "pname": "Microsoft.TestPlatform.AdapterUtilities", + "version": "17.13.0", + "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.13.0", + "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "18.0.1", + "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "18.0.1", + "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4=" + }, { "pname": "Microsoft.VisualStudio.Threading.Analyzers", "version": "17.14.15", "hash": "sha256-wv0Hi7pjPYeSwDFyaa8baIOyiUraVfudmVtpm0okoYU=" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" - }, { "pname": "Mono.TextTemplating", "version": "3.0.0", @@ -1031,8 +1066,8 @@ }, { "pname": "MudBlazor", - "version": "8.13.0", - "hash": "sha256-gBVfGt6wHgJmeN0vE0y7Ij+8CAq4aQNI43xiC8S0c6I=" + "version": "8.15.0", + "hash": "sha256-I6kJEvND0i3I/amZBhDF8LjYeGGWuMwoSLiev6BS3UM=" }, { "pname": "MySqlConnector", @@ -1041,18 +1076,18 @@ }, { "pname": "NaturalSort.Extension", - "version": "4.4.0", - "hash": "sha256-zLZLY2ONesj58plElgK00aRq0g+RHgp6f6vGrt6dUtc=" + "version": "4.4.1", + "hash": "sha256-JI3O5aySFcJkQXfhc1IIy3ri9jGboDx7LF6EHYqcUis=" }, { "pname": "NCalc.Core", - "version": "5.7.0", - "hash": "sha256-KjtUpx/2n/mN8iashgosKMZ59vE3V+iLnuj2IcgNWf8=" + "version": "5.8.0", + "hash": "sha256-gLexewkgetT42BHiJv5O62TKMYP/fmJlwmH2fdEyyTk=" }, { "pname": "NCalcSync", - "version": "5.7.0", - "hash": "sha256-C2sUHYUpn4g1vR2Lhi50CFic/QDnU/KJHX2UMf1yGIg=" + "version": "5.8.0", + "hash": "sha256-vq+eXmt1ykzTiyUCF/NHtbLQ+3x0soarZfJH2h6neEM=" }, { "pname": "NETStandard.Library", @@ -1114,6 +1149,26 @@ "version": "9.0.4", "hash": "sha256-jBgcWTQ2Y84rA04OBSzVLzKzYsFC+a1olwbb01wnd0w=" }, + { + "pname": "NSubstitute", + "version": "5.3.0", + "hash": "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0=" + }, + { + "pname": "NUnit", + "version": "4.4.0", + "hash": "sha256-5geF5QOF+X/WkuCEgkPVKH4AdKx4U0olpU07S8+G3nU=" + }, + { + "pname": "NUnit.Analyzers", + "version": "4.11.2", + "hash": "sha256-bVsDWOuTFtZTetikVdqOZ96SP0VV+XF4GPbGEaBgf8A=" + }, + { + "pname": "NUnit3TestAdapter", + "version": "5.2.0", + "hash": "sha256-ybTutL4VkX/fq61mS+O3Ruh+adic4fpv+MKgQ0IZvGg=" + }, { "pname": "Oracle.EntityFrameworkCore", "version": "9.23.90", @@ -1126,8 +1181,8 @@ }, { "pname": "Parlot", - "version": "1.4.0", - "hash": "sha256-4I9+uG+MW5KTxbGFjXoEjsK8/g6m6ZvuqUOohGNk2gE=" + "version": "1.5.2", + "hash": "sha256-gMKHhCNJTqjzZRGfXDTSUkJsqDCMY5TnJge0pAha4pE=" }, { "pname": "Pomelo.EntityFrameworkCore.MySql", @@ -1159,220 +1214,15 @@ "version": "0.4.167.3", "hash": "sha256-ntKXv6NYHYQSrqCIYvYSGrlk5B180wPb9JlCXYdHMp0=" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, { "pname": "Scalar.AspNetCore", - "version": "2.9.0", - "hash": "sha256-6ZGrchehXuV9MoXv6/3yzrJh0q1aHFuOsfIknZM/2uU=" + "version": "2.11.0", + "hash": "sha256-9tJSfcbv2ECnH0ZQb2ovQWsgYzMoVIgSOmctKiQUzp0=" }, { "pname": "Scriban.Signed", - "version": "6.4.0", - "hash": "sha256-DDXaTurUONBBG289NI2IYCyalDDFV9hlJo9McoCrBWQ=" + "version": "6.5.2", + "hash": "sha256-rnhmugQoX+lI0sO+V3KIAsQ9kWs0ow7EpEriQLCYAQw=" }, { "pname": "Serilog", @@ -1389,16 +1239,31 @@ "version": "4.3.0", "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw=" }, + { + "pname": "Serilog.AspNetCore", + "version": "10.0.0", + "hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs=" + }, { "pname": "Serilog.AspNetCore", "version": "9.0.0", "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ=" }, + { + "pname": "Serilog.Extensions.Hosting", + "version": "10.0.0", + "hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU=" + }, { "pname": "Serilog.Extensions.Hosting", "version": "9.0.0", "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw=" }, + { + "pname": "Serilog.Extensions.Logging", + "version": "10.0.0", + "hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE=" + }, { "pname": "Serilog.Extensions.Logging", "version": "9.0.0", @@ -1414,6 +1279,11 @@ "version": "4.0.0", "hash": "sha256-89+SaaXp9Pt8YTkTwVuMV3PzlPMg9mOHiFBKs3oHOUs=" }, + { + "pname": "Serilog.Settings.Configuration", + "version": "10.0.0", + "hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs=" + }, { "pname": "Serilog.Settings.Configuration", "version": "9.0.0", @@ -1424,6 +1294,11 @@ "version": "6.0.0", "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" }, + { + "pname": "Serilog.Sinks.Console", + "version": "6.1.1", + "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY=" + }, { "pname": "Serilog.Sinks.Debug", "version": "3.0.0", @@ -1439,10 +1314,15 @@ "version": "7.0.0", "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, + { + "pname": "Shouldly", + "version": "4.3.0", + "hash": "sha256-7pYi2aGqPIHzyhJelXWRLVCLzBxTiQr0DCTY325q6O8=" + }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.11", - "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA=" + "version": "3.1.12", + "hash": "sha256-FR8v74w4P/1AZdW5ARW0y8zgDqLtvhxQmL1CKv68xR0=" }, { "pname": "SkiaSharp", @@ -1504,21 +1384,6 @@ "version": "2.1.10", "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.ClientModel", "version": "1.5.1", @@ -1534,30 +1399,10 @@ "version": "8.0.0", "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, - { - "pname": "System.Collections.Immutable", - "version": "9.0.7", - "hash": "sha256-OI+/e7BtdXN+0Ef75ueb/NRf3OjFlJy22QXmodeHG60=" - }, { "pname": "System.CommandLine", - "version": "2.0.0-rc.2.25502.107", - "hash": "sha256-aa8dUxLHZxU4bDs1NJ70VhlvwmkxiP/yPHAXaSnT4Uw=" + "version": "2.0.0", + "hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc=" }, { "pname": "System.Composition", @@ -1600,34 +1445,9 @@ "hash": "sha256-hIde8A2EK+RpUSAMZx/xTVMRVeZWyaquVuSKmWbxrgw=" }, { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" - }, - { - "pname": "System.Diagnostics.Contracts", - "version": "4.3.0", - "hash": "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.7.1", - "hash": "sha256-l2TM1pfyRF70Xmzoz1dAqWkB8+/K6b8t5Tj7aF1UO9Y=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + "pname": "System.Diagnostics.EventLog", + "version": "6.0.0", + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, { "pname": "System.Diagnostics.EventLog", @@ -1644,46 +1464,11 @@ "version": "8.0.0", "hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k=" }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" - }, { "pname": "System.DirectoryServices.Protocols", "version": "8.0.2", "hash": "sha256-kfqxVtIqF8b2FcEi9vCWKKEyQNagg7VZqvrp9ylAWxk=" }, - { - "pname": "System.Formats.Asn1", - "version": "8.0.1", - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" - }, - { - "pname": "System.Formats.Asn1", - "version": "9.0.9", - "hash": "sha256-HbbJ0jg+ivuuc/Hbl0DO1k263K/T8qzLjp2EB+H1/B4=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, { "pname": "System.IdentityModel.Tokens.Jwt", "version": "7.7.1", @@ -1695,230 +1480,20 @@ "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" }, { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, - { - "pname": "System.IO.Pipelines", - "version": "7.0.0", - "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" - }, - { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "pname": "System.Linq.Queryable", - "version": "4.3.0", - "hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4=" + "pname": "System.Management", + "version": "6.0.1", + "hash": "sha256-g7bjwQv6af0kWiYtpXE8qgr1YMdD6Rf97TbhK5TxQG0=" }, { "pname": "System.Management", "version": "8.0.0", "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" }, - { - "pname": "System.Memory", - "version": "4.5.3", - "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, - { - "pname": "System.Memory", - "version": "4.6.0", - "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" - }, { "pname": "System.Memory.Data", "version": "8.0.1", "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, - { - "pname": "System.Net.Http", - "version": "4.3.0", - "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.7.0", - "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.7.0", - "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "7.0.0", - "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", "version": "8.0.1", @@ -1929,11 +1504,6 @@ "version": "9.0.4", "hash": "sha256-dfOvsCYBR2bGGvwm6tthWB8kdNS6bxoMTS/lxL4t1gA=" }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" - }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", @@ -1949,116 +1519,41 @@ "version": "9.0.4", "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA=" }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Json", - "version": "7.0.3", - "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.10", - "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.5", - "hash": "sha256-M5G8EtmsV13O3qNMsAdk4isdKJ/SHfrbRzMhdVsoG2c=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.9", - "hash": "sha256-I+GCgXZZUtgAta94BIBqy72HnZJ3egzNBOTxnVy2Ur8=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.0", - "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Channels", - "version": "7.0.0", - "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" - }, { "pname": "TagLibSharp", "version": "2.3.0", "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w=" }, + { + "pname": "Testably.Abstractions", + "version": "10.0.0", + "hash": "sha256-2rixQaYGhCM+NjmkxgOBNjJMFcNHr+3TPP+vsRUMj4w=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "10.0.0", + "hash": "sha256-xEDpDTiT1lBFJHoWfJ9htPlwi5nrL5J/QJVj/9Slu48=" + }, + { + "pname": "Testably.Abstractions.FileSystem.Interface", + "version": "10.0.0-pre.1", + "hash": "sha256-UO/Ly7Qd7AqYOIP52pS1YYoaQgOzzZ5745naHMqULZs=" + }, + { + "pname": "Testably.Abstractions.Interface", + "version": "10.0.0", + "hash": "sha256-3l5VILA3tf1J0CZJSlNn2vK34+grFSl+MTSjBuS16Mg=" + }, + { + "pname": "Testably.Abstractions.Interface", + "version": "10.0.0-pre.1", + "hash": "sha256-Te2+jj1jSleYGEJHlrmj9GYTht62mY14E5WCKDHx4pQ=" + }, + { + "pname": "Testably.Abstractions.Testing", + "version": "5.0.0", + "hash": "sha256-Y5739mTFHJMdJoCFM7FWr668aDOmppWBtt2Oc0I9uPM=" + }, { "pname": "TimeSpanParserUtil", "version": "1.2.0", @@ -2076,8 +1571,8 @@ }, { "pname": "WebMarkupMin.Core", - "version": "2.19.0", - "hash": "sha256-YB7zm1h8/+dlCjNNOYnnyrVMWG9G6KHlFcXvjtbhl6w=" + "version": "2.20.0", + "hash": "sha256-v0CpbncKPK7G7dnS0HQrdm+TXMJKhm8KK4T/eqNEeTI=" }, { "pname": "Winista.MimeDetect", diff --git a/pkgs/by-name/er/ersatztv/package.nix b/pkgs/by-name/er/ersatztv/package.nix index 209b68cd6cfc..ceb96934a0ff 100644 --- a/pkgs/by-name/er/ersatztv/package.nix +++ b/pkgs/by-name/er/ersatztv/package.nix @@ -9,14 +9,20 @@ buildDotnetModule rec { pname = "ersatztv"; - version = "25.8.0"; + version = "25.9.0"; src = fetchFromGitHub { owner = "ErsatzTV"; repo = "ErsatzTV"; rev = "v${version}"; - sha256 = "sha256-FuuX/SxhzzUn7ELJDXJuILkl3ubR3V+5hQwILvZZrFg="; + sha256 = "sha256-+ZMDMKrJN+nX9FeSZ8RTFGRf161Mhpqd7jY9FLZWNqM="; }; + postPatch = '' + # Remove config of development tools that don't end up in + # nuget-deps.json but would be looked up at build time + # leading to a missing package error. + rm -r .config + ''; buildInputs = [ ffmpeg ]; @@ -26,8 +32,8 @@ buildDotnetModule rec { "ErsatzTV.Scanner" ]; nugetDeps = ./nuget-deps.json; - dotnet-sdk = dotnetCorePackages.sdk_9_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; # ETV uses `which` to find `ffmpeg` and `ffprobe` makeWrapperArgs = [ diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 85c30ddd24de..495c3971be02 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -21,7 +21,7 @@ let inherit buildInputs version; src = fetchzip { - url = "mirror://sourceforge/geoserver/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip"; + url = "https://sourceforge.net/projects/geoserver/files/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip"; inherit hash; # We expect several files. stripRoot = false; @@ -42,325 +42,334 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.27.2"; # app-schema - hash = "sha256-XJbuRdqvkusT1hZEuFoogTEB8vHOsX9cQxA0Mzhg1+8="; # app-schema + version = "2.28.1"; # app-schema + hash = "sha256-PwZW9hFRiZIxgil75DXMsq0ymo7jPYX4Boj+hkXW8NI="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.27.2"; # authkey - hash = "sha256-e43HG4iPgj9vj7lq0c9ATmWVumqHdtM9DrAwbQJqUcg="; # authkey + version = "2.28.1"; # authkey + hash = "sha256-Zg3Db5QG4w+yMZ75MqtHt1Kri8peDGMZ0va5ZwI+6dw="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.27.2"; # cas - hash = "sha256-kDYC8z5sRAycw6ZCKJ105XoYF5/ss4YTguqQ8pbnJls="; # cas + version = "2.28.1"; # cas + hash = "sha256-YMnaRVPLn98mXm2sErKSRlzmvQbnU9MGMDXuYgwm+H0="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.27.2"; # charts - hash = "sha256-zI+F21bQHcE4Lbh26bHeCTjTRJdswkUmmz+qAsP2t4k="; # charts + version = "2.28.1"; # charts + hash = "sha256-LM75iq2xvSQjVxGnngoLCz5IkSI9/YqAqOqgSUlkrUA="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.27.2"; # control-flow - hash = "sha256-5XW3l9MFEUeYuhOKqN4EqjwpRlMc8P8Tn46A2Z89Jks="; # control-flow + version = "2.28.1"; # control-flow + hash = "sha256-ZO04mls+OapOK/fi5IBy0mVJ5cF0fyQ1RgFhWt0AuEw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.27.2"; # css - hash = "sha256-1fpP70Ed4iUrUyMMiMFhkykuPCzBV5+lWFicl9sUjAg="; # css + version = "2.28.1"; # css + hash = "sha256-2PcZhxkHXEOAs46fnt37VhupVOfRNWaRynNlLGviAho="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.27.2"; # csw - hash = "sha256-4BYSY6tldkjd8KDlM/D+MNb9I8Ji0CVjyJcsBzRxC1Y="; # csw + version = "2.28.1"; # csw + hash = "sha256-6TmSWnny0OedvnLu+HnKpVxdfcicp1D//isFFOclcmk="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.27.2"; # csw-iso - hash = "sha256-/0soY61A1d4yKJolRtymoFOsKf42B/RacUSUqN/7uXo="; # csw-iso + version = "2.28.1"; # csw-iso + hash = "sha256-BlnIS8gpWwBuiwdIqvq3UpJrdKPULvJxR7o3XJtI5tQ="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.27.2"; # db2 - hash = "sha256-agZZHkwAx5YTOCzDlhpiTWxBTyhAoIW1BgW3QfV/kug="; # db2 + version = "2.28.1"; # db2 + hash = "sha256-Ga4Db6G+LxRN+casjs0nYD6TFN1YrDjgOIlu46/0RgQ="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.27.2"; # dxf - hash = "sha256-F93QOpe0nBQDD+8iDnenacNJ87h+jCqytJ3uz7weCcg="; # dxf + version = "2.28.1"; # dxf + hash = "sha256-703y8CBd9oYsryGgAftXq5Cr1lUeyws1Alx0tSwzZo8="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.27.2"; # excel - hash = "sha256-CYW9JBhDOLqxNKnlxNDy03sZzmGPLn9KaK4LScGMIIg="; # excel + version = "2.28.1"; # excel + hash = "sha256-9ti+J7e9QieVbCFQ2xxuqX8TvQCcLPw0tPUNVqGG9+0="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.27.2"; # feature-pregeneralized - hash = "sha256-0MuzhZ8Y/yy/AJ6vTvfJxXPgnf+fTJPfB8wNTboYHOw="; # feature-pregeneralized + version = "2.28.1"; # feature-pregeneralized + hash = "sha256-eGayG9FUJabhP60iypib1gLcRStqz5J4PMTuSB+xL60="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.27.2"; # gdal + version = "2.28.1"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-Krdj96ddLsrA8J6B8ap3BBBe/+flVX7/GJRLN4UnKiY="; # gdal + hash = "sha256-sVI9o2xwbvez7Gm8gY9DAbEr5TUluVGDoC7ZweK4BUE="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.27.2"; # geofence - # hash = "sha256-Rzi8oZFy+SglTuPSYBFi/Wge4pOVY5yE50c8+jRI+4Y="; # geofence + # version = "2.28.1"; # geofence + # hash = "sha256-POBOhg3d8HlA3qF2W41UTVhISM5vAQi74cI+y+Rj+Ic="; # geofence #}; - #geofence-server = mkGeoserverExtension { - # name = "geofence-server"; - # version = "2.27.2"; # geofence-server - # hash = ""; # geofence-server + #geofence-server-h2 = mkGeoserverExtension { + # name = "geofence-server-h2"; + # version = "2.28.1"; # geofence-server + # hash = "sha256-8lY+wrCD7PizeNvh9hDRhxdFxT7n1SVKD8TVU80iiZk="; # geofence-server-h2 + #}; + + #geofence-server-postgres = mkGeoserverExtension { + # name = "geofence-server-postgres"; + # version = "2.28.1"; # geofence-server + # hash = "sha256-DB3OK2dvPrDtlRRHaDUXqQW7AlOhN4zFm2t0N1+B3rk="; # geofence-server-postgres #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.27.2"; # geofence-wps - # hash = "sha256-dry787XPCVBPi4TXKyFL85QZwX0WdWfiXqz/yriMiWc="; # geofence-wps + # version = "2.28.1"; # geofence-wps + # hash = "sha256-tP3hnN0kXKFIdgKrS7juyrCh1OoQD0Bx54/xq6nUzWA="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.27.2"; # geopkg-output - hash = "sha256-LlYjYTa0mjOh+q2ILJORTAUlWy3mW9lEMd1vUyyhDV8="; # geopkg-output + version = "2.28.1"; # geopkg-output + hash = "sha256-6ARKLmhc5lhqi841Ou5ZrBuj6bdOwQDSGPwzGcBTNJw="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.27.2"; # grib - hash = "sha256-/OBhwToUuJfDcRnx4aJbXDb6HdGGtM8SCkjmFgfX65s="; # grib + version = "2.28.1"; # grib + hash = "sha256-AW/i+vRthQct3U45EGw/6uPDZNdS9z816nnKVIGCg/k="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.27.2"; # gwc-s3 - hash = "sha256-A0I2/+pRuvcXCVduTNn/e1nDZnNkt7cKtPNNO3Yo8Bk="; # gwc-s3 + version = "2.28.1"; # gwc-s3 + hash = "sha256-wVLW7qbKDRmf1okTI0PDREQ5eoJOVGMVLS+uusY2+cM="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.27.2"; # h2 - hash = "sha256-kGXqb5xH4Jn6nhN8nfhldUcHtQodBUp9y3bviPim1Ak="; # h2 + version = "2.28.1"; # h2 + hash = "sha256-zEjNN1dCmNR/5st/yNpWP1G3P6Zqf3RSFdUKOgdwff4="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.27.2"; # iau - hash = "sha256-KVkpQ92cvmc3nIsBygUU58vsIY8BZXEEXQrUeH/eEyM="; # iau + version = "2.28.1"; # iau + hash = "sha256-zn4FlC/vVvq1K6mSplOKarHHUWLNev5IW76wSiTvBuE="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.27.2"; # importer - hash = "sha256-Sumh9148zqwLCbpiknwLyVpxqufkoizMgszy//qC5dA="; # importer + version = "2.28.1"; # importer + hash = "sha256-7v5MvpvVbVKOBxUlEwem8MzPUTtBc8z+1JAEqeHUmYI="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.27.2"; # inspire - hash = "sha256-IDX93Cu7BgrkmI5QcdYu++XzVwHOeCM17eXgqhDPSRQ="; # inspire + version = "2.28.1"; # inspire + hash = "sha256-kgqwO3elSnT/4M9G+OgULaW+i/nDNGhvHblmWZRjTTA="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.27.2"; # jp2k - # hash = "sha256-Ar+mVXZqYfP6OGISdRzBntWRo2msL5RN44bgPeMOqQw="; # jp2k + # version = "2.28.1"; # jp2k + # hash = "sha256-sLUgsMXymnTuceCRLzqIAPmk4/Q3BO+A+7BLQoc3iP0="; # jp2k #}; - libjpeg-turbo = mkGeoserverExtension { - name = "libjpeg-turbo"; - version = "2.27.2"; # libjpeg-turbo - hash = "sha256-6e9Bdy/Lh7ZXPzHVGX/f/qa53v1JWrUshlrtcziIbQs="; # libjpeg-turbo - buildInputs = [ libjpeg.out ]; - }; + # Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'" + # as of 2.28.1. + # NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix) + #libjpeg-turbo = mkGeoserverExtension { + # name = "libjpeg-turbo"; + # version = "2.28.1"; # libjpeg-turbo + # hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo + # buildInputs = [ libjpeg.out ]; + #}; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.27.2"; # mapml - hash = "sha256-QTAoesynmxv+9bYwak6jat6J3In5ULdsy2ozjMbsoXI="; # mapml + version = "2.28.1"; # mapml + hash = "sha256-AonH/wBRh0oVs8psJ+XRutkSwybN3fs505SI/0qzG3o="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.27.2"; # mbstyle - hash = "sha256-zKdX77zy72lkMB928XIjU0pYZ7zFVEI7OfbJ2ozFIHk="; # mbstyle + version = "2.28.1"; # mbstyle + hash = "sha256-SvgvBkp6dS6v1JjQxpa7m7tqc2c63hruWCcFcouHXaQ="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.27.2"; # metadata - hash = "sha256-VLBuqh9qfcv2BRHhjF1tAc6ACCOUPQcY4Yc0Vko/2l0="; # metadata + version = "2.28.1"; # metadata + hash = "sha256-M3HcgrPGZBBotNm6dsw4UjrH1onIQHDMdxuwNVuqO84="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.27.2"; # mongodb - hash = "sha256-xXgiOEMQhPbw6GorrkEiyV7isgmSuimzT/LK41c0bzA="; # mongodb + version = "2.28.1"; # mongodb + hash = "sha256-Urp8d0i6Xlk2muNKKioJTnrEvzC05tqiipLT162L7uk="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.27.2"; # monitor - hash = "sha256-1x+Rz8wXl3cAsX5rHgMEe1+h17QS7PDBJGDFmKf+SMY="; # monitor + version = "2.28.1"; # monitor + hash = "sha256-Qo9aFOjbg9s1RZVqa/z1ka+QmFrPZJgrH8qMcstCywQ="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.27.2"; # mysql - hash = "sha256-mmquP4u3YqqbGVK2jkbNtGiqVMENCThpRTWOz6f74Pk="; # mysql + version = "2.28.1"; # mysql + hash = "sha256-5/xP8vPNhOYN9YXL4sZk16652ZBB7Ivm7Cq05fYi7wI="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.27.2"; # netcdf - hash = "sha256-GhPde3Fw04lutbgPmDyxO/C7wkZO1ttASqqj2g6JuCM="; # netcdf + version = "2.28.1"; # netcdf + hash = "sha256-qKgSyFrKI7JVMNt/qjgJ5puLaTsU406P5VyUpncMHOg="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.27.2"; # netcdf-out - hash = "sha256-r4CyrlRm04tE3+vJfF+KlHAczrOy+dsTHXBG++GG0ys="; # netcdf-out + version = "2.28.1"; # netcdf-out + hash = "sha256-Xk3cTve45U9LDv8lWugtGpfid4yr5yDWh7H7daVlAc8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.27.2"; # ogr-wfs + version = "2.28.1"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-EI0FNYFwcmsLYiYauvCAvweAIn6bI7WaCVPcCtkGrys="; # ogr-wfs + hash = "sha256-ykFfqoLXeGigAdCLnDCKiCGD++n7jiOivua8Oh2DwU8="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.27.2"; # ogr-wps + version = "2.28.1"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-CtsaQg9IZxlRW4oQwmdBA+VLWtsNP3+jS1Mj2RxAJw4="; # ogr-wps + hash = "sha256-WxOZ5WDNxV1HAT9cfCPm9DwoU/96OobuODOjd5dGN94="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.27.2"; # oracle - hash = "sha256-8cRDvWWFJHZZGmbZEruvp1whfhXZ/c7TYha4Fa5DuzM="; # oracle + version = "2.28.1"; # oracle + hash = "sha256-lj53CC6f9vXatH9vxHaFZvEGDpplTZSYy56fz4d4Qs0="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.27.2"; # params-extractor - hash = "sha256-Y7tt0F//dANcKds/mU6702S5PMJNVLcxxc+hYFNOt5M="; # params-extractor + version = "2.28.1"; # params-extractor + hash = "sha256-1Znwqb+PHFlsuQIs8pMqo08s4uSc7wLZRYE+hVZzoQY="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.27.2"; # printing - hash = "sha256-I5vVlpX2kXof3wuyRs2QvhWdx0Okm7StYvY8I/AL8Ug="; # printing + version = "2.28.1"; # printing + hash = "sha256-OeMHkx4d7/FwNigQ8Mnz9UlqFJbMZFGmxZT8kJ3iPp8="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.27.2"; # pyramid - hash = "sha256-/iIwS5iw95qotmmLWGU11br36dVc+o5LmwTDXBL7zaY="; # pyramid + version = "2.28.1"; # pyramid + hash = "sha256-fLe2SeRSNvj6qqh6CMDu2w0gubf+xi3Ez7jO2fEbpjc="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.27.2"; # querylayer - hash = "sha256-G66AkPkytzXvEi9hbudvBphFKrvMrhUbPSVvexXRJh4="; # querylayer + version = "2.28.1"; # querylayer + hash = "sha256-QM5DAoTFsn6JTLubQy4p0qsA91DcfU7C74cb80jzzWM="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.27.2"; # sldservice - hash = "sha256-djERawjM06NtZK6RnNh/qIS/x5ZjSWeUMHlUSF4/5aA="; # sldservice + version = "2.28.1"; # sldservice + hash = "sha256-u5uzwyrwBzz5qcEtRS+ZIbmis9kVuGPt6+qo19K1HCM="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.27.2"; # sqlserver - hash = "sha256-Kad2wJmN/67xlLDViFfYWxvsSjmW+j3/iQEAvwEMZW4="; # sqlserver + version = "2.28.1"; # sqlserver + hash = "sha256-19KyMBZEYBeUKiogxux8jrc8VgNDdCnvhrEV8Q84SG0="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.27.2"; # vectortiles - hash = "sha256-S5ujjj8JLXbybbjpA8qLF4sapVIECDZ8l+iqqUoVHuc="; # vectortiles + version = "2.28.1"; # vectortiles + hash = "sha256-tT4phUdL8yMKzobxWNivMpHJYu6KQmPiNECK9TtJgjg="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.27.2"; # wcs2_0-eo - hash = "sha256-S2d3Yel0B0DJubuMUywPB2gDiWIpdkniDksZcq8j9BI="; # wcs2_0-eo + version = "2.28.1"; # wcs2_0-eo + hash = "sha256-HawDOyymB01x7PaFg5QKQhTSFdybeY5oAAusaG95To8="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.27.2"; # web-resource - hash = "sha256-HJ+GPrprrCPlzh9q+PZr0QEJE/YVXaqgxhUlYHPkgho="; # web-resource + version = "2.28.1"; # web-resource + hash = "sha256-FkuxR3WN95jyorpcv4ShT9J6jmUi0Z9NNwLEW3OKzx0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.27.2"; # wmts-multi-dimensional - hash = "sha256-de+0UEsRJyl9plnmOaWSI8xNc6RG+U7uJVEyvgwng4Q="; # wmts-multi-dimensional + version = "2.28.1"; # wmts-multi-dimensional + hash = "sha256-tJP9pPKKYFLGbLWZEV5gWSaQdTbml3OKiIPM1sqhekY="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.27.2"; # wps - hash = "sha256-Fn0XWncwqUmMub9eBxb5GN2cc3eMdyB55NB9AUvVQpQ="; # wps + version = "2.28.1"; # wps + hash = "sha256-aYAN89XFpwzsW5aRBKSnixks3bxCAfOOznFDpoIvbIk="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.27.2"; # wps-cluster-hazelcast - # hash = "sha256-xV6JddIC5Uq8H3RaE9tqCMK+5OA5WrXfh6O82BVw+P0="; # wps-cluster-hazelcast + # version = "2.28.1"; # wps-cluster-hazelcast + # hash = "sha256-hO1/7OG9J5Ot5xKhMUbTAqm7B6TlecqNGxxbIuFCpCc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.27.2"; # wps-download - hash = "sha256-loP1oYqie2U00RWOwlLzprECfnBTG2MeJNhPZJx8Q1o="; # wps-download + version = "2.28.1"; # wps-download + hash = "sha256-qB1vtczNULOsEjZaof9cA5YKPDE0Dwcz6mlUtzCanPQ="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.27.2"; # wps-jdbc - hash = "sha256-LpxGscFx7DCeM90VGs4lAMoKNXJVDnSCptdC9VeeU/o="; # wps-jdbc + version = "2.28.1"; # wps-jdbc + hash = "sha256-9S6/TXK9YFzPD8u/S7SQuBcIGjUTalY69kzG4xbIU3g="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.27.2"; # ysld - hash = "sha256-1yOaJcPyLOm/lYdOazHU5DjfahSjuN00yYvxgsE5RKM="; # ysld + version = "2.28.1"; # ysld + hash = "sha256-qLWnujvB32U0EW7xW12GaAx6mPHkrU5Pa3S+T8+19r8="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 7d03232a5d76..4c66b14da3dd 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "geoserver"; - version = "2.27.2"; + version = "2.28.1"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; - hash = "sha256-yzejVi+0FzTCtUirCvn3PsxLLmoIUSxS2sA1KWWo30U="; + hash = "sha256-wll05KPMVfpZGnybBxLeGH3pan8q4eWy8F4v5y5N3Gk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ge/geoserver/update.sh b/pkgs/by-name/ge/geoserver/update.sh index e3b2f25fbaa4..133519136043 100755 --- a/pkgs/by-name/ge/geoserver/update.sh +++ b/pkgs/by-name/ge/geoserver/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I ./. -i bash -p common-updater-scripts jq set -eEuo pipefail -test ${DEBUG:-0} -eq 1 && set -x +test "${DEBUG:-0}" -eq 1 && set -x # Current version. LATEST_NIXPKGS_VERSION=$(nix eval --raw .#geoserver.version 2>/dev/null) @@ -12,7 +12,7 @@ UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION} LATEST_GITHUB_VERSION=$(curl -s "https://api.github.com/repos/geoserver/geoserver/releases/latest" | jq -r '.tag_name') UPDATE_NIX_NEW_VERSION=${UPDATE_NIX_NEW_VERSION:-$LATEST_GITHUB_VERSION} -SMALLEST_VERSION=$(printf "$UPDATE_NIX_OLD_VERSION\n$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1) +SMALLEST_VERSION=$(printf "%s\n%s" "$UPDATE_NIX_OLD_VERSION" "$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1) if [[ "$SMALLEST_VERSION" == "$UPDATE_NIX_NEW_VERSION" ]]; then echo "geoserver is up-to-date: $SMALLEST_VERSION" @@ -24,18 +24,18 @@ update-source-version geoserver "$UPDATE_NIX_NEW_VERSION" cd "$(dirname "$(readlink -f "$0")")" -EXT_NAMES=($(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort)) +mapfile -t EXT_NAMES < <(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort) -if [[ $# -gt 0 ]] ; then - EXT_NAMES=(${@:1}) +if [[ $# -gt 0 ]]; then + EXT_NAMES=("${@:1}") fi -for EXT_NAME in "${EXT_NAMES[@]}" ; do - echo "Updating extension $EXT_NAME..." - URL="mirror://sourceforge/geoserver/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip" - HASH=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --unpack "$URL")) - sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix - sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix +for EXT_NAME in "${EXT_NAMES[@]}"; do + echo "Updating extension $EXT_NAME..." + URL="https://sourceforge.net/projects/geoserver/files/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip" + HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --unpack "$URL")") + sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix + sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix done cd - diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index 9e2069a3a996..5ff5312110d2 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.1"; + version = "3.12.8.2"; src = fetchurl { url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s="; + sha256 = "sha256-q8V7EQMWXdaRU1eW99vbp2hiF8fQael07Q89gA/oh5Y="; }; strictDeps = true; @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs data/gschemas/make-enums.py \ gthumb/make-gthumb-h.py \ po/make-potfiles-in.py \ - postinstall.py \ gthumb/make-authors-tab.py ''; diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 9b7b070497a2..edcfe47691ab 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inko"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "inko-lang"; repo = "inko"; tag = "v${finalAttrs.version}"; - hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY="; + hash = "sha256-ZHVOwYvNRL2ObZt2PvayoqvS64MumN4oXQOgeCWbEUM="; }; - cargoHash = "sha256-IOMhwcZHB5jVYDM65zifxCjVHWl1EBbxNA3WVmarWcs="; + cargoHash = "sha256-BHrbqPMQnhw8pjN8e0/qW1rPe/fMhs2iUbRVPt5ATrg="; buildInputs = [ libffi diff --git a/pkgs/by-name/in/inko/test.nix b/pkgs/by-name/in/inko/test.nix index 4b6d637de3ff..3ed311a0f826 100644 --- a/pkgs/by-name/in/inko/test.nix +++ b/pkgs/by-name/in/inko/test.nix @@ -7,26 +7,30 @@ let source = + # https://docs.inko-lang.org/manual/v0.19.1/getting-started/hello-concurrency/#channels writeText "hello.inko" # inko '' import std.process (sleep) - import std.stdio (STDOUT) + import std.stdio (Stdout) + import std.sync (Channel) import std.time (Duration) - class async Printer { - fn async print(message: String, channel: Channel[Nil]) { - let _ = STDOUT.new.print(message) + type async Printer { + fn async print(message: String, channel: uni Channel[Nil]) { + let _ = Stdout.new.print(message) channel.send(nil) } } - class async Main { + type async Main { fn async main { - let channel = Channel.new(size: 2) + let channel = Channel.new - Printer().print('Hello', channel) - Printer().print('world', channel) + Printer().print('Hello', recover channel.clone) + Printer().print('world', recover channel.clone) + + sleep(Duration.from_millis(500)) channel.receive channel.receive diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 364fdfaa761b..ec34d7f2418c 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "020"; + patch = "021"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-4ni5psPUfoeupka8UryhWorCK9vptWZRPPDaRXAtN7M="; + sha256 = "sha256-0hli9489cBtLzEcwN87sdh54hbkqtq3hCxqN9XxTX2U="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; diff --git a/pkgs/by-name/js/jsduck/Gemfile b/pkgs/by-name/js/jsduck/Gemfile deleted file mode 100644 index 483fc40ff799..000000000000 --- a/pkgs/by-name/js/jsduck/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "jsduck" diff --git a/pkgs/by-name/js/jsduck/Gemfile.lock b/pkgs/by-name/js/jsduck/Gemfile.lock deleted file mode 100644 index d8331181652b..000000000000 --- a/pkgs/by-name/js/jsduck/Gemfile.lock +++ /dev/null @@ -1,23 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - dimensions (1.2.0) - jsduck (5.3.4) - dimensions (~> 1.2.0) - json (~> 1.8.0) - parallel (~> 0.7.1) - rdiscount (~> 2.1.6) - rkelly-remix (~> 0.0.4) - json (1.8.6) - parallel (0.7.1) - rdiscount (2.1.8) - rkelly-remix (0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - jsduck - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/by-name/js/jsduck/gemset.nix b/pkgs/by-name/js/jsduck/gemset.nix deleted file mode 100644 index 25a0fdf7289f..000000000000 --- a/pkgs/by-name/js/jsduck/gemset.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - dimensions = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0"; - type = "gem"; - }; - version = "1.2.0"; - }; - jsduck = { - dependencies = [ - "dimensions" - "json" - "parallel" - "rdiscount" - "rkelly-remix" - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr"; - type = "gem"; - }; - version = "5.3.4"; - }; - json = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - parallel = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq"; - type = "gem"; - }; - version = "0.7.1"; - }; - rdiscount = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; - type = "gem"; - }; - version = "2.1.8"; - }; - rkelly-remix = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; - type = "gem"; - }; - version = "0.0.7"; - }; -} diff --git a/pkgs/by-name/js/jsduck/package.nix b/pkgs/by-name/js/jsduck/package.nix deleted file mode 100644 index ccd1538e4f77..000000000000 --- a/pkgs/by-name/js/jsduck/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - stdenv, - lib, - bundlerEnv, - makeWrapper, - bundlerUpdateScript, -}: -let - rubyEnv = bundlerEnv { - name = "jsduck"; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; -in -stdenv.mkDerivation { - pname = "jsduck"; - version = (import ./gemset.nix).jsduck.version; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rubyEnv ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${rubyEnv}/bin/jsduck $out/bin/jsduck - ''; - - passthru.updateScript = bundlerUpdateScript "jsduck"; - - meta = with lib; { - description = "Simple JavaScript Duckumentation generator"; - mainProgram = "jsduck"; - homepage = "https://github.com/senchalabs/jsduck"; - license = with licenses; gpl3; - maintainers = with maintainers; [ - periklis - nicknovitski - ]; - platforms = platforms.unix; - # rdiscount fails to compile with: - # mktags.c:44:1: error: return type defaults to ‘int’ [-Wimplicit-int] - broken = true; - }; -} diff --git a/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch b/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch new file mode 100644 index 000000000000..fcba1034944a --- /dev/null +++ b/pkgs/by-name/ka/kaidan/0001-Fix-compatibility-with-qt-6.10.patch @@ -0,0 +1,29 @@ +From df4f62ed4c4e54d528950f9204623ec3054d3ff9 Mon Sep 17 00:00:00 2001 +From: eljamm +Date: Thu, 4 Dec 2025 10:29:49 +0100 +Subject: [PATCH] Fix compatibility with qt 6.10 + +See: https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes +From: https://invent.kde.org/network/kaidan/-/commit/26942b401070 +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 027530bc..ee57c6f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,10 @@ if (NOT ANDROID) + find_package(KF6WindowSystem ${KF_MIN_VERSION} CONFIG REQUIRED) + endif() + ++if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0" AND NOT WIN32 AND NOT APPLE) ++ find_package(Qt6GuiPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE) ++endif() ++ + find_package(KF6KirigamiAddons 1.4.0 REQUIRED) + find_package(QXmppQt6 1.11.0 REQUIRED COMPONENTS Omemo) + +-- +2.50.1 + diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index c75693ecf0f6..cb0d015906a7 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4+jW3fuUi1OpwbcGccxvrPro/fiW9yBOlhc2KUbUExc="; }; + patches = [ + ./0001-Fix-compatibility-with-qt-6.10.patch + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix index 3a9601fc14b4..c9dfc5b174c6 100644 --- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rakshasa"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-r+5rNaBXhHbDWFXbgEPriEmjWEjTyu2I5H7rl3PoF38="; + hash = "sha256-zBMenewDtUyhOAQrIKejiShGWDeIA+7U1heyOKfAjio="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index d57a6a1eb2ee..69f406d37fca 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.4.1"; + version = "8.6.0"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-Q5PFOA/UGpDbzS0yROBOY6eXSgzx7nzSC+P109FrhvA="; + hash = "sha256-KfCYYbBAsOKWkpaPIiN+xxu1IXoMkk0NWSdndk8FpTg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 9d22a3cf24ec..b89544834710 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2025-12-02"; + version = "0-unstable-2025-12-03"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "8bd2b3595f0731c4db5b6fb629655bdb7a23d78b"; - hash = "sha256-SNnqbC1XbeO9f8wSMHPIfdKkgyNbTTM6Lu4IVj9fTDQ="; + rev = "4a0805d71eaff678cb2f81837ee7a93e15803d3f"; + hash = "sha256-mmxo2pnXOGbcE7vwoveskMQIdx1drqGwnqX9ugDX01s="; postFetch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' # NOTE: Normalize case-sensitive directory names that cause issues on case-insensitive filesystems cp -r "$out/providers/poe/models/openai"/* "$out/providers/poe/models/openAi/" diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix index d135c3fb44b8..fbc804c23d05 100644 --- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix +++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nvidia-mig-parted"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "mig-parted"; tag = "v${finalAttrs.version}"; - hash = "sha256-oSoPgap/LFjJ1tW3KLlcQ/zdym9A9h5zownktVxdQfY="; + hash = "sha256-No8NzmjDjri77r7YzuSYsGMvHHMxsvxJaddarKcDMr0="; }; vendorHash = null; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index de5f09711103..c863f751f5ea 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.40"; + version = "0.6.41"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-whQmHSnHWeAozNsWemZZXi3quqcY27PTO6/3lpxiy+c="; + hash = "sha256-/RpLiTz8WiI2fTJuLcksbB0pa5HOR13ci4G2LjdZu7Y="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-WL239S/XB+fZEOY2MQMMxbyJ5RoXfZJz94A8IOmyQ9c="; + npmDepsHash = "sha256-n31+P5QU0XsuyNvipUU2A9f7CE3jKQa8ZAfwFuS3SXg="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index db82e1efbf15..1ef086381c0a 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; tag = finalAttrs.version; - hash = "sha256-W3HTgdLHzETfmp/DZ5s9pWXQeBaic4/O55ckGzDDtxs="; + hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y="; }; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { disabledTests = [ # Tests failing due to TileDB library implementation, disabled also # by upstream CI. - # See: https://github.com/PDAL/PDAL/blob/2.9.2/.github/workflows/linux.yml#L81 + # See: https://github.com/PDAL/PDAL/blob/2.9.3/.github/workflows/linux.yml#L81 "pdal_io_tiledb_writer_test" "pdal_io_tiledb_reader_test" "pdal_io_tiledb_time_writer_test" diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 554fea30290e..878abf44286b 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.28.2"; + version = "1.28.3"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA="; + hash = "sha256-9deO1SXhQ3/oZg2BC/IWbHb5KKQ7qAklrR956lj8IFY="; }; vendorHash = "sha256-6zsX7rU+D+RUHwXfFZzLQftQ6nSYJhvKIDdsO2vow4A="; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index bd4dbfcfcfae..67be31832f75 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -9,23 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ddLtXIBf6WrjN+gxm0g3Wkmyps2resWsd1cH0F99Ii8="; + hash = "sha256-/B7Z4d4GEJKhEDRznVzeqeB2Qrsz/dAVV3Syo8EhfvM="; }; - cargoHash = "sha256-E+t7bwKDnuZO/4WJEBaN+e5+P/Nbo14WWxgTLxDE7Jw="; - - preBuild = '' - version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])') - - substituteInPlace ./tests/languages/python.rs \ - --replace '(3, 12, 11)' "$version312_str" - ''; + cargoHash = "sha256-quWyPdFEBYylhi1gugdew9KXhHldTkIAbea7GmVhH5g="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 355fc6247757..f49da3ab9d61 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "qovery-cli"; - version = "1.55.1"; + version = "1.56.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-E/OjQkaO1ecB9o3boInBOamuY8CoXb1JAp7G9NuiQqE="; + hash = "sha256-IeK0GcYi3J86IABYfKvE3ict8AOnpuwuecqadNYcVrY="; }; vendorHash = "sha256-owsLDP2ufW0kXmWOFtAiXKx/YiKEGL0QXkRQy1uA2Uw="; diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index eb2806e34b2d..0ea919ff1d63 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-RMnsT+5X8LhtuGVNG5Dfgamj+oWCZNgNbyJn78HH3gI="; + hash = "sha256-VUI7Br3k3g87tQW1AEccTTojOKNO0HA4jwA7PvYrlN8="; }; - npmDepsHash = "sha256-qVQ6akW6OhBCnOc5f0Tej9YzvRjNfhxonovLydv9Jvc="; + npmDepsHash = "sha256-Fv3Tca0LlVwpKOoDyG8wiojn0pip8IH79lxqxISd8O0="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index 95845b49ffff..c2ad46d75b4c 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-93P4rKBSbs31uofl4AuVQQWVSRVOsKsykIG13p8zIkI="; + hash = "sha256-soOu6JyS/SEdwUngOUd0suImr70naZms9Zy2pRwBn5E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix index 0588bf4cd8ba..5fc933afcd26 100644 --- a/pkgs/by-name/re/redumper/package.nix +++ b/pkgs/by-name/re/redumper/package.nix @@ -9,13 +9,13 @@ # redumper is using C++ modules, this requires latest C++20 compiler and build tools llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: { pname = "redumper"; - version = "665"; + version = "666"; src = fetchFromGitHub { owner = "superg"; repo = "redumper"; tag = "b${finalAttrs.version}"; - hash = "sha256-eKoQuQD2Z2WzcyZNf/MloEoAH8SlwbKihCPON2Sj1NY="; + hash = "sha256-B5c7ISlQhLBsRYcoCG18uLWkeODJUDGoRAd9n8EejNA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 42717057753d..5624ed00b36c 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-BplxcFV8h0V+eyk2knCpwPCxUo9PdoIHp4mDXXo/HyE="; + hash = "sha256-INwbp6gGqrmOtrM5d/8iEv1nlTUDSuo9AVN0EwNhW9Y="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-v2I8+1K+Yz+DR2QsJ+1SaKLh3aEIBaR3aXRfwDMNvVs="; + vendorHash = "sha256-kt5fnkF/bxpeY9d86zKr9VlShvLy1gtaICfA0PGVGKI="; patches = [ (replaceVars ./set-pandoc-path.patch { diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 66d644eb5cb7..7a68b342ad61 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -9,13 +9,13 @@ ocamlPackages.buildDunePackage rec { pname = "slipshow"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "panglesd"; repo = "slipshow"; tag = "v${version}"; - hash = "sha256-cmBq9RYjvl355+tV+Nf7XmDzgbOqusCjVrqoC34R5CI="; + hash = "sha256-HV4qUp/da0GjZ/KSaE4L/qxdosnOTRcC83zIRigxFSY="; }; postPatch = '' @@ -40,6 +40,7 @@ ocamlPackages.buildDunePackage rec { lwt magic-mime ppx_blob + ppx_deriving_yojson ppx_sexp_value sexplib ]; diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 0e66f0effb6f..5f19ef31babc 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.8.116"; + version = "0.8.118"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; tag = "v${finalAttrs.version}"; - hash = "sha256-hmDAT2LCB+kyhYhLvGkpZnEGiXxD8RsPqt29ZFfS6q4="; + hash = "sha256-etr9YTqD3faVpjDUtmOtYDGh1ZGsl/sWVLs33nOwNKQ="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 7195fb38d968..2c76dcdeaa13 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.11.27"; + version = "2025.11.28.post1"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-HkdDcTQza4pw72FuQgss+GRiiHPtKFRSCJ87fIYPdq4="; + hash = "sha256-DKlo8Cs7MVfkY8qrVT6NDPTQm6DhGtOHQ1pm3587Hj8="; }; postPatch = '' diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index c3d91831ad7d..3baf30be2a1a 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.3.0"; + version = "25.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-MviXDRAbCEXM9dIzD94/CM0bjlF4zCJUVE91Xst/uII="; + hash = "sha256-ESaVKbAieCQcSs4WHyajSpBUWcHrldveXcb9PO63XWc="; }; meta = { diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index e99d86cd5489..ae83293ff650 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -25,11 +25,6 @@ stdenv.mkDerivation { meta ; - patches = [ - # Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38429 - ./fix-darwin-build.patch - ]; - outputs = [ "out" "dev" diff --git a/pkgs/development/libraries/mesa/fix-darwin-build.patch b/pkgs/development/libraries/mesa/fix-darwin-build.patch deleted file mode 100644 index e649bb9ccfde..000000000000 --- a/pkgs/development/libraries/mesa/fix-darwin-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c -index 81b6730f8e29b3920216461858b98bcd3b7a870c..9bdfe555949482ddb6153ee926967ac5c04fe7c8 100644 ---- a/src/glx/apple/apple_cgl.c -+++ b/src/glx/apple/apple_cgl.c -@@ -34,6 +34,7 @@ - - #include "apple_cgl.h" - #include "apple_glx.h" -+#include "util/os_misc.h" - - #ifndef OPENGL_FRAMEWORK_PATH - #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL" -diff --git a/src/loader/loader.c b/src/loader/loader.c -index d06a368c1bbff180fcc9432183db66398b75f4a3..0567beb3dee569895fbb36c7e7c3df34be8b32b7 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -139,6 +139,9 @@ iris_predicate(int fd, const char *driver) - bool - nouveau_zink_predicate(int fd, const char *driver) - { -+#ifndef HAVE_LIBDRM -+ return true; -+#else - /* Never load on nv proprietary driver */ - if (!drm_fd_is_nouveau(fd)) - return false; -@@ -191,6 +194,7 @@ nouveau_zink_predicate(int fd, const char *driver) - if (!use_zink && !strcmp(driver, "nouveau")) - return true; - return false; -+#endif - } - - diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index f68b9bcc1efa..8ab8261a5e15 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "9.1.1"; + version = "9.1.2"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-qbw5KryI/h+uBddFrYBCQHXxFAhXR1SHdkuIeUKxbVw="; + hash = "sha256-yElmh+ajNVbjhsnNsUtQ3mJw9fvJtXqgS58iow+Nwi8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index ce84718b7579..6c0de9b23fb2 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lance-namespace"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${version}"; - hash = "sha256-OqSaDe0xA1S/KphpwJuIcyOrcT9sq+0oHhiIBtd7bcY="; + hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw="; }; sourceRoot = "${src.name}/python/lance_namespace_urllib3_client"; diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 3c556c1293be..bb5e7c6e50f2 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-Hes5ZDzqbulUxEhuBCcwuOmNDClY8xyzeXbj1FaVvd0="; + hash = "sha256-LzXAGiZQU6wV063bqLTr8S1IDX/j4xHjqmhuFyosCSw="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 71d139909ecc..9caa5976aacb 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-3oC3eVm+RYkn+1OqUU2f/dzV/rY8T7EePDxnE/1t6n4="; + hash = "sha256-xaLC4zzX18lzYNpNJQrx3IXcZ22qQgktzzzgKDef8xE="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/spsdk-pyocd/default.nix b/pkgs/development/python-modules/spsdk-pyocd/default.nix index 1a034344701f..5bdea0a977e0 100644 --- a/pkgs/development/python-modules/spsdk-pyocd/default.nix +++ b/pkgs/development/python-modules/spsdk-pyocd/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "spsdk-pyocd"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; # Latest tag missing on GitHub src = fetchPypi { pname = "spsdk_pyocd"; inherit version; - hash = "sha256-Uu5QbvDd2U9evZiY2Gg4kSPRMGpFBXpxwYVgsa5M/SI="; + hash = "sha256-jvzXu6z9oo2oGoiDgCWWcU3yX/PuWm56MJzIcMWCgTM="; }; build-system = [ diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4f7751ade196..1afc37b6279f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.59"; - hash = "sha256-IvKN4osLSZmMPeQFUZ05W7YLZYS1HLsxDoAFbi7sxKQ="; + version = "6.12.60"; + hash = "sha256-nS9vsdH76q+uUaWXEp3duikX7osVqv7hjBMFNzdtA7o="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.17.9"; - hash = "sha256-M0M8jEflWgGMSUqQ2oEePISaYR5UIJbGrSmphCTIKYI="; + version = "6.17.10"; + hash = "sha256-Y6WsimtxzT6SutR040tUK+fVNnxnACtiyA3DF+iiPVM="; }; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix index 5807c6220f50..ec2dd2328ea1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "lovelace-card-mod"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "thomasloven"; repo = "lovelace-card-mod"; rev = "v${version}"; - hash = "sha256-BXyNXxCSEY0/AUD+6ggTvXPyPQYnAjkEgAVFmui6FAs="; + hash = "sha256-w2ky3jSHRbIaTzl0b0aJq4pzuCNUV8GqYsI2U/eoGfs="; }; - npmDepsHash = "sha256-afIJbUNKKCWckL60cpj4V2SMCOX0Kn56AkVK9t923D0="; + npmDepsHash = "sha256-7VoPQGUQLuQYaB3xAbvv0Ux7kiE/usnIxX2+jYGQXqA="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 153b0a298fe8..f5b7aa7bfe47 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-HvTxuC+qjljFPjRkEjdf+Jy7atpTVtZRU7y05Rcvhps="; + hash = "sha256-vAg45lELCh/oB0h8SWWTUmPGezjODPQAW+fzojIKxy8="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-h3E2dJTdR6b+TwkXPdK0+hrMZ+Zj5b27oMDD413cBKM="; + npmDepsHash = "sha256-xtVf1/K0gqgYYzU0MbPhmWzKRvaDGEMN8ipwVwAmS44="; installPhase = '' runHook preInstall diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4182059b4dc8..bf484a7423cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -762,6 +762,7 @@ mapAliases { jing = jing-trang; # Added 2025-09-18 joplin = joplin-cli; # Added 2025-11-03 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25 + jsduck = throw "jsduck has been removed, as it was broken and and unmaintained upstream."; # Added 2025-12-02 julia_19 = throw "Julia 1.9 has reached its end of life and 'julia_19' has been removed. Please use a supported version."; # Added 2025-10-29 julia_19-bin = throw "Julia 1.9 has reached its end of life and 'julia_19-bin' has been removed. Please use a supported version."; # Added 2025-10-29 k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dc39de2076d..e723390ff4a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6324,8 +6324,6 @@ with pkgs; ]; }; - cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - # Does not actually depend on Qt 5 inherit (plasma5Packages) extra-cmake-modules; @@ -6912,12 +6910,6 @@ with pkgs; c-blosc2 ; - cachix = (lib.getBin haskellPackages.cachix).overrideAttrs (old: { - meta = (old.meta or { }) // { - mainProgram = old.meta.mainProgram or "cachix"; - }; - }); - niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);