diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 65d3880b6908..5f14eedd4c22 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -187,6 +187,8 @@ Users who must continue using ingress-nginx will now need to manually provide the rke2-images-ingress-nginx tarball. - Future Removal: The ingress-nginx chart will not receive any additional updates and will be completely removed in v1.37 for community users. +- `betterdisplay` was updated from version 4.3.4 to 5.x. BetterDisplay v5 [requires macOS 26.3 or later](https://betterdisplay.pro/guide/licensing/v5-upgrade-faq/#compatibility). + - `replaceVarsWith` now enables `strictDeps` and `__structuredAttrs` and passing these attributes to the function is no longer allowed. By extension, `replaceVars` now also enables `strictDeps` and `__structuredAttrs`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f4f48e5c3d72..dc60d1380936 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -953,6 +953,11 @@ matrix = "aiya:catgirl.cloud"; name = "aiya"; }; + aidandenlinger = { + name = "Aidan Denlinger"; + github = "aidandenlinger"; + githubId = 47428697; + }; aietes = { email = "stefan@standa.de"; github = "Aietes"; @@ -1117,6 +1122,12 @@ github = "akho"; githubId = 104951; }; + akirak = { + name = "Akira Komamura"; + email = "akira.komamura@gmail.com"; + github = "akirak"; + githubId = 6270544; + }; akkesm = { name = "Alessandro Barenghi"; email = "alessandro.barenghi@tuta.io"; @@ -16420,6 +16431,12 @@ github = "lenivaya"; githubId = 49302467; }; + lennartmueh = { + email = "lennart@cope.cool"; + github = "lennartmueh"; + githubId = 43172581; + name = "lennart"; + }; lenny = { name = "Lenny."; github = "LennyPenny"; @@ -17958,6 +17975,12 @@ githubId = 34819524; name = "Marcel"; }; + marcg03 = { + email = "marcgrec@tuta.com"; + github = "marcg03"; + githubId = 134197728; + name = "Marc-Alexander Grec"; + }; MarchCraft = { email = "felix@dienilles.de"; github = "MarchCraft"; @@ -20584,6 +20607,11 @@ github = "naurissteins"; githubId = 5653746; }; + naved124 = { + name = "Naved124"; + github = "Naved124"; + githubId = 86107643; + }; naxdy = { name = "Naxdy"; email = "naxdy@naxdy.org"; @@ -24447,6 +24475,11 @@ githubId = 86608952; name = "RAVENz46"; }; + ravi-arnan = { + github = "ravi-arnan"; + githubId = 74779667; + name = "Ravi Arnan Irianto"; + }; rawkode = { email = "david.andrew.mckay@gmail.com"; github = "rawkode"; @@ -24997,12 +25030,6 @@ githubId = 1588935; name = "Rintaro Okamura"; }; - riotbib = { - email = "lennart@cope.cool"; - github = "riotbib"; - githubId = 43172581; - name = "lennart"; - }; ris = { email = "code@humanleg.org.uk"; github = "risicle"; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index c3e322cda9d8..7427d7232f42 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -256,6 +256,8 @@ - `ensure-printers.service` has been replaced with an `ExecStartPost` hook in `cups.service`. If you have made any manual modifications to this unit, you should move the modifications to `cups.service` instead. +- `services.adguardhome` no longer supports `settings.schema_version` values below 23. + - The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module. Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals. diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix index d00c1a6e0952..93f187e4e57b 100644 --- a/nixos/modules/hardware/video/webcam/ipu6.nix +++ b/nixos/modules/hardware/video/webcam/ipu6.nix @@ -118,7 +118,9 @@ in preStart = mkForce '' mkdir -p "$(dirname "$V4L2_DEVICE_FILE")" ${config.boot.kernelPackages.v4l2loopback.bin}/bin/v4l2loopback-ctl \ - add --name "Intel MIPI Camera" --exclusive-caps=1 ${toString cfg.videoDeviceNumber} || [ $? -eq 17 ] + add --name "Intel MIPI Camera" --exclusive-caps=1 \ + --buffers ${toString config.services.v4l2-relayd.instances.ipu6.bufferCount} \ + ${toString cfg.videoDeviceNumber} || [ $? -eq 17 ] echo /dev/video${toString cfg.videoDeviceNumber} > "$V4L2_DEVICE_FILE" ''; postStop = mkForce '' diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index b96513baddc0..47464c318807 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -460,7 +460,6 @@ type = with lib.types; nonEmptyListOf (enum [ - "node20" "node24" ]); default = [ diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 902a4f735b70..01fa8b0226e7 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -1,13 +1,18 @@ { config, + options, lib, pkgs, ... }: let cfg = config.services.adguardhome; + opt = options.services.adguardhome; settingsFormat = pkgs.formats.yaml { }; + defaultHost = "0.0.0.0"; + defaultPort = 3000; + args = lib.concatStringsSep " " ( [ "--no-check-update" @@ -18,25 +23,15 @@ let ++ cfg.extraArgs ); - settings = - if (cfg.settings != null) then - lib.recursiveUpdate cfg.settings ( - if cfg.settings.schema_version < 23 then - { - bind_host = cfg.host; - bind_port = cfg.port; - } - else - { - http = (cfg.settings.http or { }) // { - address = "${cfg.host}:${toString cfg.port}"; - }; - } - ) - else - null; + minimumSchemaVersion = 23; - configFile = (settingsFormat.generate "AdGuardHome.yaml" settings).overrideAttrs (_: { + webPort = + if cfg.settings != null then + lib.toInt (lib.last (lib.splitString ":" cfg.settings.http.address)) + else + defaultPort; + + configFile = (settingsFormat.generate "AdGuardHome.yaml" cfg.settings).overrideAttrs (_: { checkPhase = "${cfg.package}/bin/AdGuardHome -c $out --check-config"; }); in @@ -63,7 +58,7 @@ in }; allowDHCP = lib.mkOption { - default = settings.dhcp.enabled or false; + default = cfg.settings.dhcp.enabled or false; defaultText = lib.literalExpression "config.services.adguardhome.settings.dhcp.enabled or false"; type = bool; description = '' @@ -85,20 +80,16 @@ in ''; }; + # deprecated in favor of `settings.http.address` host = lib.mkOption { - default = "0.0.0.0"; - type = str; - description = '' - Host address to bind HTTP server to. - ''; + type = nullOr str; + default = null; + visible = false; }; - port = lib.mkOption { - default = 3000; - type = port; - description = '' - Port to serve HTTP pages on. - ''; + type = nullOr port; + default = null; + visible = false; }; settings = lib.mkOption { @@ -115,6 +106,14 @@ in Defaults to the `schema_version` supplied by `cfg.package`. ''; }; + + http.address = lib.mkOption { + default = "${defaultHost}:${toString defaultPort}"; + type = str; + description = '' + Address to serve the web interface on, in the `host:port` format. + ''; + }; }; }); description = '' @@ -144,26 +143,44 @@ in }; config = lib.mkIf cfg.enable { + warnings = + lib.concatMap + ( + name: + lib.optional (cfg.${name} != null) '' + The option `services.adguardhome.${name}' defined in ${ + lib.showFiles opt.${name}.files + } is deprecated, set `services.adguardhome.settings.http.address' instead. + '' + ) + [ + "host" + "port" + ]; + + services.adguardhome.settings = lib.mkIf (cfg.host != null || cfg.port != null) { + http.address = "${lib.defaultTo defaultHost cfg.host}:${toString (lib.defaultTo defaultPort cfg.port)}"; + }; + assertions = [ { - assertion = cfg.settings != null -> !(lib.hasAttrByPath [ "bind_host" ] cfg.settings); - message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.host'"; - } - { - assertion = cfg.settings != null -> !(lib.hasAttrByPath [ "bind_port" ] cfg.settings); - message = "AdGuard option `settings.bind_port' has been superseded by `services.adguardhome.port'"; + assertion = cfg.settings != null -> cfg.settings.schema_version >= minimumSchemaVersion; + message = "AdGuard option `settings.schema_version' must be at least ${toString minimumSchemaVersion}"; } { assertion = - settings != null -> cfg.mutableSettings || lib.hasAttrByPath [ "dns" "bootstrap_dns" ] settings; + cfg.settings != null + -> cfg.mutableSettings || lib.hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings; message = "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration"; } { assertion = - settings != null + cfg.settings != null -> cfg.mutableSettings - || lib.hasAttrByPath [ "dns" "bootstrap_dns" ] settings && lib.isList settings.dns.bootstrap_dns; + || + lib.hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings + && lib.isList cfg.settings.dns.bootstrap_dns; message = "AdGuard setting dns.bootstrap_dns needs to be a list"; } ]; @@ -184,7 +201,7 @@ in chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" ''; in - lib.optionalString (settings != null) ( + lib.optionalString (cfg.settings != null) ( if cfg.mutableSettings then '' if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ]; then @@ -249,6 +266,6 @@ in }; }; - networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ webPort ]; }; } diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix index f6e347e2729f..c1156a269d39 100644 --- a/nixos/modules/services/system/automatic-timezoned.nix +++ b/nixos/modules/services/system/automatic-timezoned.nix @@ -6,6 +6,33 @@ }: let cfg = config.services.automatic-timezoned; + commonHardening = { + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + RemoveIPC = true; + UMask = "0077"; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + ProtectKernelModules = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + ProtectKernelLogs = true; + ProtectClock = true; + RestrictAddressFamilies = [ "AF_UNIX" ]; + PrivateNetwork = true; + LockPersonality = true; + ProtectHostname = true; + RestrictRealtime = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + RestrictNamespaces = true; + }; in { options = { @@ -65,7 +92,8 @@ in Type = "exec"; User = "automatic-timezoned"; ExecStart = "${cfg.package}/bin/automatic-timezoned"; - }; + } + // commonHardening; wantedBy = [ "multi-user.target" ]; }; @@ -78,8 +106,8 @@ in User = "automatic-timezoned"; ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; Restart = "on-failure"; - PrivateTmp = true; - }; + } + // commonHardening; }; }; diff --git a/nixos/modules/services/video/v4l2-relayd.nix b/nixos/modules/services/video/v4l2-relayd.nix index 654c4a0aa272..c72a3cc2f52f 100644 --- a/nixos/modules/services/video/v4l2-relayd.nix +++ b/nixos/modules/services/video/v4l2-relayd.nix @@ -52,6 +52,15 @@ let ''; }; + bufferCount = mkOption { + type = types.ints.positive; + default = 8; + description = '' + How many buffers to allocate for the v4l2loopback device. + The program default of 2 is not enough for consuming GStreamer. + ''; + }; + cardLabel = mkOption { type = types.str; description = '' @@ -159,11 +168,15 @@ in serviceConfig = { Type = "simple"; Restart = "always"; + RestartSec = "1s"; PrivateNetwork = true; PrivateTmp = true; LimitNPROC = 1; }; + # the relay exits whenever its last consumer goes, so restarts are routine + startLimitIntervalSec = 0; + environment = { GST_PLUGIN_PATH = makeSearchPathOutput "lib" "lib/gstreamer-1.0" (gst ++ instance.extraPackages); V4L2_DEVICE_FILE = "/run/v4l2-relayd-${instance.name}/device"; @@ -195,7 +208,7 @@ in preStart = '' mkdir -p $(dirname $V4L2_DEVICE_FILE) - ${kernelPackages.v4l2loopback.bin}/bin/v4l2loopback-ctl add -x 1 -n "${instance.cardLabel}" > $V4L2_DEVICE_FILE + ${kernelPackages.v4l2loopback.bin}/bin/v4l2loopback-ctl add -x 1 -b ${toString instance.bufferCount} -n "${instance.cardLabel}" > $V4L2_DEVICE_FILE ''; postStop = '' diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index e8d3f26feee2..b5825ed35439 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -980,7 +980,7 @@ in description = '' A set of NixOS system configurations to be run as lightweight containers. Each container appears as a service - `container-«name»` + `container@«name»` on the host system, allowing it to be started and stopped via {command}`systemctl`. ''; diff --git a/nixos/tests/adguardhome.nix b/nixos/tests/adguardhome.nix index ab115e5db564..37d436a5fc91 100644 --- a/nixos/tests/adguardhome.nix +++ b/nixos/tests/adguardhome.nix @@ -14,11 +14,12 @@ }; }; - schemaVersionBefore23 = { + deprecatedHostPortConf = { services.adguardhome = { enable = true; - settings.schema_version = 20; + host = "127.0.0.1"; + port = 12345; }; }; @@ -34,12 +35,11 @@ services.adguardhome = { enable = true; - host = "127.0.0.1"; mutableSettings = false; - port = 43074; settings = { dns.bootstrap_dns = [ "127.0.0.1" ]; http.doh.insecure_enabled = true; + http.address = "127.0.0.1:43074"; }; }; }; @@ -131,9 +131,12 @@ emptyConf.wait_for_unit("adguardhome.service") emptyConf.wait_for_open_port(3000) - with subtest("Default schema_version 23 config test"): - schemaVersionBefore23.wait_for_unit("adguardhome.service") - schemaVersionBefore23.wait_for_open_port(3000) + with subtest("Only setting the deprecated port option works"): + deprecatedHostPortConf.wait_for_unit("adguardhome.service") + deprecatedHostPortConf.wait_for_open_port(12345) + deprecatedHostPortConf.succeed( + "grep -qFx ' address: 127.0.0.1:12345' /var/lib/AdGuardHome/AdGuardHome.yaml" + ) with subtest("Logging to syslog test"): # AdGuard is expected to fail when it cannot connect to syslog diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index 520cbc83999f..50cfb1f515a8 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -62,13 +62,16 @@ nspr, nss, pango, + pciutils, pipewire, snappy, + speechd-minimal, udev, wayland, xdg-utils, coreutils, libxcb, + vulkan-loader, zlib, # Darwin dependencies undmg, @@ -86,7 +89,6 @@ enableVideoAcceleration ? libvaSupport, # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API vulkanSupport ? false, - addDriverRunpath, enableVulkan ? vulkanSupport, }: @@ -150,13 +152,16 @@ let nspr nss pango + pciutils # ANGLE dlopens libpci to identify GPUs, including for VA-API device selection. pipewire udev wayland libxcb zlib snappy + speechd-minimal # Text-to-speech through speech-dispatcher (--enable-speech-dispatcher). libkrb5 + vulkan-loader # Chromium and Dawn dlopen libvulkan.so.1 by name. qt6.qtbase ] ++ optional pulseSupport libpulseaudio @@ -263,6 +268,11 @@ stdenv.mkDerivation { ln -s $out/opt/brave.com/${optName}/product_logo_''${icon}.png $out/share/icons/hicolor/''${icon}x''${icon}/apps/${fileBase}.png done + # ANGLE loads this copy by absolute path; the NixOS-patched loader finds ICDs + # under /run/opengl-driver, the bundled one does not. + rm $out/opt/brave.com/${optName}/libvulkan.so.1 + ln -s ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 $out/opt/brave.com/${optName}/libvulkan.so.1 + # Replace xdg-settings and xdg-mime ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/${optName}/xdg-settings ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/${optName}/xdg-mime @@ -300,9 +310,6 @@ stdenv.mkDerivation { --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" ''} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" - ${optionalString vulkanSupport '' - --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" - ''} --add-flags ${escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/by-name/an/anki/addons/crowdanki/default.nix b/pkgs/by-name/an/anki/addons/crowdanki/default.nix new file mode 100644 index 000000000000..186b7d7e6d5a --- /dev/null +++ b/pkgs/by-name/an/anki/addons/crowdanki/default.nix @@ -0,0 +1,52 @@ +{ + lib, + anki, + anki-utils, + fetchFromGitHub, +}: +let + pythonEnv = anki.python.withPackages ( + ps: with ps; [ + cached-property + dulwich + pyfunctional + pygtrie + pyyaml + ] + ); +in +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "crowdanki"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "stvad"; + repo = "crowdanki"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j6yucnZF/Q04+KFGX3+FGs9DojAx0Xc50055f/eprqU="; + }; + + sourceRoot = "${finalAttrs.src.name}/crowd_anki"; + + preInstall = "ln -s ${pythonEnv}/${anki.python.sitePackages} dist"; + + meta = { + description = "Facilitate cooperation on creation of Anki notes and decks"; + longDescription = '' + This add-on must have its snapshot_path configured. + + Example: + + ```nix + pkgs.ankiAddons.crowdanki.withConfig { + config = { + snapshot_path = "/home/user/.local/share/crowdanki"; + }; + } + ``` + ''; + homepage = "https://github.com/stvad/crowdanki"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcg03 ]; + }; +}) diff --git a/pkgs/by-name/an/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix index 7645d7a9967a..68cda18fc101 100644 --- a/pkgs/by-name/an/anki/addons/default.nix +++ b/pkgs/by-name/an/anki/addons/default.nix @@ -12,6 +12,8 @@ anki-quizlet-importer-extended = callPackage ./anki-quizlet-importer-extended { }; + crowdanki = callPackage ./crowdanki { }; + fsrs4anki-helper = callPackage ./fsrs4anki-helper { }; image-occlusion-enhanced = callPackage ./image-occlusion-enhanced { }; diff --git a/pkgs/by-name/an/anki/package.nix b/pkgs/by-name/an/anki/package.nix index d53ca31f1ce4..4b934a58628d 100644 --- a/pkgs/by-name/an/anki/package.nix +++ b/pkgs/by-name/an/anki/package.nix @@ -15,7 +15,6 @@ jq, protobuf_31, python3, - python3Packages, qt6, rsync, rustPlatform, @@ -36,6 +35,7 @@ let yarn-berry = yarn-berry_4; + python = python3; pname = "anki"; version = "26.08"; @@ -45,7 +45,7 @@ let cargoHash = "sha256-LQ5uD86ZOKXy9vGbTqPBi3Q57PZEjwQkbHR94QAIVMg="; yarnHash = "sha256-mpHGclmQxFqiIuZWFTOYBKQW24ugSVhQiYMTmyyk/n4="; pythonDeps = - with python3Packages; + with python.pkgs; [ # anki (pylib) runtime deps decorator @@ -136,7 +136,7 @@ let ); in -python3Packages.buildPythonApplication (finalAttrs: { +python.pkgs.buildPythonApplication (finalAttrs: { pyproject = false; inherit pname version; @@ -183,7 +183,7 @@ python3Packages.buildPythonApplication (finalAttrs: { jq ninja nodejs - python3Packages.mypy-protobuf + python.pkgs.mypy-protobuf qt6.wrapQtAppsHook rsync rustPlatform.cargoSetupHook @@ -203,7 +203,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python.pkgs; [ pytest pytest-mock mock @@ -232,7 +232,7 @@ python3Packages.buildPythonApplication (finalAttrs: { OFFLINE_BUILD = "1"; NODE_BINARY = lib.getExe nodejs; PROTOC_BINARY = lib.getExe protobuf_31; - PYTHON_BINARY = lib.getExe python3; + PYTHON_BINARY = lib.getExe python; UV_BINARY = lib.getExe uv; UV_NO_MANAGED_PYTHON = "1"; UV_SYSTEM_PYTHON = true; @@ -248,7 +248,7 @@ python3Packages.buildPythonApplication (finalAttrs: { mkdir -p out/pylib/anki .git echo ${builtins.substring 0 8 rev} > out/buildhash - echo ${python3.version} > .python-version + echo ${python.version} > .python-version # Setup the python environment. # We use nixpkgs python packages (via UV_FIND_LINKS), whose versions may @@ -271,14 +271,14 @@ python3Packages.buildPythonApplication (finalAttrs: { # anki's build tooling expects python and protoc-gen-mypy in pyenv mkdir -p ./out/pyenv/bin ln -sf $PYTHON_BINARY ./out/pyenv/bin/python - ln -sf ${lib.getExe python3Packages.mypy-protobuf} ./out/pyenv/bin/protoc-gen-mypy + ln -sf ${lib.getExe python.pkgs.mypy-protobuf} ./out/pyenv/bin/protoc-gen-mypy mv node_modules out # And finally build patchShebangs ./ninja - export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python3.sitePackages} + export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python.sitePackages} # Necessary for yarn to not complain about 'corepack' jq 'del(.packageManager)' package.json > package.json.tmp && mv package.json.tmp package.json YARN_BINARY="${lib.getExe noInstallYarn}" PIP_USER=1 \ @@ -307,7 +307,7 @@ python3Packages.buildPythonApplication (finalAttrs: { in '' runHook preCheck - export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python3.sitePackages} + export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python.sitePackages} ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib \ pytest -p no:cacheprovider pylib/tests -k ${disabledTestsString} ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib:$PWD/pylib:$PWD/out/qt \ @@ -345,11 +345,12 @@ python3Packages.buildPythonApplication (finalAttrs: { ${lib.optionalString stdenv.hostPlatform.isLinux ''"''${gappsWrapperArgs[@]}"''} "''${qtWrapperArgs[@]}" --prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin" - --prefix PYTHONPATH ':' "$lib/${python3.sitePackages}" + --prefix PYTHONPATH ':' "$lib/${python.sitePackages}" ) ''; passthru = { + inherit python; withAddons = ankiAddons: callPackage ./with-addons.nix { inherit ankiAddons; }; tests.anki-sync-server = nixosTests.anki-sync-server; }; diff --git a/pkgs/by-name/ap/applesauce/package.nix b/pkgs/by-name/ap/applesauce/package.nix index 00d0c49e8752..befea3fe4e15 100644 --- a/pkgs/by-name/ap/applesauce/package.nix +++ b/pkgs/by-name/ap/applesauce/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "applesauce"; - version = "0.5.21"; + version = "0.5.30"; src = fetchFromGitHub { owner = "Dr-Emann"; repo = "applesauce"; tag = "applesauce-cli-v${finalAttrs.version}"; - hash = "sha256-Dd1gfjtg1kEXyDakIoAkbu+iiRafykPO39z7tMJylkM="; + hash = "sha256-YDgRDVy5/x8ccJtV3v3YKqAQJVP7vMgNY5n5uFGJR2I="; }; - cargoHash = "sha256-fx/D5Bt5YKySJXZRBHlJlAiFWu5++JXgHK1jSKvWEiA="; + cargoHash = "sha256-hpcPoNLQya4ufXbkbxzm1T3aUXyk1jdAiTrxKtfbQx8="; meta = { description = "Transparent compression for Apple File System Compression (AFSC)"; diff --git a/pkgs/by-name/as/ashpd-demo/package.nix b/pkgs/by-name/as/ashpd-demo/package.nix index 8b986b420188..d4db568701ff 100644 --- a/pkgs/by-name/as/ashpd-demo/package.nix +++ b/pkgs/by-name/as/ashpd-demo/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool for playing with XDG desktop portals"; mainProgram = "ashpd-demo"; - homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/main/demo/client"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index d4fdcfb2b16c..7d455155a83b 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "avbroot"; - version = "3.34.1"; + version = "3.35.0"; src = fetchFromGitHub { owner = "chenxiaolong"; repo = "avbroot"; tag = "v${version}"; - hash = "sha256-iw06eQOSbWQBIBqmmQ/07stGLIDv41odD3yf7ODoLBU="; + hash = "sha256-nABKXXnsLRLo/+h0q/AUy+tXBoHNNmaLe41N6KNdl14="; }; - cargoHash = "sha256-63fmeZMazvSRjXqdO0l+go98DIWER60U3bDSp9jc+kQ="; + cargoHash = "sha256-ZEkt9E5+EejKXEd0OhYRMNzXN+MlFXMp9lWAYODHrc4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index 38f5ca39b283..91aa990c7100 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "betterdisplay"; - version = "4.3.4"; + version = "5.1.1"; src = fetchurl { url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg"; - hash = "sha256-I0Ei9+TsbmsA6iFD1CwScgrU7OO9mL3fl3/uvCYS4JI="; + hash = "sha256-UzzgjJGgLg/corwORhQEloqxjTK72f0zFCGOGo1Rwd4="; }; dontPatch = true; diff --git a/pkgs/by-name/bo/bore/package.nix b/pkgs/by-name/bo/bore/package.nix index 69926bd69aa2..09eef10efb56 100644 --- a/pkgs/by-name/bo/bore/package.nix +++ b/pkgs/by-name/bo/bore/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "delan"; repo = "nonymous"; rev = "${pname}-${version}"; - sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; + hash = "sha256-qYFRUWSMy6xkBjHp+Y2hS+GWzsCGtbBnJvKh0E63trk="; }; cargoHash = "sha256-6uIqvX50XoWCPQ8u38rUdi4LwtMTBcNuefNmzGY+vLU="; diff --git a/pkgs/by-name/bu/budslink/package.nix b/pkgs/by-name/bu/budslink/package.nix new file mode 100644 index 000000000000..2c38885ab4e6 --- /dev/null +++ b/pkgs/by-name/bu/budslink/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + gettext, + glib, + gtk4, + libadwaita, + gjs, + libpulseaudio, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "budslink"; + version = "0.2.1"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "maniacx"; + repo = "BudsLink"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bOVymVN9WoGUKvYUZ93OcIu3Avw1ybmAK3W4uViXzQc="; + }; + + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "get_option('libdir'), APP_ID)" "get_option('libdir'))" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + gettext + gjs + ]; + + buildInputs = [ + glib + libadwaita + libpulseaudio + ]; + + meta = { + description = "Feature control and battery monitoring for Bluetooth earbuds"; + homepage = "https://github.com/maniacx/BudsLink"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "budslink"; + }; +}) diff --git a/pkgs/by-name/ca/cavalier/deps.json b/pkgs/by-name/ca/cavalier/deps.json deleted file mode 100644 index 20b91bf7012b..000000000000 --- a/pkgs/by-name/ca/cavalier/deps.json +++ /dev/null @@ -1,197 +0,0 @@ -[ - { - "pname": "Ace4896.DBus.Services.Secrets", - "version": "1.2.0", - "sha256": "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn" - }, - { - "pname": "Cake.Tool", - "version": "4.0.0", - "sha256": "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2" - }, - { - "pname": "CommandLineParser", - "version": "2.9.1", - "sha256": "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582" - }, - { - "pname": "GetText.NET", - "version": "1.9.14", - "sha256": "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094" - }, - { - "pname": "GirCore.Adw-1", - "version": "0.5.0-preview.3", - "sha256": "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l" - }, - { - "pname": "GirCore.Cairo-1.0", - "version": "0.5.0-preview.3", - "sha256": "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k" - }, - { - "pname": "GirCore.FreeType2-2.0", - "version": "0.5.0-preview.3", - "sha256": "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy" - }, - { - "pname": "GirCore.Gdk-4.0", - "version": "0.5.0-preview.3", - "sha256": "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g" - }, - { - "pname": "GirCore.GdkPixbuf-2.0", - "version": "0.5.0-preview.3", - "sha256": "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0" - }, - { - "pname": "GirCore.Gio-2.0", - "version": "0.5.0-preview.3", - "sha256": "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs" - }, - { - "pname": "GirCore.GLib-2.0", - "version": "0.5.0-preview.3", - "sha256": "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza" - }, - { - "pname": "GirCore.GObject-2.0", - "version": "0.5.0-preview.3", - "sha256": "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3" - }, - { - "pname": "GirCore.Graphene-1.0", - "version": "0.5.0-preview.3", - "sha256": "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww" - }, - { - "pname": "GirCore.Gsk-4.0", - "version": "0.5.0-preview.3", - "sha256": "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj" - }, - { - "pname": "GirCore.Gtk-4.0", - "version": "0.5.0-preview.3", - "sha256": "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg" - }, - { - "pname": "GirCore.HarfBuzz-0.0", - "version": "0.5.0-preview.3", - "sha256": "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky" - }, - { - "pname": "GirCore.Pango-1.0", - "version": "0.5.0-preview.3", - "sha256": "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia" - }, - { - "pname": "GirCore.PangoCairo-1.0", - "version": "0.5.0-preview.3", - "sha256": "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9" - }, - { - "pname": "Markdig", - "version": "0.33.0", - "sha256": "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r" - }, - { - "pname": "Meziantou.Framework.Win32.CredentialManager", - "version": "1.4.5", - "sha256": "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738" - }, - { - "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.0", - "sha256": "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "5.0.0", - "sha256": "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6" - }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "8.0.0", - "sha256": "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i" - }, - { - "pname": "Nickvision.Aura", - "version": "2023.11.4", - "sha256": "0gasyglp1pgi0s6zqzmbm603j3j36vvr68grv6g93fdj2vjlmkxs" - }, - { - "pname": "Octokit", - "version": "9.0.0", - "sha256": "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5" - }, - { - "pname": "SkiaSharp", - "version": "2.88.6", - "sha256": "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b" - }, - { - "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.6", - "sha256": "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n" - }, - { - "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.6", - "sha256": "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf" - }, - { - "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.6", - "sha256": "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n" - }, - { - "pname": "SQLitePCLRaw.bundle_e_sqlcipher", - "version": "2.1.6", - "sha256": "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila" - }, - { - "pname": "SQLitePCLRaw.core", - "version": "2.1.6", - "sha256": "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7" - }, - { - "pname": "SQLitePCLRaw.lib.e_sqlcipher", - "version": "2.1.6", - "sha256": "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z" - }, - { - "pname": "SQLitePCLRaw.provider.e_sqlcipher", - "version": "2.1.6", - "sha256": "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq" - }, - { - "pname": "System.Drawing.Common", - "version": "8.0.0", - "sha256": "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4" - }, - { - "pname": "System.IO.Pipelines", - "version": "6.0.0", - "sha256": "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65" - }, - { - "pname": "System.Memory", - "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "sha256": "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h" - }, - { - "pname": "Tmds.DBus", - "version": "0.15.0", - "sha256": "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6" - }, - { - "pname": "Tmds.DBus.Protocol", - "version": "0.15.0", - "sha256": "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2" - } -] diff --git a/pkgs/by-name/ca/cavalier/package.nix b/pkgs/by-name/ca/cavalier/package.nix deleted file mode 100644 index a93b3fe01f2c..000000000000 --- a/pkgs/by-name/ca/cavalier/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - buildDotnetModule, - dotnetCorePackages, - fetchFromGitHub, - pkg-config, - blueprint-compiler, - glib, - gtk4, - libadwaita, - wrapGAppsHook4, - appstream-glib, - desktop-file-utils, - cava, - libGL, -}: - -buildDotnetModule rec { - pname = "cavalier"; - version = "2024.1.0"; - - src = fetchFromGitHub { - owner = "NickvisionApps"; - repo = "Cavalier"; - tag = version; - hash = "sha256-SFhEKtYrlnkbLMnxU4Uf4jnFsw0MJHstgZgLLnGC2d8="; - }; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - - projectFile = "NickvisionCavalier.GNOME/NickvisionCavalier.GNOME.csproj"; - nugetDeps = ./deps.json; - executables = "NickvisionCavalier.GNOME"; - - nativeBuildInputs = [ - pkg-config - blueprint-compiler - wrapGAppsHook4 - appstream-glib - desktop-file-utils - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - ]; - - runtimeDeps = [ - glib - gtk4 - libadwaita - libGL - ]; - - postInstall = '' - substituteInPlace NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in \ - --replace-fail '@EXEC@' "NickvisionCavalier.GNOME" - install -Dm444 NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in -T $out/share/applications/org.nickvision.cavalier.desktop - install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier.svg -t $out/share/icons/hicolor/scalable/apps/ - install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/ - ''; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ cava ]}" ]; - - passthru.updateScript = ./update.sh; - - meta = { - description = "Visualize audio with CAVA"; - homepage = "https://github.com/NickvisionApps/Cavalier"; - mainProgram = "NickvisionCavalier.GNOME"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ zendo ]; - }; -} diff --git a/pkgs/by-name/ca/cavalier/update.sh b/pkgs/by-name/ca/cavalier/update.sh deleted file mode 100755 index 2bee1f7f5043..000000000000 --- a/pkgs/by-name/ca/cavalier/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -#shellcheck shell=bash - -set -eu -o pipefail - -version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/NickvisionApps/Cavalier/releases/latest | jq -e -r .tag_name) -old_version=$(nix-instantiate --eval --raw -A cavalier.version) - -if [[ $version == "$old_version" ]]; then - echo "New version same as old version, nothing to do." >&2 - exit 0 -fi - -update-source-version cavalier "$version" - -$(nix-build -A cavalier.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix" diff --git a/pkgs/by-name/co/cogitator/package.nix b/pkgs/by-name/co/cogitator/package.nix index d9fef39b7a5a..87029485cba0 100644 --- a/pkgs/by-name/co/cogitator/package.nix +++ b/pkgs/by-name/co/cogitator/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - checkFlagsArray = [ + checkFlags = [ # Tests are broken "--skip=proxy_guard::tests::relative_uri_no_host_header_falls_back_to_tunnel_host" "--skip=spider::tests::audit_html_flags_potential_token_leak_without_panicking" diff --git a/pkgs/by-name/co/contour/dont-fix-app-bundle.diff b/pkgs/by-name/co/contour/dont-fix-app-bundle.diff deleted file mode 100644 index e5f8bb44c50c..000000000000 --- a/pkgs/by-name/co/contour/dont-fix-app-bundle.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt -index 92afdf31..19416460 100644 ---- a/src/contour/CMakeLists.txt -+++ b/src/contour/CMakeLists.txt -@@ -496,11 +496,11 @@ elseif(APPLE) - endforeach() - - include(BundleUtilities) -- fixup_bundle( -- \"${BUNDLE_APP}\" -- \"\${PLUGIN_PATHS}\" -- \"${LIBS_SEARCH_DIRS}\" -- ) -+ # fixup_bundle( -+ # \"${BUNDLE_APP}\" -+ # \"\${PLUGIN_PATHS}\" -+ # \"${LIBS_SEARCH_DIRS}\" -+ # ) - - # Post-fix libqcocoa.dylib platform plugin's rpath, - # The already provided rpath (@loader_path/../../../../lib) does not work diff --git a/pkgs/by-name/co/contour/link-qtquick.patch b/pkgs/by-name/co/contour/link-qtquick.patch new file mode 100644 index 000000000000..8e1d03d5b25d --- /dev/null +++ b/pkgs/by-name/co/contour/link-qtquick.patch @@ -0,0 +1,12 @@ +diff --git a/src/contour/platform/CMakeLists.txt b/src/contour/platform/CMakeLists.txt +index 11b46c61..12aed902 100644 +--- a/src/contour/platform/CMakeLists.txt ++++ b/src/contour/platform/CMakeLists.txt +@@ -71,6 +71,7 @@ target_link_libraries(contour_platform PUBLIC + Qt6::Core + Qt6::DBus + Qt6::Gui ++ Qt6::Quick + Qt6::Multimedia + ) + diff --git a/pkgs/by-name/co/contour/macos-deploy-toggle.patch b/pkgs/by-name/co/contour/macos-deploy-toggle.patch new file mode 100644 index 000000000000..65ca52f25598 --- /dev/null +++ b/pkgs/by-name/co/contour/macos-deploy-toggle.patch @@ -0,0 +1,58 @@ +--- a/src/contour/CMakeLists.txt ++++ b/src/contour/CMakeLists.txt +@@ -24,6 +24,8 @@ + set(CONTOUR_MACOS_APP_BUNDLE ON) + endif() + ++option(CONTOUR_MACOS_DEPLOY "Run macdeployqt + prune/verify/sign on the macOS app bundle" ON) ++ + NumberToHex(${PROJECT_VERSION_MAJOR} HEX_MAJOR) + NumberToHex(${PROJECT_VERSION_MINOR} HEX_MINOR) + NumberToHex(${PROJECT_VERSION_PATCH} HEX_PATCH) +@@ -174,7 +176,7 @@ + add_subdirectory(display) + endif() + +-if(CONTOUR_MACOS_APP_BUNDLE) ++if(CONTOUR_MACOS_APP_BUNDLE AND CONTOUR_MACOS_DEPLOY) + #set(CMAKE_INSTALL_RPATH "@executable_path") + set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") + # vcpkg gives its dylibs an `@rpath/libfoo.dylib` install name, and macdeployqt expands +@@ -930,7 +932,9 @@ + # verifies, signs and notarizes the bundle, so without an interpreter there is no way + # to produce a distributable artifact at all. Failing at configure time beats failing + # halfway through an install. +- find_package(Python3 COMPONENTS Interpreter REQUIRED) ++ if(CONTOUR_MACOS_DEPLOY) ++ find_package(Python3 COMPONENTS Interpreter REQUIRED) ++ endif() + endif() + # }}} + +@@ -975,7 +979,7 @@ + set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix_patch.xml") + set(CPACK_WIX_PROPERTY_WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT "Launch Contour") + endif() +-if(CONTOUR_MACOS_APP_BUNDLE) ++if(CONTOUR_MACOS_APP_BUNDLE AND CONTOUR_MACOS_DEPLOY) + set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/res/images/contour-logo.icns") + set(CPACK_DMG_VOLUME_NAME "Contour") + +@@ -1054,7 +1058,8 @@ + RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}" COMPONENT Runtime + ) + +- include(DeployQt) # Just to get access to ${MACDEPLOYQT_EXECUTABLE} ++ if(CONTOUR_MACOS_DEPLOY) ++ include(DeployQt) + get_filename_component(_macdeployqt_path "${MACDEPLOYQT_EXECUTABLE}" PATH) + message(STATUS "macdeployqt location: ${MACDEPLOYQT_EXECUTABLE}") + +@@ -1130,6 +1135,7 @@ + COMMAND_ERROR_IS_FATAL ANY + ) + ") ++ endif() + else() + # Any other Unix -- and, since the branch above now takes only bundle builds, a GUI-less macOS + # build too. That one produces a plain command-line binary, so it installs like any other Unix diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 2bd48c0e14b6..2656846bbfea 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + llvmPackages, fetchFromGitHub, cmake, pkg-config, @@ -28,22 +29,31 @@ stdenv.mkDerivation (finalAttrs: { pname = "contour"; - version = "0.6.3.8249"; + version = "0.7.0.8982"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; tag = "v${finalAttrs.version}"; - hash = "sha256-+rr1bn4O5v9rXyoIx+ejL+qe5Kf2bFpgWA3DkWRcDYk="; + hash = "sha256-sY3qNaYsoYY6Ox5W7F2WHFHId89WbeGJ4fWs2PFQmNk="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - ./dont-fix-app-bundle.diff - ./remove-deep-flag-from-codesign.diff - ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-L${lib.getLib llvmPackages.libcxx}/lib"; + }; # Dependencies are already managed by nix - cmakeFlags = [ "-DCONTOUR_USE_CPM=OFF" ]; + cmakeFlags = [ + "-DCONTOUR_USE_CPM=OFF" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCONTOUR_MACOS_DEPLOY=OFF" + ]; + + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + ./link-qtquick.patch + ./macos-deploy-toggle.patch + ]; outputs = [ "out" @@ -99,6 +109,10 @@ stdenv.mkDerivation (finalAttrs: { echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + /usr/bin/codesign --force --sign - $out/Applications/contour.app + ''; + passthru.tests.test = nixosTests.terminal-emulators.contour; meta = { diff --git a/pkgs/by-name/co/contour/remove-deep-flag-from-codesign.diff b/pkgs/by-name/co/contour/remove-deep-flag-from-codesign.diff deleted file mode 100644 index c4166b41d963..000000000000 --- a/pkgs/by-name/co/contour/remove-deep-flag-from-codesign.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/remove-deep-flag-from-codesign.diff b/remove-deep-flag-from-codesign.diff -new file mode 100644 -index 0000000000..e69de29bb2 -diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt -index 3c7ac83720..55e6830bfc 100644 ---- a/src/contour/CMakeLists.txt -+++ b/src/contour/CMakeLists.txt -@@ -510,7 +510,7 @@ - # Ensure code signature - execute_process( - WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" -- COMMAND codesign --force --deep --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}\" -+ COMMAND codesign --force --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}/Contents/MacOS/contour\" - ) - ") - else() diff --git a/pkgs/by-name/cu/cups-dymo/package.nix b/pkgs/by-name/cu/cups-dymo/package.nix index dc6162fd8a75..775d6f5763c6 100644 --- a/pkgs/by-name/cu/cups-dymo/package.nix +++ b/pkgs/by-name/cu/cups-dymo/package.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://www.dymo.com/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ makefu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix index 4f8c073bb184..69e55e1e193d 100644 --- a/pkgs/by-name/cw/cwtch-ui/package.nix +++ b/pkgs/by-name/cw/cwtch-ui/package.nix @@ -12,12 +12,12 @@ }: let - version = "1.17.1"; + version = "1.17.2"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui"; tag = "v${version}"; - hash = "sha256-oWU3E1WM/gzOcW4c0pdXbEhiHIivItZx0FiZ/LZZQu8="; + hash = "sha256-UA3XDAo1kiKnCvB2en4y+L5tgtD18+DsmTnaL8OY5+c="; }; in flutter344.buildFlutterApplication { diff --git a/pkgs/by-name/cw/cwtch-ui/pubspec.lock.json b/pkgs/by-name/cw/cwtch-ui/pubspec.lock.json index 67d05f240edf..e66022aee81c 100644 --- a/pkgs/by-name/cw/cwtch-ui/pubspec.lock.json +++ b/pkgs/by-name/cw/cwtch-ui/pubspec.lock.json @@ -24,11 +24,11 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", + "sha256": "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.9" + "version": "4.3.0" }, "args": { "dependency": "transitive", @@ -74,21 +74,21 @@ "dependency": "transitive", "description": { "name": "build_config", - "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae", + "sha256": "d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.3" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78", + "sha256": "e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.2" + "version": "4.1.6" }, "build_runner": { "dependency": "direct dev", @@ -104,21 +104,21 @@ "dependency": "transitive", "description": { "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "sha256": "44922ecebd8e3d0cef743dadd3b54df4e87e2a4c52a29465a1872aa9e192caa8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.1" + "version": "5.1.2" }, "built_value": { "dependency": "transitive", "description": { "name": "built_value", - "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", + "sha256": "f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.6" + "version": "8.13.0" }, "characters": { "dependency": "transitive", @@ -154,11 +154,11 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "5909d2c6b66817222779e1eedc19e0e28b76d1df7bd9856a4792ccb9881df358", + "sha256": "89b8801ba49f8b593fbf2d3e59efd0f566c46cd4ba6837ae2610c72b52a0f899", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.6.0" }, "clock": { "dependency": "transitive", @@ -244,11 +244,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51", + "sha256": "f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+4" + "version": "0.3.5+5" }, "crypto": { "dependency": "direct main", @@ -284,11 +284,11 @@ "dependency": "direct main", "description": { "name": "dbus", - "sha256": "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645", + "sha256": "a48d5da28e89bd02196e80d81ed8d7954923d00a0f4a68cc20b575038f023383", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.14" + "version": "0.7.15" }, "fake_async": { "dependency": "transitive", @@ -377,11 +377,11 @@ "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "a0d7141f14cabcee42967470a858dfc99dd6cfb70d3cab404bacfcafa9e84e70", + "sha256": "357be7ff996dc272e2037c69c1bdd5d1bd21172219d55f8bd2e11aeea602e6d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "22.0.1" + "version": "22.3.1" }, "flutter_local_notifications_linux": { "dependency": "transitive", @@ -397,11 +397,11 @@ "dependency": "transitive", "description": { "name": "flutter_local_notifications_platform_interface", - "sha256": "ff0013eae795e8dc8fad4a8992a209e64d3ba2fbd8bf5e43c36bf448f95bd814", + "sha256": "43c3761d916c9bd3d5c7ebbc44d82f4990329840c0c5d62ad5260cc1b5d399bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.0" + "version": "12.2.0" }, "flutter_local_notifications_web": { "dependency": "transitive", @@ -471,11 +471,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "568d62f0e68666fb5d95519743b3c24a34c7f19d834b0658c46e26d778461f66", + "sha256": "2b5c6b077aad30bba9782178baff6076a2044141f1d5f2f15b43bca3fbe74874", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.1" + "version": "9.3.0" }, "gherkin": { "dependency": "direct overridden", @@ -491,11 +491,11 @@ "dependency": "direct main", "description": { "name": "glob", - "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "sha256": "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.2.0" }, "graphs": { "dependency": "transitive", @@ -551,11 +551,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce", + "sha256": "a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.0" + "version": "4.10.1" }, "integration_test": { "dependency": "transitive", @@ -577,31 +577,41 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "sha256": "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.1.0" }, "jni": { "dependency": "transitive", "description": { "name": "jni", - "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f", + "sha256": "6b9ca0602fef0230e83149afbe3f9f8227e94f2bbe84a1da4f14d699742f402d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.0" }, "jni_flutter": { "dependency": "transitive", "description": { "name": "jni_flutter", - "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6", + "sha256": "b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.3" + }, + "jni_util": { + "dependency": "transitive", + "description": { + "name": "jni_util", + "sha256": "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" }, "json_annotation": { "dependency": "transitive", @@ -687,11 +697,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "sha256": "bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "msix": { "dependency": "direct dev", @@ -736,11 +746,11 @@ "dependency": "transitive", "description": { "name": "objective_c", - "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed", + "sha256": "b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.1" + "version": "9.5.0" }, "package_config": { "dependency": "transitive", @@ -756,11 +766,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "f5c435dc0e0d461e5b32471a870f769b6a1cc46930637efe24fbc535314e78ad", + "sha256": "73ef2cd5c11a7548f9b7f6fc2a4f6113de2e64aa2a70de63feede95548822908", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.2.0" + "version": "10.2.2" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -856,11 +866,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "sha256": "a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.6" + "version": "3.2.0" }, "plugin_platform_interface": { "dependency": "transitive", @@ -876,31 +886,31 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "sha256": "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.2" + "version": "1.5.3" }, "posix": { "dependency": "transitive", "description": { "name": "posix", - "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", + "sha256": "bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.5.2" }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "sha256": "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.5" + "version": "5.0.6" }, "provider": { "dependency": "direct main", @@ -916,21 +926,21 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "sha256": "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "sha256": "c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "qr": { "dependency": "transitive", @@ -1072,11 +1082,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02", + "sha256": "a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.2.4" }, "source_map_stack_trace": { "dependency": "transitive", @@ -1092,11 +1102,11 @@ "dependency": "transitive", "description": { "name": "source_maps", - "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "sha256": "14c2945847669b44089bb1222f66873d7ff7103c58911917f2a63c5a62327898", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.13" + "version": "0.10.14" }, "source_span": { "dependency": "transitive", @@ -1132,11 +1142,11 @@ "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "sha256": "a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "string_scanner": { "dependency": "transitive", @@ -1232,41 +1242,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32", + "sha256": "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.32" + "version": "6.3.33" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", + "sha256": "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.4.2" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "sha256": "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "sha256": "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.5" + "version": "3.2.6" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1292,11 +1302,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "sha256": "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "uuid": { "dependency": "transitive", @@ -1322,11 +1332,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360", + "sha256": "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.2.0" + "version": "15.3.0" }, "watcher": { "dependency": "transitive", @@ -1372,11 +1382,11 @@ "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "sha256": "28b82ec894fed45dd71c23ba62d1af973ed97dd59a4f5790a4d38b0b13e5657e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.2.0" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -1392,11 +1402,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "ba6f4bba816c8d7e3c1580e170f3786d216951cc6b94babc3b814c08d2cb2738", + "sha256": "a0b93865d5644f11cf6a8c3f6db909f1ec168958b5805f6cc684adea957cd63d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.4.0" }, "win_toast": { "dependency": "direct main", @@ -1432,21 +1442,21 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.6.1" + "version": "7.0.1" }, "yaml": { "dependency": "direct main", "description": { "name": "yaml", - "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "sha256": "f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" } }, "sdks": { diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 850743d43e7f..0ff859dd94f2 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "55.1.0"; + version = "55.2.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "datafusion"; tag = finalAttrs.version; - hash = "sha256-wUrGYaZ5MXP4uIg1n+QmW+5Q+BFDUOnX8IbgWTeY3vw="; + hash = "sha256-YjiGxFBtb3v2yhK2qntU0qp98FKifbI/KIR1JeS+Ipk="; }; - cargoHash = "sha256-oZ184w5lAvK4OL7MKR3d51/b9EWxCrXeRQUqUSwiGig="; + cargoHash = "sha256-uMZcNlO2aMdCkGNTlZ6G1adcaC8xBsgmRtees2z6Nj4="; buildAndTestSubdir = "datafusion-cli"; diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index c412f70767c8..98cbc2b6c65f 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -13,7 +13,7 @@ proton-ge-bin.overrideAttrs ( inherit (finalAttrs.passthru.variants.${stdenvNoCC.hostPlatform.system}) src toolName; pname = "dwproton-bin"; - version = "dwproton-11.0-13"; + version = "dwproton-11.0-14"; passthru = { variants = { @@ -21,7 +21,7 @@ proton-ge-bin.overrideAttrs ( toolName = "${finalAttrs.version}-x86_64"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-INbvpKk01gMyt72Z2jlJvov5k4LZztpFuiYgVkGBc1I="; + hash = "sha256-dXtOdfqIU0wWQ0OXDRbHuFTifGJ7ti+Ij4g+a/RV71Q="; }; }; }; diff --git a/pkgs/by-name/dy/dyndnsc/package.nix b/pkgs/by-name/dy/dyndnsc/package.nix index 1dd0ce5f1895..e5570caf8317 100644 --- a/pkgs/by-name/dy/dyndnsc/package.nix +++ b/pkgs/by-name/dy/dyndnsc/package.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dnspython json-logging netifaces + pkg-resources-backport requests setuptools responses diff --git a/pkgs/by-name/fi/fileshare/package.nix b/pkgs/by-name/fi/fileshare/package.nix index d100bd763575..1fc0808156f9 100644 --- a/pkgs/by-name/fi/fileshare/package.nix +++ b/pkgs/by-name/fi/fileshare/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Public"; repo = "fileshare"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4="; + hash = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4="; }; postPatch = '' diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index 2f6704fa34a3..be395f94f197 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, libiconv, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -13,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "knurling-rs"; repo = "flip-link"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HYNaHXgI02xY1/eBkwLPN1AGwO6w98tCjwvP8YinuxE="; }; @@ -28,11 +29,21 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=should_verify_memory_layout" ]; + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { + # Ignore the stray flip-link-v0.1.12 tag upstream carries. + extraArgs = [ + "--version-regex" + "v([0-9.]+)" + ]; + }; + meta = { description = "Adds zero-cost stack overflow protection to your embedded programs"; mainProgram = "flip-link"; homepage = "https://github.com/knurling-rs/flip-link"; - changelog = "https://github.com/knurling-rs/flip-link/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/knurling-rs/flip-link/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit diff --git a/pkgs/by-name/gh/ghtkn/package.nix b/pkgs/by-name/gh/ghtkn/package.nix new file mode 100644 index 000000000000..afff767654a6 --- /dev/null +++ b/pkgs/by-name/gh/ghtkn/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + buildGo127Module, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +buildGo127Module (finalAttrs: { + pname = "ghtkn"; + version = "0.4.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "suzuki-shunsuke"; + repo = "ghtkn"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EtILxa6d6kmsd/6DykGqfokc3rrsXzf7ciettCkgo5E="; + }; + + vendorHash = "sha256-oA9US4CoGZrkhyVCiDooV5PkTV9akDUtcSqguc+4sEk="; + + ldflags = [ "-X=main.version=${finalAttrs.version}" ]; + + subPackages = [ "cmd/ghtkn" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd ghtkn \ + --bash <($out/bin/ghtkn completion bash) \ + --fish <($out/bin/ghtkn completion fish) \ + --zsh <($out/bin/ghtkn completion zsh) + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { + # Ignore pre-release versions ending in a "-" suffix, ex "v0.3.4-0" + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; + + meta = { + description = "Create short-lived GitHub App User Access Tokens for secure local development"; + longDescription = '' + ghtkn issues short-lived GitHub App User Access Tokens via the OAuth + device flow and caches them in a backend (OS keyring, the ghtkn agent, + or a plain text file). Use it to authenticate the gh CLI, Git, and other + tools without long-lived Personal Access Tokens. + ''; + homepage = "https://github.com/suzuki-shunsuke/ghtkn"; + changelog = "https://github.com/suzuki-shunsuke/ghtkn/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aidandenlinger ]; + mainProgram = "ghtkn"; + }; +}) diff --git a/pkgs/by-name/gi/git-of-theseus/package.nix b/pkgs/by-name/gi/git-of-theseus/package.nix new file mode 100644 index 000000000000..ec618d66e864 --- /dev/null +++ b/pkgs/by-name/gi/git-of-theseus/package.nix @@ -0,0 +1,46 @@ +{ + python3Packages, + fetchFromGitHub, + lib, +}: +python3Packages.buildPythonApplication { + pname = "git-of-theseus"; + version = "0-unstable-2023-11-25"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "erikbern"; + repo = "git-of-theseus"; + rev = "961bda027ffa9fcd8bbe99d5b8809cc0eaa86464"; + hash = "sha256-FZXLJbximJWrDyuRril6whlOYWppGLns3k8sDNRmOuI="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ + gitpython + matplotlib + numpy + progressbar2 + pygments + scipy + tqdm + wcmatch + ]; + + pythonImportsCheck = [ "git_of_theseus" ]; + + # No version flag, no python tests + doCheck = false; + + meta = { + description = "Analyze how a Git repo grows over time"; + homepage = "https://github.com/erikbern/git-of-theseus"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fzakaria ]; + mainProgram = "git-of-theseus-analyze"; + }; +} diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index 60182d2dcf2c..4e09be1085c6 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-judge"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "criyle"; repo = "go-judge"; rev = "v${finalAttrs.version}"; - hash = "sha256-uxFpW4c1xISbgLUR1wDDoR0/+wUT326e69nTDGqCdOQ="; + hash = "sha256-C1NpiYOivOORh1PISBLw0rnXPtSKvzPAuzMg4MPuZB8="; }; - vendorHash = "sha256-qYB3IutGOKHiTt8kwqexgSyut6xbigdYw6A1I1pyG44="; + vendorHash = "sha256-ICci0UWbDlxtfOMWP3I8s3V9b/QhhmWKHo98feeu9UI="; tags = [ "nomsgpack" diff --git a/pkgs/by-name/he/hedgemodmanager/deps.json b/pkgs/by-name/he/hedgemodmanager/deps.json index f0a10915f0ba..104f0d6134c7 100644 --- a/pkgs/by-name/he/hedgemodmanager/deps.json +++ b/pkgs/by-name/he/hedgemodmanager/deps.json @@ -1,88 +1,83 @@ [ { "pname": "Avalonia", - "version": "11.2.3", - "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + "version": "11.3.3", + "hash": "sha256-UvENUQgoTUikjIMTL+oI93FNwr1gZfoGVtZdYzBzdts=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.22045.20230930", - "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.3", - "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" - }, - { - "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.3", - "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" + "version": "11.3.3", + "hash": "sha256-zg35D8NygrU8mCAsLLoPmrzXZcV31NuHNtTaiZZhOxc=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.3", - "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + "version": "11.3.3", + "hash": "sha256-/jYjxA5vJqU5IpJkgnlathprzdHB/ihdL35ZZBRESeU=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.3", - "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" + "version": "11.3.3", + "hash": "sha256-rHBFnhZ+gAqPqqDfZxBxUr3wXIpgOc9hInwzDOgdk5E=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.3", - "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + "version": "11.3.3", + "hash": "sha256-OjFm/uEyLOAY2gwRY2jhqVUzxHHG8wfljoo8gFqF1iw=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.3", - "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + "version": "11.3.3", + "hash": "sha256-kUSE90HoJz9NsYCphLUQgNkxb3xHhFIlqXa6lzuGi4c=" }, { "pname": "Avalonia.HtmlRenderer", - "version": "11.0.0", - "hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4=" + "version": "11.2.0", + "hash": "sha256-cATaSdyVEI2f2dM4votgoHEVZaHVHEVXSmsd5BW9Xrw=" }, { "pname": "Avalonia.Native", - "version": "11.2.3", - "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" + "version": "11.3.3", + "hash": "sha256-QmvN5gUsgjk7ViacdXOwHULHid0TfAKJGW3cf9A8bwQ=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.3", - "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + "version": "11.3.3", + "hash": "sha256-gHZA53IyRAdeIg7yRIN6Pzh0AbOGd5B9mckEWsPuK7A=" }, { "pname": "Avalonia.Skia", - "version": "11.2.3", - "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + "version": "11.3.3", + "hash": "sha256-pUMqXnupxztsAP/n4U2pSgTga89gy7CBLg39y2j0EjA=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.3", - "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + "version": "11.3.3", + "hash": "sha256-tWNl3jvESx96lTd6i0lxo6Y8/Y6cS5ZQrPovIolNfAE=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.3", - "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" + "version": "11.3.3", + "hash": "sha256-nUfIEeJZgiLuy681S16Qncri6fvCGF7tYk4dSf3JY4s=" }, { "pname": "Avalonia.Win32", - "version": "11.2.3", - "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + "version": "11.3.3", + "hash": "sha256-jlQXEdbZjfRsu2MjYzHGUAyn+uvdACXCvm63HjUKqfQ=" }, { "pname": "Avalonia.X11", - "version": "11.2.3", - "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + "version": "11.3.3", + "hash": "sha256-7A+uzB7g21P+RnKO4bKOJVY35qPz5Xna8n8VGG7RoMw=" }, { "pname": "CommunityToolkit.Mvvm", @@ -91,33 +86,33 @@ }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.3", - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + "version": "8.3.1.1", + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.3", - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "version": "8.3.1.1", + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3", - "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "version": "8.3.1.1", + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" }, { "pname": "Markdig", - "version": "0.40.0", - "hash": "sha256-GJqbAhZZjCCnY2Cg3N4KaDVKc/IPdXgkWmTjQRvX5Jw=" + "version": "0.41.3", + "hash": "sha256-3ezMz2P4SjFji3VHBdLEr/Z6gOAl9A7fY8ZJEKbn7Cc=" }, { "pname": "Material.Icons", @@ -194,11 +189,21 @@ "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" + }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.3", + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" + }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", @@ -214,6 +219,11 @@ "version": "3.6.133", "hash": "sha256-AEnBQaGGPMBmZJjZrdWARq/jY4SluuPIsKBbvfNEvLE=" }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.8.38-alpha", + "hash": "sha256-gPMrVbjOZxXoofczF/pn6eVkLhjVSJIyQrLO2oljrDc=" + }, { "pname": "NETStandard.Library", "version": "1.6.1", @@ -226,8 +236,8 @@ }, { "pname": "PeNet", - "version": "4.1.1", - "hash": "sha256-TyVUt3NexLY7oDb+uYEXiZcMCpaMUmzF41UvdLWXsDk=" + "version": "5.1.0", + "hash": "sha256-8E/RiK1JuH5gs1e58VRIlkZHZC0cxFS5bESai6qzuMk=" }, { "pname": "PeNet.Asn1", @@ -324,16 +334,31 @@ "version": "4.3.0", "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" + }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" + }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" + }, { "pname": "runtime.native.System", "version": "4.3.0", @@ -359,16 +384,31 @@ "version": "4.3.0", "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" + }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" + }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" + }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", @@ -379,26 +419,51 @@ "version": "4.3.0", "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" + }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" + }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" + }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" + }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" + }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", @@ -409,6 +474,11 @@ "version": "4.3.0", "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" + }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", @@ -594,6 +664,11 @@ "version": "4.3.0", "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" }, + { + "pname": "System.Net.Http", + "version": "4.3.4", + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" + }, { "pname": "System.Net.NameResolution", "version": "4.3.0", @@ -674,6 +749,11 @@ "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, + { + "pname": "System.Runtime", + "version": "4.3.1", + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -779,6 +859,11 @@ "version": "4.3.0", "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.1", + "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" + }, { "pname": "System.Threading", "version": "4.3.0", @@ -821,14 +906,19 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.20.0", - "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" }, { "pname": "ValveKeyValue", "version": "0.12.0.391", "hash": "sha256-N7yCM2srP1SFxcqYRjk9dt4pPHdxIetfpw2UMe7kOes=" }, + { + "pname": "ValveKeyValue", + "version": "0.20.0.417", + "hash": "sha256-CmnexfgjFT4aLeSXargNyIJlRDFh6lyPW4Kx+m68nzk=" + }, { "pname": "ZstdSharp.Port", "version": "0.8.4", diff --git a/pkgs/by-name/he/hedgemodmanager/package.nix b/pkgs/by-name/he/hedgemodmanager/package.nix index b5793cd5a160..2e6ac674b8bb 100644 --- a/pkgs/by-name/he/hedgemodmanager/package.nix +++ b/pkgs/by-name/he/hedgemodmanager/package.nix @@ -1,39 +1,54 @@ { lib, + fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - fetchFromGitHub, nix-update-script, + versionCheckHook, }: buildDotnetModule (finalAttrs: { pname = "hedgemodmanager"; - version = "8.0.0-beta4"; + version = "8.0.0-beta7"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "hedge-dev"; repo = "HedgeModManager"; tag = finalAttrs.version; - hash = "sha256-1uwcpeyOxwKI0fyAmchYEMqStF52wXkCZej+ZQ+aFeY="; + hash = "sha256-+Ia35SNlzcB/udCilldPxuMRJtsrAOIFjmX3kGyH5TM="; }; - projectFile = "Source/HedgeModManager.UI/HedgeModManager.UI.csproj"; - nugetDeps = ./deps.json; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - postPatch = '' substituteInPlace flatpak/hedgemodmanager.desktop --replace-fail "/app/bin/HedgeModManager.UI" "HedgeModManager.UI" + substituteInPlace Source/HedgeModManager.UI/Program.cs --replace-fail "ThisAssembly.GitCommitId[..7]" '""' ''; - # https://github.com/hedge-dev/HedgeModManager/blob/8.0.0-beta4/flatpak/io.github.hedge_dev.hedgemodmanager.yml#L53-L55 + projectFile = "Source/HedgeModManager.UI/HedgeModManager.UI.csproj"; + nugetDeps = ./deps.json; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + executables = [ "HedgeModManager.UI" ]; + postInstall = '' install -Dm644 flatpak/hedgemodmanager.png $out/share/icons/hicolor/256x256/apps/io.github.hedge_dev.hedgemodmanager.png install -Dm644 flatpak/hedgemodmanager.metainfo.xml $out/share/metainfo/io.github.hedge_dev.hedgemodmanager.metainfo.xml install -Dm644 flatpak/hedgemodmanager.desktop $out/share/applications/io.github.hedge_dev.hedgemodmanager.desktop ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--help"; + versionCheckKeepEnvironment = [ "HOME" ]; + + preVersionCheck = '' + export HOME=$(mktemp -d) + mkdir -p "$HOME/.local/share" + version="${lib.replaceStrings [ "-beta" ] [ " beta " ] finalAttrs.version}" + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version" @@ -42,12 +57,12 @@ buildDotnetModule (finalAttrs: { }; meta = { - mainProgram = "HedgeModManager.UI"; description = "Mod manager for Hedgehog Engine games"; homepage = "https://github.com/hedge-dev/HedgeModManager"; changelog = "https://github.com/hedge-dev/HedgeModManager/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.keenanweaver ]; platforms = lib.platforms.linux; - maintainers = [ ]; + mainProgram = "HedgeModManager.UI"; }; }) diff --git a/pkgs/by-name/he/helixnotes/package.nix b/pkgs/by-name/he/helixnotes/package.nix new file mode 100644 index 000000000000..2231538eeb10 --- /dev/null +++ b/pkgs/by-name/he/helixnotes/package.nix @@ -0,0 +1,82 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, + fetchPnpmDeps, + cargo-tauri, + pnpmConfigHook, + pnpm, + nodejs, + pkg-config, + jq, + moreutils, + wrapGAppsHook3, + webkitgtk_4_1, + glib-networking, + libayatana-appindicator, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "helixnotes"; + version = "1.3.6"; + __structuredAttrs = true; + + src = fetchFromGitLab { + owner = "ArkHost"; + repo = "HelixNotes"; + tag = "v${finalAttrs.version}"; + hash = "sha256-06U9404JTZju1fjMtzkncWjf2zuww1P+oDLcZak5XkA="; + }; + + cargoHash = "sha256-t03bO221qKv0EL3h2e12G2qfKfaRW7BMYqTgKcYRYp8="; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 4; + hash = "sha256-mwM4439o+j8C9XhSHh9QB3nMSVObxmQmbdoTeMs1bVc="; + }; + + nativeBuildInputs = [ + cargo-tauri.hook + pnpmConfigHook + pnpm + nodejs + pkg-config + jq + moreutils + wrapGAppsHook3 + ]; + + buildInputs = [ + webkitgtk_4_1 + glib-networking + libayatana-appindicator + ]; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + postPatch = '' + # Disable upstream updates. + jq ' + .bundle.createUpdaterArtifacts = false | + .plugins.updater = {"active": false, "pubkey": "", "endpoints": []} + ' \ + src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + + # Fix the hardcoded library path in libappindicator-sys. + substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ''; + + meta = { + description = "Clean notes app with rich editing and plain Markdown files on your own disk"; + homepage = "https://helixnotes.com"; + downloadPage = "https://gitlab.com/ArkHost/HelixNotes"; + changelog = "https://gitlab.com/ArkHost/HelixNotes/-/releases/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; + mainProgram = "helixnotes"; + }; +}) diff --git a/pkgs/by-name/io/iortcw/package.nix b/pkgs/by-name/io/iortcw/package.nix index 1acfdff987e3..106fd530dfdc 100644 --- a/pkgs/by-name/io/iortcw/package.nix +++ b/pkgs/by-name/io/iortcw/package.nix @@ -6,7 +6,14 @@ let mp = iortcw_sp.overrideAttrs (oldAttrs: { + pname = "iortcw-mp"; sourceRoot = "${oldAttrs.src.name}/MP"; + passthru = oldAttrs.passthru // { + executables = [ + "iowolfded" + "iowolfmp" + ]; + }; }); in buildEnv { @@ -23,11 +30,7 @@ buildEnv { nativeBuildInputs = [ makeWrapper ]; # so we can launch sp from mp game and vice versa - postBuild = '' - for i in `find -L $out/opt/iortcw -maxdepth 1 -type f -executable`; do - makeWrapper $i $out/bin/`basename $i` --chdir "$out/opt/iortcw" - done - ''; + postBuild = iortcw_sp.postInstall + mp.postInstall; meta = iortcw_sp.meta // { description = "Game engine for Return to Castle Wolfenstein"; diff --git a/pkgs/by-name/io/iortcw_sp/package.nix b/pkgs/by-name/io/iortcw_sp/package.nix index 434850443189..2c11793a8796 100644 --- a/pkgs/by-name/io/iortcw_sp/package.nix +++ b/pkgs/by-name/io/iortcw_sp/package.nix @@ -4,23 +4,25 @@ fetchFromGitHub, opusfile, libogg, + libvorbis, SDL2, openal, freetype, libjpeg, curl, makeWrapper, + bc, }: stdenv.mkDerivation (finalAttrs: { pname = "iortcw-sp"; - version = "1.51c"; + version = "1.51c-unstable-2024-05-26"; src = fetchFromGitHub { owner = "iortcw"; repo = "iortcw"; - tag = finalAttrs.version; - hash = "sha256-3F8JAEuPydufXqeOGwYCX0M8pEVRyFZAu2TUFxZ+vDw="; + rev = "438e7d413b5f7277187c35b032eb0ef9093ae778"; + hash = "sha256-ME8b6drkZek0GJ3YPT5E5YW+aTHGAKLRPsE7hM3f8bE="; }; strictDeps = true; @@ -31,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace code/tools/lcc/src/{c.h,init.c,simp.c,stmt.c} \ --replace-fail 'constexpr' 'const_expr' + substituteInPlace Makefile \ + --replace-fail "gcc" "cc" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-framework SDL2" "-lSDL2" ''; enableParallelBuilding = true; @@ -49,13 +57,17 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ opusfile libogg + libvorbis SDL2 freetype libjpeg openal curl ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + bc + ]; env = { NIX_CFLAGS_COMPILE = toString [ @@ -67,17 +79,36 @@ stdenv.mkDerivation (finalAttrs: { ]; }; - postInstall = '' - for i in `find $out/opt/iortcw -maxdepth 1 -type f -executable`; do - makeWrapper $i $out/bin/`basename $i` --chdir "$out/opt/iortcw" - done - ''; + postInstall = + let + arch = + if stdenv.hostPlatform.isx86_64 then + "x86_64" + else if stdenv.hostPlatform.isAarch64 then + if stdenv.hostPlatform.isDarwin then "arm64" else "aarch64" + else + throw "Unsupported architecture"; + in + '' + cd "$out/opt/iortcw" + mkdir -p "$out/bin" + + for name in ${lib.escapeShellArgs finalAttrs.passthru.executables}; do + makeWrapper "$out/opt/iortcw/$name.${arch}" "$out/bin/$name" \ + --chdir "$out/opt/iortcw" + done + ''; + + passthru.executables = [ "iowolfsp" ]; meta = { description = "Single player version of game engine for Return to Castle Wolfenstein"; - homepage = finalAttrs.src.meta.homepage; + homepage = "https://github.com/iortcw/iortcw"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rjpcasalino ]; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ + r4v3n6101 + rjpcasalino + ]; }; }) diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index a44d728927a4..2136f9873e0f 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -64,11 +64,11 @@ let in selectKernel { linux = fetchzip { - url = "https://download-cdn.jetbrains.com/toolbox/jetbrains-toolbox-${version}${archSuffix}.tar.gz"; + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${archSuffix}.tar.gz"; inherit hash; }; darwin = fetchurl { - url = "https://download-cdn.jetbrains.com/toolbox/jetbrains-toolbox-${version}${archSuffix}.dmg"; + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${archSuffix}.dmg"; inherit hash; }; }; diff --git a/pkgs/by-name/ju/justify/package.nix b/pkgs/by-name/ju/justify/package.nix index 1816dcc92f8b..e17d41c155d5 100644 --- a/pkgs/by-name/ju/justify/package.nix +++ b/pkgs/by-name/ju/justify/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "jns"; repo = "justify"; rev = "0d397c20ed921c8e091bf18e548d174e15810e62"; - sha256 = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc="; + hash = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc="; }; postPatch = '' diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index db1f6ce16c9f..b8929b689972 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -3,67 +3,67 @@ { "kicad" = { kicadVersion = { - version = "10.0.6"; + version = "10.0.7"; src = { - rev = "e757247bdec054f139487cc5c63ce6a5e76f7432"; - sha256 = "0x9376x4nigqnx4d82qixz41p779svjdsgkxv6l0kmn3snvwbcgk"; + rev = "93a8a4827b0b2a01a6d1599733e6964e6ea94cf9"; + sha256 = "0wzv12hrk08rak65kl1la5yj80x1qspssc2a032cc8w1j1cfs0pv"; }; }; libVersion = { - version = "10.0.6"; + version = "10.0.7"; libSources = { - symbols.rev = "a496b9e6752ef1a44e3711409f39d080d74519a0"; - symbols.sha256 = "0ynmi6qg5cac37vn0q986vh2a560ab8vb24yg7bfbkyj8b5xk353"; - templates.rev = "46d7ee8fe0c19837672c33c3747c2fe87eaae853"; + symbols.rev = "1b2b42d49bc41559e43f590b084e7fe8f1e7f5fc"; + symbols.sha256 = "056m402jkzz3pl5h2k48ywcqcrivvnhwrpc1rrxblcsmk1psfsxb"; + templates.rev = "4648afc6db95e2d4f1fef21274ccf82235cedf1f"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "e0779daea58396261bd88a84b2b126eff8b90794"; - footprints.sha256 = "11hhdk8g7hsm50817x7204lzm1qpjpfjr82gyrnhdshnnzd0hbf7"; - packages3d.rev = "125f0268659a530ec6b78fec645f86228f09aae7"; - packages3d.sha256 = "1mkcf6yn64pqjk51srnv5cidcji0hrx8nfh0q5zyc4ca7p7984li"; + footprints.rev = "25a0b01dd7d0f130582e535f368f64a90ecd3f1a"; + footprints.sha256 = "06qc8nkgfd5301bzqqiqwg44g6pgjn0i9gp8j4585ay1vfd19ab4"; + packages3d.rev = "dd37eac8d2f52389c61120439c04a6617f11aff5"; + packages3d.sha256 = "1q9jdrqcbxypy5zw50ganhkri71pq796ghxx3b10pin0300d1lwl"; }; }; }; "kicad-testing" = { kicadVersion = { - version = "10.0-2026-08-14"; + version = "10.0-2026-10-07"; src = { - rev = "29b1e0f34f2fefcaebe6f53103390e6a79f0646f"; - sha256 = "12hnm0kwxf1m6z0xflh75swkfbwvykkasmv3a2n0bhqgl9snafbp"; + rev = "e863081677e459686ccf8759c87755cadde34aae"; + sha256 = "1ncijhdls5w257qr18fphlzwl6as0fdxc1h3pa75b443am9crv20"; }; }; libVersion = { - version = "10.0-2026-08-14"; + version = "10.0-2026-10-07"; libSources = { - symbols.rev = "94d8f4635e3ce67695aae0ee16d983d32346feaf"; - symbols.sha256 = "12w7qbqm9wk6b7d8ljdd46afskkqc2aanh8fyf36frwqy1mjfx87"; - templates.rev = "cafa8b3ef4735f830212299da26629e9bcd62c02"; + symbols.rev = "1b2b42d49bc41559e43f590b084e7fe8f1e7f5fc"; + symbols.sha256 = "056m402jkzz3pl5h2k48ywcqcrivvnhwrpc1rrxblcsmk1psfsxb"; + templates.rev = "4648afc6db95e2d4f1fef21274ccf82235cedf1f"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "a2d01395d25f14158f2ca0b17adcc8fcb45fe443"; - footprints.sha256 = "0jr9q1yrlxbb796wrsrnlplb2a05k3z0g1m1dn3c87cf9ffmlaz0"; - packages3d.rev = "67538dca1b8583dec9bd2a45d4eeced6fa287923"; - packages3d.sha256 = "1gqqi91g1yynfgmxl5l34g1rg3gjksl54xd1zsgp4kvyi5w50b3r"; + footprints.rev = "25a0b01dd7d0f130582e535f368f64a90ecd3f1a"; + footprints.sha256 = "06qc8nkgfd5301bzqqiqwg44g6pgjn0i9gp8j4585ay1vfd19ab4"; + packages3d.rev = "dd37eac8d2f52389c61120439c04a6617f11aff5"; + packages3d.sha256 = "1q9jdrqcbxypy5zw50ganhkri71pq796ghxx3b10pin0300d1lwl"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2026-07-22"; + version = "2026-10-07"; src = { - rev = "6e8e92d84aae47e19af95340c0ce10e040970015"; - sha256 = "091q9hk69pn2n6mibdm3729kpr14pi5ya7iw1nss53r59j5c15y8"; + rev = "7aaaae9a362605adcbb727fc35adee2e3f6cfd4a"; + sha256 = "1381kr0b16s2b5yphvx588a8y8wdczf1mi2m02d4anfjy0ybwnic"; }; }; libVersion = { - version = "2026-07-22"; + version = "2026-10-07"; libSources = { - symbols.rev = "60d2dc9981920ee40eb5caa4dc01b23f713beca7"; - symbols.sha256 = "12w7qbqm9wk6b7d8ljdd46afskkqc2aanh8fyf36frwqy1mjfx87"; + symbols.rev = "e1bb0a65cb243525367c5dc7294665b9fd57fc4d"; + symbols.sha256 = "056m402jkzz3pl5h2k48ywcqcrivvnhwrpc1rrxblcsmk1psfsxb"; templates.rev = "3ed4538b0f965d821df63a5fffc4441e723cfe7f"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "2c7f07017725b44b98f30849e1b83e29fed43718"; - footprints.sha256 = "0jr9q1yrlxbb796wrsrnlplb2a05k3z0g1m1dn3c87cf9ffmlaz0"; - packages3d.rev = "e9fd30d7cee55a427d26db7aa9ac635e4a5599df"; - packages3d.sha256 = "1gqqi91g1yynfgmxl5l34g1rg3gjksl54xd1zsgp4kvyi5w50b3r"; + footprints.rev = "51f8a59ed7d5f3bab9bb296c7b767bb033f3ba4c"; + footprints.sha256 = "06qc8nkgfd5301bzqqiqwg44g6pgjn0i9gp8j4585ay1vfd19ab4"; + packages3d.rev = "8d4070daa0fa3f7a7f3c176f4ca7bffc4df392be"; + packages3d.sha256 = "1q9jdrqcbxypy5zw50ganhkri71pq796ghxx3b10pin0300d1lwl"; }; }; }; diff --git a/pkgs/by-name/ki/kicad/writable.patch b/pkgs/by-name/ki/kicad/writable.patch index a2969f26f43b..6c74dd509bad 100644 --- a/pkgs/by-name/ki/kicad/writable.patch +++ b/pkgs/by-name/ki/kicad/writable.patch @@ -25,10 +25,10 @@ diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp index bf951fcddb..2bef94326b 100644 --- a/kicad/project_template.cpp +++ b/kicad/project_template.cpp -@@ -282,6 +282,21 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr +@@ -371,6 +371,21 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr - result = false; - } + result = false; + } + else if( !destFile.IsFileWritable() && !destFile.SetPermissions(0644) ) + { + if( aErrorMsg ) @@ -44,6 +44,6 @@ index bf951fcddb..2bef94326b 100644 + + result = false; + } - } - - return result; + else + { + KIPLATFORM::IO::MakeWriteable( destFile.GetFullPath() ); diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index da7d752ae96d..775d6f22e518 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -25,14 +25,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "komikku"; - version = "51.0.0"; + version = "51.1.0"; pyproject = false; src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${finalAttrs.version}"; - hash = "sha256-5YEvYdkktoIEWoyTLop4tNVxG69/qPneOO0i0nW/Tfg="; + hash = "sha256-I5qu1P6X4A8w3EfdlTPlSqvon+uqNfUx4KICWXoMaQk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 50110d05f3e9..3fe9c92c43ad 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "4.21.1"; + version = "4.23.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Em+VT8sDCyKgrJxrdrAIVpbdLdSPwqoBgIRXeEj1TXY="; + hash = "sha256-B54b+N7986/FumYiaLwEN7a3wTF5aeXFsX4JuhbynK4="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/le/lenpaste/package.nix b/pkgs/by-name/le/lenpaste/package.nix index 4ef83af12963..71584d7e5171 100644 --- a/pkgs/by-name/le/lenpaste/package.nix +++ b/pkgs/by-name/le/lenpaste/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { owner = "root"; repo = "lenpaste"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-d+FjfEbInlxUllWIoVLwQRdRWjxBLTpNHYn+oYU3fBc="; + hash = "sha256-d+FjfEbInlxUllWIoVLwQRdRWjxBLTpNHYn+oYU3fBc="; }; vendorHash = "sha256-PL0dysBn1+1BpZWFW/EUFJtqkabt+XN00YkAz8Yf2LQ="; diff --git a/pkgs/by-name/li/libunicode/package.nix b/pkgs/by-name/li/libunicode/package.nix index b6a4661d0b34..0d7fd1a8fc91 100644 --- a/pkgs/by-name/li/libunicode/package.nix +++ b/pkgs/by-name/li/libunicode/package.nix @@ -21,18 +21,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libunicode"; - version = "0.9.0"; + version = "0.9.3"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "libunicode"; tag = "v${finalAttrs.version}"; - hash = "sha256-EBu8zn5XritudZmBvQmjOmU08XLjhyKI6hVCrnWoR6k="; + hash = "sha256-teyo4KYVdS6+WIjOdS5p7fXZJoMQsL7lPugoaAQ07r4="; }; - # Fix: set_target_properties Can not find target to add properties to: Catch2, et al. - patches = [ ./remove-target-properties.diff ]; - nativeBuildInputs = [ cmake python3 diff --git a/pkgs/by-name/li/libunicode/remove-target-properties.diff b/pkgs/by-name/li/libunicode/remove-target-properties.diff deleted file mode 100644 index b9da1ef8ab3f..000000000000 --- a/pkgs/by-name/li/libunicode/remove-target-properties.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt -index 25abbd1..99f8b8d 100644 ---- a/src/libunicode/CMakeLists.txt -+++ b/src/libunicode/CMakeLists.txt -@@ -317,10 +317,10 @@ if(LIBUNICODE_TESTING) - if(NOT Catch2_FOUND) - # Suppress all warnings for embedded third-party Catch2. - # https://github.com/catchorg/Catch2/issues/2583 -- suppress_thirdparty_warnings(Catch2) -- suppress_thirdparty_warnings(Catch2WithMain) -- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) -- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) -+ # suppress_thirdparty_warnings(Catch2) -+ # suppress_thirdparty_warnings(Catch2WithMain) -+ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) -+ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) - endif() - - target_link_libraries(unicode_test unicode Catch2::Catch2WithMain) diff --git a/pkgs/by-name/lr/lrcalc/package.nix b/pkgs/by-name/lr/lrcalc/package.nix index a3c0429f4a7a..52a8f9a8ba1f 100644 --- a/pkgs/by-name/lr/lrcalc/package.nix +++ b/pkgs/by-name/lr/lrcalc/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "asbuch"; repo = "lrcalc"; rev = "lrcalc-${finalAttrs.version}"; - sha256 = "0s3amf3z75hnrjyszdndrvk4wp5p630dcgyj341i6l57h43d1p4k"; + hash = "sha256-k9zQBoGnUBMDGdI/1sAwt1xO5s7Ntq+9zBaW84eramg="; }; doCheck = true; diff --git a/pkgs/by-name/ma/matcha/package.nix b/pkgs/by-name/ma/matcha/package.nix index a9a3a1675124..9c74515b60fc 100644 --- a/pkgs/by-name/ma/matcha/package.nix +++ b/pkgs/by-name/ma/matcha/package.nix @@ -14,16 +14,16 @@ buildGoLatestModule (finalAttrs: { __structuredAttrs = true; pname = "matcha"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "floatpane"; repo = "matcha"; tag = "v${finalAttrs.version}"; - hash = "sha256-3RBwPxSlyqiDzJQmvP09kQqF/l5CuyUogEDsBvsrps0="; + hash = "sha256-r3KbZzpVkDrKVa/nHQ2MVL/pEpE+UIETGK0R2qGs8lU="; }; - vendorHash = "sha256-InWPQrhWZ6Q/mtIed8eH2cp7sYbdxiWY+fxQ50D4UYg="; + vendorHash = "sha256-trWZuACD295R6RytL02nb5DKVqLZoeWXAwih1cqfMyc="; proxyVendor = true; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix index 59a323ba595d..bc88a5eb8404 100644 --- a/pkgs/by-name/me/med/package.nix +++ b/pkgs/by-name/me/med/package.nix @@ -6,18 +6,18 @@ cmake, pkg-config, jsoncpp, - readline, + icu, }: stdenv.mkDerivation (finalAttrs: { pname = "med"; - version = "3.10.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "allencch"; repo = "med"; rev = finalAttrs.version; - hash = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE="; + hash = "sha256-4NWpP/J35bomvQ7qDw1pGMMCQC7dU5TnAB+32BtnB7E="; }; nativeBuildInputs = [ @@ -30,13 +30,9 @@ stdenv.mkDerivation (finalAttrs: { qt6.qttools qt6.qtwayland jsoncpp - readline + icu ]; - postPatch = '' - find . -type f -exec sed -i "s|/opt/med|$out/share/med|g" {} + - ''; - meta = { description = "GUI game memory scanner and editor"; homepage = "https://github.com/allencch/med"; @@ -44,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ zebreus ]; platforms = lib.platforms.linux; license = lib.licenses.bsd3; - mainProgram = "med"; + mainProgram = "med-ui"; }; }) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 432e2ca94919..c886f2ec057e 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,17 +1,17 @@ { - "version": "3.265.0", + "version": "3.271.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.265.0/mirrord_linux_x86_64", - "hash": "sha256-PxuJ/4qPQw1HNtYwMVBtfm3LN/XwZfd9MjC4Yz8uPGI=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.271.0/mirrord_linux_x86_64", + "hash": "sha256-SFJSdRwTK8j1N7GYzbv5JUqxImFYcAzV4Q0ZXrP0Xe4=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.265.0/mirrord_linux_aarch64", - "hash": "sha256-R4CiaidyQEW83nWEnJ1RC0zb/KR11Sljq0iKmWq4F+0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.271.0/mirrord_linux_aarch64", + "hash": "sha256-urt1R+z5jB1L+EDwxznZTUYgk5ZFaLMTlRYTb15NKNw=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.265.0/mirrord_mac_universal", - "hash": "sha256-s6EU1qbORDWaISddqCFEnq1rSPvKfOYdzHYsJM0YWpM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.271.0/mirrord_mac_universal", + "hash": "sha256-7GuMqwqYilhBS7Z8jvtHP8SgBcnvi87M3aH5aO3rz+4=" } } } diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix index 1b7c744d2f1f..c3983449ff9c 100644 --- a/pkgs/by-name/mp/mpv/package.nix +++ b/pkgs/by-name/mp/mpv/package.nix @@ -173,9 +173,11 @@ symlinkJoin { meta = { inherit (mpv-unwrapped.meta) homepage + changelog description longDescription maintainers + license ; mainProgram = "mpv"; }; diff --git a/pkgs/by-name/my/myman/package.nix b/pkgs/by-name/my/myman/package.nix index 97f39fce714d..5baa056e6cd4 100644 --- a/pkgs/by-name/my/myman/package.nix +++ b/pkgs/by-name/my/myman/package.nix @@ -2,7 +2,12 @@ lib, stdenv, fetchurl, + groff, + mandoc, ncurses, + nix-update-script, + util-linux, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -10,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: { version = "0.7.0"; src = fetchurl { - url = "https://sourceforge.net/projects/myman/files/myman/myman-${finalAttrs.version}/myman-${finalAttrs.version}.tar.gz"; - hash = "sha512-elJo+pqSdcjUa1fPcU6InCIVgaXL4Zs4jmpgI2Z/mUH3ZK9r5H+/HxGkMPFJ+/anoLtb4t2SsWwHAg+d6PyYtg=="; + url = "mirror://sourceforge/myman/myman/myman-${finalAttrs.version}/myman-${finalAttrs.version}.tar.gz"; + hash = "sha256-MalLLIlJo10Y7tNej2hYAfv+txQYo8Aer79xDOlaKSs="; }; outputs = [ @@ -20,19 +25,33 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + groff + mandoc + util-linux + ]; buildInputs = [ ncurses ]; - configureFlags = [ - "--with-xterm" - "--with-rxvt" - "--with-kterm" - "--with-ncurses" + configureFlags = [ "--with-ncursesw" ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-D_XOPEN_SOURCE=600" + "-D_GNU_SOURCE" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + meta = { - description = "Pacman clone with an ncurses and a 'graphic' interface"; - homepage = "http://myman.sourceforge.net/"; - license = lib.licenses.bsd3; + description = "Text-mode videogame inspired by Namco's Pac-Man"; + homepage = "https://myman.sourceforge.io/"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ silverhadch ]; platforms = lib.platforms.unix; mainProgram = "myman"; diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 1b62b923904c..663cfb5d0afb 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; - version = "0.37"; + version = "0.38"; src = fetchFromCodeberg { owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; - hash = "sha256-vbAS/iN6cfsjsx7IZebDLzdV0DH18uzjXGolIHPIuNI="; + hash = "sha256-rYiCD3mzNNiSra25VgiFl01cRYfHo/2E+j1N8RiJAkM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix index 95037f43ce99..8b7fbad73cc7 100644 --- a/pkgs/by-name/no/notmuch-mailmover/package.nix +++ b/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -10,16 +10,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "notmuch-mailmover"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = "notmuch-mailmover"; rev = "v${finalAttrs.version}"; - hash = "sha256-fJljqNSPLM1JiyeGMNvub/4wk5L9+lVTqtgCdoe7S88="; + hash = "sha256-HbWiWoCVyYW2tgu0V3ysB27oUQx2EQNQUPg6ZjA3QjQ="; }; - cargoHash = "sha256-PeSlErwGBCZECYoWqmJrlRY7peNNY7c/wxd6R09uUz4="; + cargoHash = "sha256-E3t7aWatRIc7pjLX6T8L8sNloz5H0qsTBOpKPvXbwEo="; + + env.RUST_LOG = "info"; # needed for integration tests nativeBuildInputs = [ installShellFiles @@ -31,8 +33,12 @@ rustPlatform.buildRustPackage (finalAttrs: { lua5_4 ]; + nativeCheckInputs = [ + notmuch + ]; + postInstall = '' - installManPage share/notmuch-mailmover.1.gz + installManPage share/notmuch-mailmover.1 mkdir -p $out/share/notmuch-mailmover cp -dR example $out/share/notmuch-mailmover/ diff --git a/pkgs/by-name/nu/nugget-doom/package.nix b/pkgs/by-name/nu/nugget-doom/package.nix index f6a165848c60..a9cb83ca4d9f 100644 --- a/pkgs/by-name/nu/nugget-doom/package.nix +++ b/pkgs/by-name/nu/nugget-doom/package.nix @@ -2,47 +2,67 @@ lib, stdenv, fetchFromGitHub, - cmake, - python3, - SDL2, - SDL2_net, alsa-lib, + cmake, + discord-rpc, fluidsynth, libebur128, libsndfile, + libspng, libxmp, - openal, - yyjson, + miniz, nix-update-script, + openal, + pkg-config, + python3, + sdl3, + versionCheckHook, + yyjson, + withDiscordRpc ? true, }: + stdenv.mkDerivation (finalAttrs: { pname = "nugget-doom"; - version = "5.1.0"; + version = "6.0.1"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "MrAlaux"; repo = "Nugget-Doom"; tag = "nugget-doom-${finalAttrs.version}"; - hash = "sha256-k+wuO8nGYjZ56xWhP5iRmgk02YqmZBMnxJTVzg2/cjg="; + hash = "sha256-m2GGGqRY49Y9hBkPxeUcdEK9JwztOr3fcT3NCPO73Wc="; }; nativeBuildInputs = [ cmake + pkg-config python3 ]; buildInputs = [ - SDL2 - SDL2_net - alsa-lib + sdl3 fluidsynth libebur128 libsndfile + libspng libxmp + miniz openal yyjson + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals withDiscordRpc [ discord-rpc ]; + + cmakeFlags = [ + (lib.cmakeBool "WITH_DISCORD_RPC" withDiscordRpc) ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" @@ -53,10 +73,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Doom source port forked from Woof! with additional features"; homepage = "https://github.com/MrAlaux/Nugget-Doom"; - changelog = "https://github.com/MrAlaux/Nugget-Doom/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/MrAlaux/Nugget-Doom/releases/tag/nugget-doom-${finalAttrs.version}"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ bandithedoge ]; + maintainers = with lib.maintainers; [ + bandithedoge + keenanweaver + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "nugget-doom"; - platforms = with lib.platforms; linux ++ darwin ++ windows; }; }) diff --git a/pkgs/by-name/nx/nxc-rs/package.nix b/pkgs/by-name/nx/nxc-rs/package.nix index 70d10b224e43..a8714fa851a7 100644 --- a/pkgs/by-name/nx/nxc-rs/package.nix +++ b/pkgs/by-name/nx/nxc-rs/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ZSTD_SYS_USE_PKG_CONFIG = true; }; - checkFlagsArray = [ + checkFlags = [ # Test requires raw socket/packet capture "--skip=providers::tests::test_provider_debug_redacts_keys" ]; diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix index 58736a4731a1..a657929e5ed6 100644 --- a/pkgs/by-name/oc/ocrodjvu/package.nix +++ b/pkgs/by-name/oc/ocrodjvu/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, djvulibre, docbook-xsl-ns, glibcLocales, @@ -17,8 +18,7 @@ withOcrad ? false, ocrad, }: - -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "ocrodjvu"; version = "0.14"; pyproject = true; @@ -26,10 +26,18 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "ocrodjvu"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/TPo8YCE8JKKKBBeV12ilgTNDmuklwfy0TPI/7dBiOs="; }; + patches = [ + # Fix build for python 3.14, picked from the upstream development branch + (fetchpatch2 { + url = "https://github.com/FriedrichFroebel/ocrodjvu/commit/7be01651d688a10db8dd437149f3c5382199ed3a.patch?full_index=1"; + hash = "sha256-mt0/L6QuX1nFHkk+aISwH8R2EkEAur55Xstr/Mbobqc="; + }) + ]; + build-system = with python3Packages; [ setuptools ]; @@ -65,10 +73,10 @@ python3Packages.buildPythonApplication rec { meta = { description = "Wrapper for OCR systems that allows you to perform OCR on DjVu files"; homepage = "https://github.com/FriedrichFroebel/ocrodjvu"; - changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${version}/doc/changelog"; + changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${finalAttrs.version}/doc/changelog"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dansbandit ]; mainProgram = "ocrodjvu"; }; -} +}) diff --git a/pkgs/by-name/op/opensearch-dashboards/package.nix b/pkgs/by-name/op/opensearch-dashboards/package.nix index 9b2ad191cffd..edb1a667e152 100644 --- a/pkgs/by-name/op/opensearch-dashboards/package.nix +++ b/pkgs/by-name/op/opensearch-dashboards/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + nixosTests, # nativeBuildInputs makeWrapper, @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { update-source-version "opensearch-dashboards" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; + tests.nixos = nixosTests.opensearch-dashboards; }; __structuredAttrs = true; diff --git a/pkgs/by-name/op/openvino-genai/package.nix b/pkgs/by-name/op/openvino-genai/package.nix index d2dc39a3bcf7..7669ef155580 100644 --- a/pkgs/by-name/op/openvino-genai/package.nix +++ b/pkgs/by-name/op/openvino-genai/package.nix @@ -104,6 +104,10 @@ stdenv.mkDerivation (finalAttrs: { (cmakeFeature "Python3_EXECUTABLE" "${python.interpreter}") (cmakeFeature "OpenVINO_DIR" "${openvino}/runtime/cmake") + # OpenVINO and its consumers target C++17. GCC 16 defaults to C++20, which + # breaks this code with C++20-only changes; pin the standard to match upstream. + (cmakeFeature "CMAKE_CXX_STANDARD" "17") + # Normalise install destinations to the standard Nix layout. (cmakeFeature "ARCHIVE_DESTINATION" "lib") (cmakeFeature "LIBRARY_DESTINATION" "lib") @@ -183,7 +187,12 @@ stdenv.mkDerivation (finalAttrs: { ./tests/cpp/tests_continuous_batching \ --gtest_filter="-${ lib.concatStringsSep ":" ( - [ "GoogleTestVerification.UninstantiatedParameterizedTestSuite*" ] + [ + "GoogleTestVerification.UninstantiatedParameterizedTestSuite*" + # Compares CPU-plugin logits against a naive matmul with a 1e-4 + # tolerance; some CPUs exceed it. + "MtpModelTransforms.GraftedLogitsMatchTiedWeightMatmul" + ] ++ lib.optionals stdenv.hostPlatform.isRiscV64 [ "TestCacheManager.*" "TestLinearAttentionCacheManager.*" diff --git a/pkgs/by-name/pa/pass/package.nix b/pkgs/by-name/pa/pass/package.nix index 1db7c8793b8f..d7fc4bb943b7 100644 --- a/pkgs/by-name/pa/pass/package.nix +++ b/pkgs/by-name/pa/pass/package.nix @@ -88,6 +88,10 @@ let wrapProgram $out/bin/${pass.meta.mainProgram} \ --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" + '' + + lib.optionalString dmenuSupport '' + wrapProgram $out/bin/passmenu \ + --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" ''; meta.mainProgram = pass.meta.mainProgram; } diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index 5bdf1e096728..2506fdcb373e 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "asonix"; repo = "pict-rs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jKUDrYBGaWyumnlzMyj+oC41rx8kVnkkUxixSCwFp3Y="; + hash = "sha256-jKUDrYBGaWyumnlzMyj+oC41rx8kVnkkUxixSCwFp3Y="; }; cargoHash = "sha256-W4Bj+juON8mPyXDHgFpTBBFOvQlmYIKihXHBHwelah4="; diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix index 05d1e1c78fa6..11081d093aea 100644 --- a/pkgs/by-name/pk/pkgtop/package.nix +++ b/pkgs/by-name/pk/pkgtop/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/orhun/pkgtop"; changelog = "https://github.com/orhun/pkgtop/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ravi-arnan ]; mainProgram = "pkgtop"; }; }) diff --git a/pkgs/by-name/ps/psitop/package.nix b/pkgs/by-name/ps/psitop/package.nix index 904c3cb853e9..0370520693ab 100644 --- a/pkgs/by-name/ps/psitop/package.nix +++ b/pkgs/by-name/ps/psitop/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Top for /proc/pressure"; homepage = "https://github.com/jamespwilliams/psitop"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ravi-arnan ]; mainProgram = "psitop"; }; }) diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index af05574a9cd5..dc99ad510383 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -116,6 +116,12 @@ python3Packages.buildPythonApplication (finalAttrs: { ) ''; + postInstall = '' + # Move man pages and desktop files to the correct place + mv $out/${python3Packages.python.sitePackages}/man $out/man + mv $out/${python3Packages.python.sitePackages}/share $out/share + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; }; diff --git a/pkgs/by-name/re/repseek/package.nix b/pkgs/by-name/re/repseek/package.nix index a571b7502e2c..c4c8a69a61bd 100644 --- a/pkgs/by-name/re/repseek/package.nix +++ b/pkgs/by-name/re/repseek/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bioinfo.mnhn.fr/abi/public/RepSeek"; maintainers = [ lib.maintainers.bzizou ]; license = lib.licenses.lgpl21; + problems.broken.message = "repseek is broken because its upstream sources (https://bioinfo.mnhn.fr and http://wwwabi.snv.jussieu.fr) are no longer available and the tarball is not archived anywhere; it is superseded by obitools4."; }; }) diff --git a/pkgs/by-name/ri/riffle/package.nix b/pkgs/by-name/ri/riffle/package.nix new file mode 100644 index 000000000000..c4c3bce8e816 --- /dev/null +++ b/pkgs/by-name/ri/riffle/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + qt6, + nix-update-script, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "riffle"; + version = "1.0.4"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Naved124"; + repo = "riffle"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hH9zUjULqeohUXaj67P2CMDzbZBkZajfW2M8JGH5HaM="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + pyqt6 + pyqt6-webengine + beautifulsoup4 + ]; + + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; + + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + postInstall = '' + install -Dm644 packaging/flashcard-viewer.desktop $out/share/applications/flashcard-viewer.desktop + substituteInPlace $out/share/applications/flashcard-viewer.desktop \ + --replace-fail "@EXEC@" "flashcard-viewer" + install -Dm644 flashcard_viewer/ui/icon.png $out/share/icons/hicolor/512x512/apps/flashcard-viewer.png + ''; + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + pythonImportsCheck = [ "flashcard_viewer" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Desktop app for studying HTML and React flashcard decks with quizzes and progress tracking"; + homepage = "https://github.com/Naved124/riffle"; + changelog = "https://github.com/Naved124/riffle/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ naved124 ]; + mainProgram = "flashcard-viewer"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix index 921259684bab..d65fdf84735a 100644 --- a/pkgs/by-name/ri/river/package.nix +++ b/pkgs/by-name/ri/river/package.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.4.8"; + version = "0.5.0"; __structuredAttrs = true; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "river"; repo = "river"; tag = "v${finalAttrs.version}"; - hash = "sha256-vqOGyd0sddjYZ47xPMFmfzDIg8mHfIBzAJQ2CcsMQ3Y="; + hash = "sha256-Yn0+V0PMT+PIV4dVuy4d3BAEfLj5hwLh5ngGpM3RbHY="; }; strictDeps = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { zigDeps = zig.fetchDeps { inherit (finalAttrs) src pname version; fetchAll = true; - hash = "sha256-MVFoc361EKGhz5V/9tAOc8lldAi45o592oyOfHX1vTM="; + hash = "sha256-u7lnnqxrTdaiqNOeFrqvesDM6B4YUjYkmP7CtGOBDIs="; }; postConfigure = '' diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix index ba1e533f2918..72d1c78e3c93 100644 --- a/pkgs/by-name/sa/samurai/package.nix +++ b/pkgs/by-name/sa/samurai/package.nix @@ -2,18 +2,18 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "samurai"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "michaelforney"; repo = "samurai"; rev = finalAttrs.version; - hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; + hash = "sha256-0AKbuoOG1PfH9li57X3FqGVRHlXtcmfweP5zSBks5y8="; }; makeFlags = [ @@ -21,22 +21,7 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" ]; - patches = [ - # NULL pointer dereference in writefile() in util.c; remove this at the next - # release - (fetchpatch { - name = "CVE-2021-30218.patch"; - url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; - sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; - }) - # NULL pointer dereference in printstatus() in build.c; remove this at the - # next release - (fetchpatch { - name = "CVE-2021-30219.patch"; - url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; - sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; - }) - ]; + passthru.updateScript = nix-update-script { }; meta = { description = "Ninja-compatible build tool written in C"; diff --git a/pkgs/by-name/sc/schildi-revenge/deps.json b/pkgs/by-name/sc/schildi-revenge/deps.json index c6ccbdc0d12e..88eae3909139 100644 --- a/pkgs/by-name/sc/schildi-revenge/deps.json +++ b/pkgs/by-name/sc/schildi-revenge/deps.json @@ -2748,16 +2748,6 @@ "module": "sha256-Yr0DpoiTACCwevVi8YDE5HAZRvhjx++mITlp3IHKWDg=", "pom": "sha256-XESpbotbhEnKaAf2WDeod9P6waERqw+xKW37aTFk8D8=" }, - "io/github/kdroidfilter#knotify-compose-jvm/0.4.3": { - "jar": "sha256-T0fvdaCRBa56tibZ30IX1sYnSQVYx0KXKXg+ZxklSw0=", - "module": "sha256-g+YNmwvOxe82HhzdBtq2fHeP2Y9E5P0tmib0c6+oBaY=", - "pom": "sha256-2OmE0PaDMEb4botuwEH5JcBBJuk6ZI0jXBKwB/lSiFI=" - }, - "io/github/kdroidfilter#knotify-compose/0.4.3": { - "jar": "sha256-CJ4kQXv59sNO7Fcg7rssvMguooVezvkBM+sX4QedWGg=", - "module": "sha256-4Q1RjEtvp1D4RxJ+lN1l0BbxbG61uus3aZJwsI8a6Bc=", - "pom": "sha256-h6E8g7jvpSx+m/GqSWh/zotwDh2XSklxzxQ1rotH5VY=" - }, "io/github/kdroidfilter#knotify-jvm/0.4.3": { "jar": "sha256-D6hwk+QGBgzoHJPqQhhHZxJ5fzcdeTmhDsauK0bSqxI=", "module": "sha256-SuVFgHPhhv5xVEzQ8BPTysm5uTXdOKKfI5sUQgF5++8=", @@ -3573,9 +3563,6 @@ "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.12.1": { "pom": "sha256-UJOgkYaho+YlhH7qOrO+GB53dxrJMey7OZ+ndvD9Zjs=" }, - "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.9.0": { - "pom": "sha256-JiGp36CoFnnMhSVjEflgjoMQj5zRlDvQa1F/fblo1kw=" - }, "org/jetbrains/compose/desktop#desktop-jvm/1.12.1": { "jar": "sha256-ra6m7GMEIHEtz9UqNWtGrvYDEpyn92y6IEVpES+oDhw=", "module": "sha256-Q6Un+zE9gsDGoOPJaUEHbKxH4raIQ2Ojzh7N32x3aT0=", @@ -4798,13 +4785,6 @@ "jar": "sha256-kgwcsDOr+3kgL59FX7hkkb7F5FwVbxhsASWxD86X4JM=", "pom": "sha256-2t5MaGRtWefa0ITlIK/ISAW4VnYUaFHETqyi/JzEj6g=" }, - "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.150.1": { - "jar": "sha256-vRht1r+HNutpvhkBB+Gzq3vSRSrpF/qqUW71EyF6XzM=", - "pom": "sha256-Mky/dYNxdEwRx1CH94W1AAQyNJYE3aNOfAUlXfzBRGk=" - }, - "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.9.22.2": { - "pom": "sha256-sqCj8EKIL9aGPFpynw1S3TpVTWpxCYfW8PNVifDY3oY=" - }, "org/jetbrains/skiko#skiko-awt/0.150.1": { "jar": "sha256-u2EK2ihQnr7jpiPARpr/NmVon77HPRGAVfPb9aNyEfU=", "module": "sha256-+AH6sle53AvXLZyc8JwwXYwm5ugD4GL9gL6k0jO/jFI=", diff --git a/pkgs/by-name/sc/schildi-revenge/package.nix b/pkgs/by-name/sc/schildi-revenge/package.nix index c11b1bccc86d..ba91cd921ba3 100644 --- a/pkgs/by-name/sc/schildi-revenge/package.nix +++ b/pkgs/by-name/sc/schildi-revenge/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "schildi-revenge"; - version = "26.10.01"; + version = "26.10.10"; src = fetchFromGitHub { owner = "SchildiChat"; repo = "schildi-revenge"; tag = "v${finalAttrs.version}"; - hash = "sha256-5AOxfJ41/9MIvhbmUXdU2fGBT48h8dBAm77P4xlWei8="; + hash = "sha256-2JgS5iLAUSXBnal3HoGzuydSlCFkgNg0f1RnctiDALU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index fea0d4ac7176..15726810bba5 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-09-27"; + version = "0-unstable-2026-10-02"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "94c48e92e0c969b438263bc4a7c74ba2ee2103da"; - hash = "sha256-GzmC9PrMTjAGUDz4kLN9eyDFrjmSZqSBsh/wOn4tIio="; + rev = "c1d5289a1f713b30a2c121e9fe6529d39360be0f"; + hash = "sha256-Gkl0/4mwCB/lFk+jS9O2CeSThoFDXZdPsyUed4t7PDY="; }; dontBuild = true; diff --git a/pkgs/by-name/si/sigdigger/package.nix b/pkgs/by-name/si/sigdigger/package.nix index 17f8c2f2bfa3..5f34b01c63e7 100644 --- a/pkgs/by-name/si/sigdigger/package.nix +++ b/pkgs/by-name/si/sigdigger/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library"; mainProgram = "SigDigger"; homepage = "https://github.com/BatchDrake/SigDigger"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ polygon diff --git a/pkgs/by-name/si/signal-cli/deps.json b/pkgs/by-name/si/signal-cli/deps.json index 79ce1172a019..87fd70d7fb5c 100644 --- a/pkgs/by-name/si/signal-cli/deps.json +++ b/pkgs/by-name/si/signal-cli/deps.json @@ -2,10 +2,10 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://build-artifacts.signal.org": { - "libraries/maven/org/signal#libsignal-client/0.102.1": { - "jar": "sha256-BFSCFVg3kkyh+0JfMb0L7pRQw0QnZE29m1rbuMrtQUc=", - "module": "sha256-m9WH/jcLLo0eyLQfT9b4GLz0ApSVt1G9o+qMtVIB5JA=", - "pom": "sha256-jEQr5kW9rhEz8ccnhOrtBW8mECmKgGSzw2pkeUmEyzg=" + "libraries/maven/org/signal#libsignal-client/0.103.0": { + "jar": "sha256-+GCCBd4mmruI2P/tTAHPS8F7caVPBHA/q7Vm0WCnnes=", + "module": "sha256-dxo74wLj3V9uG93KL9M4igG68i5BqK4U3mOqhifZWAk=", + "pom": "sha256-Bl66iO7GFVLxKPoVwxtshniGY+tmzPubA2VNxgFLyKw=" } }, "https://plugins.gradle.org/m2": { @@ -27,23 +27,23 @@ "com/google/errorprone#error_prone_parent/2.27.0": { "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, - "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.12": { + "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.14": { "jar": "sha256-aCpHXQmzrBFSZysvcGyI9UtgSPbIijOmll973yTagEo=", - "module": "sha256-Y8TOXCDCB+Fb+Z9bO0WPQ9LqR4HJqLcX+uZfexTXoKo=", - "pom": "sha256-wDCCgPIuSxnfUOHg9YIfhLugoV2soPIbpIUM/8vQFFE=" + "module": "sha256-021TUaJMfAhrcJsfhtTzakIPVHb8siRqrPacB8pPbFI=", + "pom": "sha256-ZnAtqFEuQhBR5mXSo3K2o+d5MsORAt4ardAiBR8OR6g=" }, - "org/graalvm/buildtools#native-gradle-plugin/1.1.12": { - "jar": "sha256-T9tDEKF1ubCPEj/zlzVFLkikTNLs0Tj4yt/wjBagOSE=", - "module": "sha256-TabguvAGbkaUD1sJpt/R1Y2SkL4K2VU0Jxk8v7Rem+8=", - "pom": "sha256-EqxzdBSzkQGpc/WmKeO+iCmJWkH8kJKQeLYKwkrqZCI=" + "org/graalvm/buildtools#native-gradle-plugin/1.1.14": { + "jar": "sha256-UU81p2yOq+LA7GZoNR+QNgYn9kJYyoKkc/4zCzagQW0=", + "module": "sha256-/d1eJP7GYLqbrlD2x8VGb9QABrzWnuM8ON3nGsS+AlY=", + "pom": "sha256-pTjnmsPBRmjBed9HlzyvAnc80sL5WAm84UheZHXwXxY=" }, - "org/graalvm/buildtools#utils/1.1.12": { - "jar": "sha256-3peZ2sK6c3e3Iy+BM8HxSEfSQmer8p2WpIujjKPGfEM=", - "module": "sha256-13obicfUwns5ceyPjYraBY0Bfm8BOBj1dfTjTlkv3E8=", - "pom": "sha256-dvQ4fCLGJ5orrjSdCQsxGDtbo/TINnLzFvPfVrDxtRY=" + "org/graalvm/buildtools#utils/1.1.14": { + "jar": "sha256-3TsYAlSpCQ/PfRqvMHQ4iWRe4FeUhG5j2nx6ob2ykqk=", + "module": "sha256-Gvfsl5H5ksekoJgytz7rPyAoNg+MaFqA/3cdwwEIOgw=", + "pom": "sha256-IFgf1ZYpKMeMBz0VQsGR9DGCPEUaWfiYklsSGdIkWxo=" }, - "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.12": { - "pom": "sha256-BKoljgt2JdV4VHwIOd8+vBAg38uUHx/liY5x32CE8mk=" + "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.14": { + "pom": "sha256-nYnPhoXsdozTtq2Si5ANI1TTrcCLyW2Noa5Dv1FTWbw=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.7.6": { "jar": "sha256-Jfnf6D/ujRJAisqUyLWW0uvbczFzD62BXVRwzLkqrrA=", @@ -164,19 +164,16 @@ } }, "https://repo.maven.apache.org/maven2": { - "ch/qos/logback#logback-classic/1.6.3": { - "jar": "sha256-vuvt6NsGX+G3KQnsxmu0ms2mGJAWNdhsJfzhSlkV434=", - "pom": "sha256-cDOrt4SsvFzBXo3X4vYAQbNYeHJFZkotLxiUgp0hCBs=" + "ch/qos/logback#logback-classic/1.6.5": { + "jar": "sha256-LoxzqtrVJehUrxrJV5OvPcdezt1TwBDqI4neRMCOcps=", + "pom": "sha256-q1hVz9DE7eRmvUtE/5X+8OGr3A5Ronlk9DPG4gehc04=" }, - "ch/qos/logback#logback-core/1.6.3": { - "jar": "sha256-ppZ6KMiwht7nWmlNL2+4gwxxFTU5hm19ivBlybbfkeA=", - "pom": "sha256-728buuLq1LJVgwwIOi27MyJLCqtQ3BFIx+TnEInPhgs=" + "ch/qos/logback#logback-core/1.6.5": { + "jar": "sha256-A9y/BTtAFmhJuOsKMMveQMBKRIgg6adYnEsKLsOp22M=", + "pom": "sha256-XV5fd9ikB6PHbhoFDnUZNrG0g5U9kPPoEcMDt88+h0Q=" }, - "ch/qos/logback#logback-parent/1.6.3": { - "pom": "sha256-3t3tUkV5VVL8LYEFM/M6+NAmK6/LCGV5esWLkdprVK0=" - }, - "com/fasterxml#oss-parent/75": { - "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0=" + "ch/qos/logback#logback-parent/1.6.5": { + "pom": "sha256-oDOKgW7TEgYlF5adrQseVabswK0rVvV0kaJgptRW/BU=" }, "com/fasterxml#oss-parent/79": { "pom": "sha256-kga33Wf7E4A2V2w9/KlHoqjz4sTS2cHy0d6lGbOk2uE=" @@ -184,49 +181,41 @@ "com/fasterxml/jackson#jackson-base/2.22.1": { "pom": "sha256-P19ZfHR02Q/icGBHfyQ7gEvscF3GD+yk3ifKMmOGRIo=" }, - "com/fasterxml/jackson#jackson-base/2.22.2": { - "pom": "sha256-qMgpgr3NZOW3zIV1oEWeq1PVNagwnWlmJ0yTU241QjQ=" + "com/fasterxml/jackson#jackson-base/2.22.3": { + "pom": "sha256-GZH/NYhbOJ6ynCOuMYyOymZWKRUgW97qU8cipb0bO8s=" }, "com/fasterxml/jackson#jackson-bom/2.22.1": { "pom": "sha256-s2aqX9JpWOIwikgH5dQrFHBrABs8y/E44xuGmNwKwOw=" }, - "com/fasterxml/jackson#jackson-bom/2.22.2": { - "pom": "sha256-qTrVuEYvjVkgsShkepufI2NCtP1OcSh9qfcYf9hkLwI=" - }, - "com/fasterxml/jackson#jackson-parent/2.21": { - "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" + "com/fasterxml/jackson#jackson-bom/2.22.3": { + "pom": "sha256-j0mcaowBe7mHoac7kfcFwi/iTsJ3fnBVx6KpE/FLVEA=" }, "com/fasterxml/jackson#jackson-parent/2.22": { "pom": "sha256-fUWn77ad8ge+18xUuHoLsBLxCVLAlVcKJztJSF2g0Sk=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.21": { - "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=", - "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", - "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" - }, "com/fasterxml/jackson/core#jackson-annotations/2.22": { "jar": "sha256-Id21mIB9OlGodnBOuXnZKW4cam9Hqxgm/4jG1qEnotA=", "module": "sha256-PSJwREjpjf1XjF31ZG3QqYrsBAgLCKMkXPi+uKJdy10=", "pom": "sha256-OMO6UqDq3j4+rMWxNJnVbhA4zLrY7Eu3lCbcIUMrRtA=" }, - "com/fasterxml/jackson/core#jackson-core/2.22.2": { - "jar": "sha256-/xZ6Yxe+FYlXBsJmaPRbiY7+QKuHgJcGWCEP4Tk9UqY=", - "module": "sha256-iH14W/9vlkxVSzOb8PDaAI4GGM0grePD5Wxo7SxnTp0=", - "pom": "sha256-0oKc/vTDDSAOBNf2UAm0sRKkY4Kq30U0ow3X+QyxZOU=" + "com/fasterxml/jackson/core#jackson-core/2.22.3": { + "jar": "sha256-ilARJqOFslhBkV2DlQj4pm4qDbyKZwnQVe87PoUrCUw=", + "module": "sha256-Wb6ia6QiWSDtkhIj0agzZkf5Uj94Cq72NP+bKKxs4ic=", + "pom": "sha256-vHTBiyTz67/UJ0Hysps37KmyXlEub6et139pc87lC/E=" }, - "com/fasterxml/jackson/core#jackson-databind/2.22.2": { - "jar": "sha256-0NoUwSsWtdVHGaoXLYO1Qv9Kvriw+320dv3ozuznYMo=", - "module": "sha256-oewlrdzD9dWqro9wK9cpJqtXUxcOiksdnJAkzpAkAKI=", - "pom": "sha256-qQOqxCIXJXgzQcjH0wzO5DwbWvZ/8BMl0sW8iG0AlB8=" + "com/fasterxml/jackson/core#jackson-databind/2.22.3": { + "jar": "sha256-VW21Q54gYRQ0YEP2jSAEl9yWoLymKjYKgXhAkuvQ4Kk=", + "module": "sha256-HoaGa0IAavelXx8YCM/LuHo6KSoi85ChXTn4//uwsK0=", + "pom": "sha256-J6XGZXuVXQiNr1hvK+l2kiTjNhirT0RoKhs27Zj3uQQ=" }, "com/fasterxml/jackson/module#jackson-module-kotlin/2.22.1": { "module": "sha256-rns4eVe3uijAj/o8WcxFnZJLzPeSOXAjjP18kYuWm9k=", "pom": "sha256-29Z6PXkQYU/4Q3ANlMuR+vc+rjMB+rfUuoO0leWvyfA=" }, - "com/fasterxml/jackson/module#jackson-module-kotlin/2.22.2": { - "jar": "sha256-F06RfqZMBVnfgk6SMXeCqS66cnjeSI1KEd8LhZd5GHQ=", - "module": "sha256-StxbmdUNGBBFMWQ2LAKvfFjG21vvNEpqmsz23h3WG/M=", - "pom": "sha256-RD/gkZIo1P2r/7c7DfiyzGI2xdJArvR6AyaXGgKNQCA=" + "com/fasterxml/jackson/module#jackson-module-kotlin/2.22.3": { + "jar": "sha256-vKEJqe26mr1j/mN+n204iKPW8xTwo4HzlqnoK56xpJI=", + "module": "sha256-9MfeRDIoaS5D3QDsXYMGu7JvoSr/Q525qU9zrrjeKVo=", + "pom": "sha256-uNcgQDrlY6T3A6E3IlPEcV8E5AXawqQGrcOlOKkXNAA=" }, "com/github/hypfvieh#dbus-java-core/5.0.0": { "jar": "sha256-rZddGhfTd43evWMePZ1TNylKqRW8Zf3m6Qh9kHKbu0U=", @@ -250,35 +239,35 @@ "jar": "sha256-TLCXwINEJ5OcAfQWndC6sgBoZzkTNBxbbbJ74adEUJg=", "pom": "sha256-Tyrko3hDDkXKlRxwb+fwi3mjzIs33RUelMjU72iW/vY=" }, - "com/github/turasa#core-network/2.15.3_unofficial_153": { - "jar": "sha256-p+OIiK/+7U7p0YpZji7JycU7Og+RJrHcluMCQ39922g=", - "module": "sha256-T7sZ5vpO7hjsVNbOaVCmO5oeZZI5ouaUO8HSWcHi6jg=", - "pom": "sha256-m8t/HFetYfVs6k5R4DBsmQGVO54C9bQwBz3KqeM+C44=" + "com/github/turasa#core-network/2.15.3_unofficial_154": { + "jar": "sha256-tcnXbZL44/pdRKRiePDOo3IS1u561siFy2k2H/uei/I=", + "module": "sha256-rgqSZTaugRVMvwJx925Vj3l6BTtcJ6uGS61vrcdhXvE=", + "pom": "sha256-YtmrUgZxjsLXYmm8D/6dHpsQnuKZcQOq1uzRmVh5F4c=" }, - "com/github/turasa#models-jvm/2.15.3_unofficial_153": { - "jar": "sha256-yV3+jIv1k0OgOZC6aaNpyyCHky+9SjkFCkOzNyd59Sk=", - "module": "sha256-nFV7hp4qzdMMUz0+LtmBfqLvnaKT2oTdWES/lcQeQCc=", - "pom": "sha256-Y0BRqIu2/8DAZH0A5Ngb/zs6N92PdCi31VKvLRBtPoo=" + "com/github/turasa#models-jvm/2.15.3_unofficial_154": { + "jar": "sha256-vF5Z5YUT+R/sFpRbUyREyXrtdMLl4/6bL/71UF0zhJ8=", + "module": "sha256-fq373J2PPuDI4yYJ+Da0sUNmfinyOA/ofvEOGAmeVxg=", + "pom": "sha256-KlGgmHNCi3E3gAPF+Gi3H413cnuuKkVnqfWuSvdfl8M=" }, - "com/github/turasa#serialization/2.15.3_unofficial_153": { - "jar": "sha256-ba2raorU1th0TuggSQlUpX8hs3VPFVor/xS6+o+RGfM=", - "module": "sha256-lqYUk3N29MmeuDG3K0hPU6kTe4ompxDPVqmEqFzUq1g=", - "pom": "sha256-80ACeC1wjFjf7LhSH734ahATdZaWr2P16Vd5AiUo6uI=" + "com/github/turasa#serialization/2.15.3_unofficial_154": { + "jar": "sha256-kbWnLoWYHjtpm/EXAgzU6i/nVDUtxVfL1STghEdaPdI=", + "module": "sha256-gpyPdnKrRBYXIAlIs+uiY7QWH6/7mQ/k7qaeg6a8OFs=", + "pom": "sha256-rTlliQr6EKb0dJeVC2cZr12JMTvKojpe2UWB4q4wEHg=" }, - "com/github/turasa#signal-network/2.15.3_unofficial_153": { - "jar": "sha256-kDVgsRUvzKpGVexImRWs/MLVWnEwVOXV1TH7ats3CHE=", - "module": "sha256-6Rmj0rLv3bDXZPyQSs0yXgjyq4XV4abQpujoB91ZmsA=", - "pom": "sha256-Hur2Vtpv5ma3u+3v+AosjfqFg3WD9YVOkOCKjx9+dNw=" + "com/github/turasa#signal-network/2.15.3_unofficial_154": { + "jar": "sha256-huQ4s4g1hyRFK9XR759tKHV92Qo13zfBCAnmCsjXnqs=", + "module": "sha256-VEyE7dtbD67/hW/ekzWeEwrRhUD7doTsNNEvs9y3Amg=", + "pom": "sha256-hwWB+JDciPxRPWCiRi+Mc5a0Y8ZOw4ecfnY1qGyosC4=" }, - "com/github/turasa#signal-service-java/2.15.3_unofficial_153": { - "jar": "sha256-XU7NGH7UvJfUEHgW9ZGu0431ixgDz2IanveE2fXPClw=", - "module": "sha256-cU6RsGWdYhfBsFcFiTBpd+NfBgxU23BjCDfhO5CARKg=", - "pom": "sha256-x8P0fDepuNjsDXyZhTT0oashY6dWbXCVFI9fsIWuceg=" + "com/github/turasa#signal-service-java/2.15.3_unofficial_154": { + "jar": "sha256-KjXfj0fPMJ8kWJfnRkiheHi/YcqBiCnsRnCz9UtNoJs=", + "module": "sha256-V/TQeCPy5qemQ7ZeziWf6hxVhEXQHKPkkKGWDikBfnQ=", + "pom": "sha256-uWiUa4oArcWKdJZn9hj/AlebgSEXiMr7bgxCxxZ12EQ=" }, - "com/github/turasa#util-jvm/2.15.3_unofficial_153": { - "jar": "sha256-SG43Vev6ITrsh2sNklIyraeg/PxhiSK4Fjb3CeP+dWY=", - "module": "sha256-xfGT1JAPWKG4woATinYg2Sit2F8g6FgAZCETjX1a91o=", - "pom": "sha256-ggXz1ruPfGWqptwonpGf4EyUvxXuwUEEtZos8GvUL9Y=" + "com/github/turasa#util-jvm/2.15.3_unofficial_154": { + "jar": "sha256-qBWCunhehLXNgHGgYQVsuRmAV6oFPYeYwWpHdsbBos4=", + "module": "sha256-jO9pdvi031ut5nN9l73Cf5QnMp0L8rNGarhekQ2A5sU=", + "pom": "sha256-bPGSXdhKvLu4OBX1F/E9/6E2iERV6+VJhOnhl0qzJYM=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", @@ -370,92 +359,96 @@ "module": "sha256-r62Oft9NktlM2UgFTzLjR7u5iX9p7rL2aaU4vkHfjIc=", "pom": "sha256-Aot7flSQbazNShygcX9VJ7OO7PVwkYcvomNtOalY/yE=" }, - "io/micronaut#micronaut-aop/5.2.0": { - "jar": "sha256-Gv2T/VzU7nc9x8n/rN+gRiifyYQ7aIlVYPzllY6AYMM=", - "module": "sha256-NmGCjPlt97pTzzC5dtaHlTL30Ra/k7jmPsp94fy6TN4=", - "pom": "sha256-JzO+JYd6/EIUygC2xjPliwPCTG3rgHNngH5QiVLCMZo=" + "io/micronaut#micronaut-aop/5.2.14": { + "jar": "sha256-8EZmKhXaAFWU7jWfRtD8cNDkDyNqNdJt/o1vJsBLr+g=", + "module": "sha256-iuuIhi7VZTnEvKkQmF6D35XEHmreOZsZovQSt7dvFj8=", + "pom": "sha256-kMl3b1PgSuUb/fscP+CxoQJ4fc1dZhmiEkl1f/x3SfU=" }, - "io/micronaut#micronaut-context-propagation/5.1.11": { - "jar": "sha256-keEp3XnstsBqnH9d4Vz9vIltfKLmf5j2VZDqh8ygZ0U=", - "module": "sha256-DYGnSllk41j/9eD50KGcBd2mJpFBotgGELJem79c4xQ=", - "pom": "sha256-jLF5tPlIRMIGSNGlrBfC9rTSs2MS7mMC4jiXhRkM7kY=" + "io/micronaut#micronaut-context-propagation/5.2.12": { + "jar": "sha256-3YkNW7Wa7TDkxABodSgrZ9FMOEAaKcxJkUNGHFHpaSM=", + "module": "sha256-AwHNP8BgOKRePpW0kBB8tD03iRLk6VRTmhzUjPwQ5IY=", + "pom": "sha256-pzkjOfyLivRQ0ZqUYTLYMMJ44WecncB7Rtj7bt+DzgU=" }, - "io/micronaut#micronaut-context/5.1.11": { - "jar": "sha256-buMbutTA3HYiTqC1cPibLKMawzxRlcjnAGBCpCzXn30=", - "module": "sha256-TVUvvlEE2WEZQYkC5WdeGw2XXjieCAyJDNLILKMfhJY=", - "pom": "sha256-kggKwkkal09fbVjrZYhWUfyisSNH3s4GKB7S4A/mY04=" + "io/micronaut#micronaut-context/5.2.12": { + "jar": "sha256-ujNkHVcTjF1/Dj1RbPH8oSWnWPLyW9ZcN9WLoba67go=", + "module": "sha256-0eI2ip/+GQBmdkn88sop8aisehHp+BpKiBqeQwi82hk=", + "pom": "sha256-vAwNttEEj7i4okNhS9DXBkEAxlD8nqFiv+oY/McyIUs=" }, "io/micronaut#micronaut-core-bom/5.1.1": { "module": "sha256-ZMk29cfu9C99aAlOMM5DHn/OIJH0wUikOXrlF1xeVSk=", "pom": "sha256-tGFcYeICIzZi6wsDZyVnboTJ0mNy1msgMO+dPHANhOA=" }, - "io/micronaut#micronaut-core-bom/5.1.11": { - "module": "sha256-jQlp13M02Eb2l6PUXK3FC1hl5ss+O2RpmlH4xkPwUFs=", - "pom": "sha256-gV99zPo1EJy96NmWgLQ+fEHiDQL6uqHUU7jjEpJ3h2U=" + "io/micronaut#micronaut-core-bom/5.2.12": { + "module": "sha256-BbkNHQFTskF2NhqWl6P7akLPHor+4hyjD4bV3b54/1I=", + "pom": "sha256-7Zx3xUDebwh2GAD2hY2tE9ZWPKAJ1xJoTM/bzkz9UI0=" }, - "io/micronaut#micronaut-core-processor/5.2.0": { - "jar": "sha256-Emw4ACT7oKP8yh3bkVYGPlR3CmlNx+IXULNMXLdmhrI=", - "module": "sha256-PzIaKGp/euevv4gFiI7OjnCR1+dMeCcOuQrR9ZAcUVE=", - "pom": "sha256-8oLWuCQ5kH2yN7Sqlpx0s/LtAGKhh3P08HKstiz/P7g=" + "io/micronaut#micronaut-core-processor/5.2.14": { + "jar": "sha256-au8tS1yLSsojFIxLbihxIsGCMcWTAjA0KWgqiTKwTdA=", + "module": "sha256-+RTTL/Fp56kV1cXj1xz1WrdRnVsJGRCmCb7oK+3vTNE=", + "pom": "sha256-t4D4M2F8RlgCRumvAsxHZL9i77AHlsE0TNd947JzHqw=" }, - "io/micronaut#micronaut-core-reactive/5.1.11": { - "module": "sha256-nSWE6t6e7/S3kyhplzbogEvu2+vBgrzKuV2kRvj+pMQ=", - "pom": "sha256-9YG2E5FTcdSjYNxH09FIjknN/yrcpK74gxwyp8l669E=" + "io/micronaut#micronaut-core-reactive/5.2.12": { + "module": "sha256-vHNngyTxImFRAsGKSStZ7iXfccaU+NeCeNsG/IK17oE=", + "pom": "sha256-gsiqqGBIfDIsyU/3HIerL6qq8Sgc5KJJA+EjitLjGq4=" }, - "io/micronaut#micronaut-core-reactive/5.2.0": { - "jar": "sha256-Wk2W7+S8Yy2+8LhXkcrDpAQmAb5sC1JOS+r+488/EYI=", - "module": "sha256-YszVKmrAwK73Ea6cDsw0oQzK0X9X8K5omFfILnnQaFc=", - "pom": "sha256-ZJPlfPrNhcRWjz1bs2IM6Yk9C2N4BkZhcU907G39zqE=" + "io/micronaut#micronaut-core-reactive/5.2.14": { + "jar": "sha256-ZxhjsCjF2lFlIYi41YCfivjV8XQ+mF9VS+qtF3cf6i4=", + "module": "sha256-vGaDZ7YCvck6N5dwr1ABeRwO2HjVe/znVfkXNUyDDY4=", + "pom": "sha256-JiIIuwPDKDY9KVM7NYuurXC/wVSJ2+1VmqjRTMO9zbw=" }, - "io/micronaut#micronaut-core/5.1.11": { - "jar": "sha256-nv22Jcd5AyblSFAvvHrzTkcFnkd1ROpmR9x/6AvzAs4=", - "module": "sha256-RkBdzPzEiBcM0S+TuCCMXARkCRycBSgyc+hayYRAllE=", - "pom": "sha256-RSrpiHd0fXSmSnj1mu/GoXq0yRKqDRueiP/iuzqd7oo=" + "io/micronaut#micronaut-core/5.2.12": { + "jar": "sha256-36hpRDAxSrl3tsfhvAA8dyK7TMaqjBTL+Quss3voLSw=", + "module": "sha256-1QpwRE9RGO9PYNPxXMD3JXe8tBMhck2D7oFzvhcIhb4=", + "pom": "sha256-kyOiywWbcjHd8Bp9v1xH3i4bnGMSxj68CIf8W1b7Kd0=" }, - "io/micronaut#micronaut-core/5.2.0": { - "jar": "sha256-DTau5nMdEWUDB7sh7hVh1iZT0AHvGH2oDFpxZ74Klko=", - "module": "sha256-V6VIDQdrZ2q7coDl0Lxr3W2dj4d/P2rrbheDNhoL9kU=", - "pom": "sha256-EwNlAhT1Z9gEO/3MZeMulmLf2wEILERGVuPfxcGm2xE=" + "io/micronaut#micronaut-core/5.2.14": { + "jar": "sha256-+lq9wQNGbHiADaMW/vU+h21K6Wmm0MR86Zpmh0w0LV8=", + "module": "sha256-Vogp24+vvXd8MNHpDhbBPtl13SmqvWJ8NklNDW8U1jU=", + "pom": "sha256-DZQlsyn252/fyOxTo5bd0Dtwgqa7iCETcDbHDMcDqzk=" }, - "io/micronaut#micronaut-http/5.1.11": { - "jar": "sha256-m++NTMyOXMe/BwzEnG9CNoIoftvKuPQAK0Vg6VrwFRI=", - "module": "sha256-7b+4eyEqI2l1ITrMwRc9gAdOqdtOqsu+8Vs1PZlDZSA=", - "pom": "sha256-hln5W8owXr6s4rRgvzRTQrmoex9htDti8ylDXqRyjcQ=" + "io/micronaut#micronaut-http/5.2.12": { + "jar": "sha256-lhoNMtPNH6yoLlxN+l6bAnpQ3lLu9ypXZI3GZ1OVctA=", + "module": "sha256-KdxZFh0iT8A3Veu4Gsg7/lyTYhFK8RGJf0nYbWJUYlE=", + "pom": "sha256-o0o/5vaGJegPzstT9iSBdKJqKtfUSjhVvII8Bgefjao=" }, - "io/micronaut#micronaut-inject-java/5.2.0": { - "jar": "sha256-ooRlrd0Yk1/1p9+VbRbPuEcP73yQnivj7CPGqIRQ5vo=", - "module": "sha256-VjTrTJe7VI+8pSmhMhf227ERLSEiuAPM2MsSwBfh9dc=", - "pom": "sha256-Kur7zt7HsR6N8TahZZLC7wTxKqaP/NOpKIegkkNasXY=" + "io/micronaut#micronaut-inject-java/5.2.14": { + "jar": "sha256-GGNNXON39/Cu4OfNUPa0DsxANepc+lc9cLwtDBn0rno=", + "module": "sha256-ZmH9r/YOo8n0MU1nWIlRFGZ4k4pzE4z5Rnxv2UbL12g=", + "pom": "sha256-CS3gqPnyPkKgII97Z/Dhxo+nKD35ryjaCtrrNhhyuGA=" }, - "io/micronaut#micronaut-inject/5.1.11": { - "jar": "sha256-Xi7KAxSo464LfACsSoXyhRWk84hSZ3Zxpa+zp9xStJM=", - "module": "sha256-41PW22Zlljv1R0T8Y3vnUcgWypfE/uS2LkhE1iAof4E=", - "pom": "sha256-e8wj0j6x+0r+zH5KkVJMeOWNBgEzSrCGqc0y+dBP5Co=" + "io/micronaut#micronaut-inject/5.2.12": { + "jar": "sha256-/ICr+GibZ/vKHfrbESdB/5ct8Yx8G7zyQjEHjO186Xg=", + "module": "sha256-13909iuWcNs5oYjrOcbdSdse003p6ZoFg3D9m8hgYZ8=", + "pom": "sha256-EudqacAu6xyNNa13FmvrrEbXWrF7f+yrPsuNkU/m494=" }, - "io/micronaut#micronaut-inject/5.2.0": { - "jar": "sha256-TY8z1zdtPdyZ/X+WkUYm6Wn12NW7L5bNpAzEsmZECGM=", - "module": "sha256-NmRv6iHRK73xCB0V5Rj+hXlBAWAZU9UV5TpZHi3xn0I=", - "pom": "sha256-SxBMbaFkQS6gWRVMK3VGA2+CLMElMRBFE/S8JDBZ64U=" + "io/micronaut#micronaut-inject/5.2.14": { + "jar": "sha256-j5XhrkyMkBXpIO+Od97XCQGbfggWr8n6a8P7Mqz18Jk=", + "module": "sha256-FzBYQ0KCW1lhN+mgISGNGfa2ARAG/r5wCprglIt/Myg=", + "pom": "sha256-fy+cP1Zewm46KUZMBWdbsda42WOaQWtjIJFVAvO5xrM=" }, - "io/micronaut/jsonschema#micronaut-json-schema-annotations/2.2.0": { - "jar": "sha256-Z5m6Xgm/LGEPO9XTE/HroR7/CgktucYVYCDjAfv8tT8=", - "module": "sha256-qeZqtOz9naeO3LGNJm4W/1q8DToalJ/P3E3S/32ZEXQ=", - "pom": "sha256-udsRJHXg8RT+RklSgbJjQH+MWWC1sTDKeOwCgANyysg=" + "io/micronaut/jsonschema#micronaut-json-schema-annotations/2.3.1": { + "jar": "sha256-910XKHbzWgwXHwtSNDT2bbcXCBv7iweY9seAla9WYIU=", + "module": "sha256-Z8A0tap9Wyfjq2y7x9BiNqJYMXPKGssGr3kpkbwp+1Y=", + "pom": "sha256-vfaC550PyRMM6n2ikD+/XUDVET9o9smapNErNGRT9N4=" }, - "io/micronaut/jsonschema#micronaut-json-schema-common/2.2.0": { - "jar": "sha256-0tIcYW3ehorDWT3hgqXwnAntRH4wGDXWaNdGJ/pbRGA=", - "module": "sha256-wE8IJNXHpSkMNqS/qSgfQPE9MfNzizcaxAY+YP2QkPI=", - "pom": "sha256-1vUZMoJe3OKhXUnmYBhsx4/yM+sSjCpgK5zGeAX5+9o=" + "io/micronaut/jsonschema#micronaut-json-schema-common/2.3.1": { + "jar": "sha256-JgkPF63qBRUOETP2yD7oxxtO50r7YVV0mMqdkDOTC4E=", + "module": "sha256-uLEZ6YjmCuwEiVvdawnd5FZU73oeNYxySdANfLhhdoM=", + "pom": "sha256-1TjbYUyICZ/oLAh3+oTTlB3RCgg74BpxwRCnTZQlhJg=" }, - "io/micronaut/jsonschema#micronaut-json-schema-processor/2.2.0": { - "jar": "sha256-Qti488NJqgOkcVDximdE5R7CjnR/AcouAxheZ265dnk=", - "module": "sha256-Mk8P0PrenSprSxZJewOHwHvl7f08ZCoCeMRJg2yeKRc=", - "pom": "sha256-CYQkT9c0MvmR7eR60Fi9HIMxOmEpSwuwboY1Acy3Hgs=" + "io/micronaut/jsonschema#micronaut-json-schema-processor/2.3.1": { + "jar": "sha256-iW4+/PI3Pv7u6z+Rsos/nRaiL6o0d1ik9bMrbyvTGQM=", + "module": "sha256-NBNoORZbRV7tqcQSx6WleMB1W0wQRuC1ppCdprjXMn8=", + "pom": "sha256-YikkqzjXpXpt3pBLX3sou9fXkEWT60wI0VWVGbRZkoM=" }, "io/micronaut/sourcegen#micronaut-sourcegen-bom/2.0.0": { "module": "sha256-rZitCciraxrk1FJSMh/wzxv5lXQlc9Yw1NPHIvJPykY=", "pom": "sha256-bWpd17kPjpXl8N9jq86dlxDrizJ3ysvBt9207xAxC/Q=" }, + "io/micronaut/sourcegen#micronaut-sourcegen-bom/2.1.0": { + "module": "sha256-hIewpKx4F2ictuAgHn+dtmf+UJSSYi216ilncCRMTkM=", + "pom": "sha256-IWlU6hCZZPFuZ1bLDfBR6Gol1UCLbgqPp67xi6smsxA=" + }, "io/micronaut/sourcegen#micronaut-sourcegen-bytecode-writer/2.1.0": { "jar": "sha256-v2kaPmv2xW/prpqz+9Op9cjaBqYCU88ZimJJ3L0Ga0o=", "module": "sha256-FQ5oHTrSd+oM/7PuSLIBbntuVvBkL6OJ5APj8puJcJw=", @@ -469,13 +462,13 @@ "io/netty#netty-bom/4.2.15.Final": { "pom": "sha256-58gySrJ2FALH0YkkAyDozH+IGKnRo70H2J+qYr5XAqI=" }, - "io/netty#netty-bom/4.2.17.Final": { - "pom": "sha256-CVGqNb3L9tvIevdaZ+mvQ8AWh+1XH3fC6RlUF8Ov6Wk=" + "io/netty#netty-bom/4.2.18.Final": { + "pom": "sha256-EnSGndEVWbhJAJmn5vPtlO3freKCvpFieGPKyPxwVmM=" }, - "io/projectreactor#reactor-core/3.7.12": { - "jar": "sha256-R0+Uyr5f2oh3FHUh83x5HJXva0qd1Z5Ymm3cwhsNjjk=", - "module": "sha256-ih9ZHRPYKCVKZ74MYP2RUM/peChuHD/gyjJtj0zt43Y=", - "pom": "sha256-3bsLjzNnW6WK33ko9yLVlDz245K1hKViWmNe6gHzrjI=" + "io/projectreactor#reactor-core/3.8.7": { + "jar": "sha256-ml8b/FrQQWpBD/Y76qJ5zDDC2jrpsRGmeMg8mSmKFVE=", + "module": "sha256-7kNMYmPvtbf4+NEC6GPPnnH5t2Hzb3TVe3EH7U7diXI=", + "pom": "sha256-VBZFtNGWfR7j21NgmEuv6aQzj7MpXjg92jrBNYSZ47o=" }, "io/reactivex/rxjava3#rxjava/3.1.12": { "jar": "sha256-GAikM+9V3MKWVSPlEquRSl0NcnIoomg+11WdfMz0Tjc=", @@ -505,14 +498,18 @@ "module": "sha256-WvAjs4vXBXsmj4en1c3XQnv4qOKVwzTKn5N8AbcsOdA=", "pom": "sha256-rV1LU+Fh5lN6/lfclqZgjLNols+3M8qpl+m+KNWatU4=" }, + "org/apache/groovy#groovy-bom/5.0.8": { + "module": "sha256-Nlf1IHFV0WMPHE9QNG0/PgYRh1CmlLQt8QSVLvv6dyI=", + "pom": "sha256-gv1eOPthR/nPeYdpv5wAfNyjq4syq62qEQdh/JBngnM=" + }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/bouncycastle#bcprov-jdk18on/1.85.2": { - "jar": "sha256-mGsPuS7BDgxmtD4DbOAHfmFQz67NHbn7krVmcuFXr+U=", - "pom": "sha256-d0/7UU7zQtfnVDgFlE/sMuTaLEKSul19hWDwWmWnwt0=" + "org/bouncycastle#bcprov-jdk18on/1.86": { + "jar": "sha256-KvGQswDLsLNeJIzPX0oGtgcgMK6z2nqY7HOr5bTLNx8=", + "pom": "sha256-lwtwy3WhhGObb7m6PEZaympOGl8//01lzoV0sv157zg=" }, "org/checkerframework#checker-qual/3.55.1": { "jar": "sha256-hXZYyL3L/3lJSajZki+I1j7jdRwgPHzX0h6pf550Uog=", @@ -525,10 +522,10 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/graalvm/buildtools#junit-platform-native/1.1.12": { + "org/graalvm/buildtools#junit-platform-native/1.1.14": { "jar": "sha256-yVE40BS7nCXHCRPwmC1dKfwIgcln7upCKFwx1kd01lc=", - "module": "sha256-v4h4nItsx00vEmu3Uk4vZcf/po0j4fUiIYkGJuunVGw=", - "pom": "sha256-fbXmW1K0h7JOIWvjWTTxIHhLaQEhAKHrkHF7VEVbz/s=" + "module": "sha256-Z2fXicUeof4u1FEzRxADZmGivThu7D/5sjcbDJ8Zwbo=", + "pom": "sha256-IddoCNSlUIcxlKY+IJcUOOaJkJ4i8ILIaOCfch60+dA=" }, "org/jetbrains#annotations/13.0": { "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", @@ -545,6 +542,9 @@ "org/jetbrains/kotlin#kotlin-bom/2.3.21": { "pom": "sha256-lQcEutBMUUNlbPyh0sV08l/K2crDOQWrIqV+n997/Yg=" }, + "org/jetbrains/kotlin#kotlin-bom/2.4.10": { + "pom": "sha256-O6/jfBQqdSfxEHgjrWQ66y84kz2yBZR7n/IdXdMSjow=" + }, "org/jetbrains/kotlin#kotlin-build-tools-api/2.4.10": { "jar": "sha256-OVPSg+dxDJkGcuQDqH3zk9lyapvz4XIZTrtcM+Bi/LA=", "pom": "sha256-eCQqlED5JADq89+NIQitcG9mmlMSWEWn0x0998TeRDk=" @@ -589,10 +589,6 @@ "jar": "sha256-ggkIOkp8TkdtmEKweDCPqWqW8Hpr2Z8F81hu4TKJqyY=", "pom": "sha256-TidHQGbbg/uixZB0KJunEr6MhRV83guQUCmkRcJ19bo=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.3.21": { - "jar": "sha256-M+N9nfqGx6Kas06XW19KEoe0WIeGEQUfNIVlIiDBoss=", - "pom": "sha256-fjwv5c80lKm0dSVYDDjDXEPW42guagsvVllU4Zpy1jk=" - }, "org/jetbrains/kotlin#kotlin-reflect/2.4.10": { "jar": "sha256-JaGu90VNRlSOyq9RAhsOUuOBQaYu11rxJNoQm3MkxOU=", "pom": "sha256-QljwIS9L1y4wR/farOOODeLr/z9+kj6DZDH9j1sZGJ0=" @@ -625,17 +621,17 @@ "jar": "sha256-O9Juy20Sl4xcTgtB92yf9VH6wqXmJoQnqdKgzfilrZE=", "pom": "sha256-Cukeav/wZg79os8CjFvbnnoehn4Z3CyOuuiaglcUOOI=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.3.21": { - "jar": "sha256-4iQ6usK+1uC0e+GLK3/hwbTPakMUgDU9zUnR7TXzEZk=", - "pom": "sha256-9C/BJB/KFDNPapkO2sek90UqHwLGl9hVo/z47eUfAV0=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.4.10": { + "jar": "sha256-56j+fKzzucg49rP8sm391B+ERVGjumf9P5WaDZ1cC+8=", + "pom": "sha256-kk1NXVO8CbyNA8JiMZ3QG3/YdtQfTP4wlvWFxC/2qkg=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.20": { "jar": "sha256-wxQXeTXY3C7ah5UHEX8l1t5W9sV+3plBaxTNYiu54J0=", "pom": "sha256-NditbBnaV6t00h7YHdxYSZt8GwAlEbXoUgANuwxYq64=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.3.21": { - "jar": "sha256-YwkZKSRr66hrX7KwIKb10G4BaTqWC1ilmVnIcTZnmRw=", - "pom": "sha256-0ri51knL28+yHpHLU7TaRt000i11eo+IwdFlADD4IOs=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.4.10": { + "jar": "sha256-CDRrf0z7pAwRORYcnzC2gZn0Jc7PO2PeZ4OAY/NKBcc=", + "pom": "sha256-O0/XwE1zlcr+fh4d7oSSYb/gPGjQVFlBjLNWBXUM2ic=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": { "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=", @@ -651,11 +647,6 @@ "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.3.21": { - "jar": "sha256-b2TqxzbblDTdaSW0pRi50dFxd2UjIMN5Fs+bo859fXo=", - "module": "sha256-e06ksiQrsXektKu2PD89hXMx1A01hl42/MPbZm7BAXQ=", - "pom": "sha256-PgtI2qFNxz+AKdjZ4V7TKUA3fK97kVUQ+I0zIZs1AYY=" - }, "org/jetbrains/kotlin#kotlin-stdlib/2.4.10": { "jar": "sha256-TsApO8N1FCOyA/HYSTJRxXxC5z62N3prhWDQl0/wpt8=", "module": "sha256-HASpjxIAyHBdAV3wiXchFYnuy8h88cTG0oqSaC/oRG4=", @@ -825,29 +816,29 @@ "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" }, - "org/slf4j#jul-to-slf4j/2.0.19": { - "jar": "sha256-pXZPvS8AUzme911AZTxOfJfnM7RWdpRrCgckFvxW/zA=", - "pom": "sha256-lfY0ZEDrJ6Co2oZyk1oqZQE0O8IAhxVsAEaOoE4/clc=" + "org/slf4j#jul-to-slf4j/2.0.20": { + "jar": "sha256-BiJJ0Gd6DggDkSCiKSqNsGTGnQQoK/Viry5UxT/waXY=", + "pom": "sha256-m9GBSbWDA7TYQwWdWxNbO1b6DdHCep24iY1GCc0ziic=" }, "org/slf4j#slf4j-api/2.0.17": { "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" }, - "org/slf4j#slf4j-api/2.0.19": { - "jar": "sha256-6R/21yBgnnoZT/51jD7VyE55hheuB7Cg9qT+IpdBtLs=", - "pom": "sha256-sEpIQ+qimWaAfMlQip8lE/pWPQ0HlMsO3WqNLI9GINA=" + "org/slf4j#slf4j-api/2.0.20": { + "jar": "sha256-fhRGSZs1lnXYqr5q8t6GuF5yrooqkywLQNDlulcJdDk=", + "pom": "sha256-LmJcP1U83dSfhVTOqZJsv3BnOz1oM0ZPDFoC9NkTBZQ=" }, "org/slf4j#slf4j-bom/2.0.17": { "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" }, - "org/slf4j#slf4j-bom/2.0.19": { - "pom": "sha256-4UqasYD2AkfzR942m3pEzNWR0MR/TZa8ZEBWxPg7UaA=" + "org/slf4j#slf4j-bom/2.0.20": { + "pom": "sha256-NRo9NPCIaUImjvzykXCMSN+tzn8mQ4N+/bSmlU1ObGI=" }, "org/slf4j#slf4j-parent/2.0.17": { "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, - "org/slf4j#slf4j-parent/2.0.19": { - "pom": "sha256-RSgx75b76+ZNhV3VyY7GCG10eKnlaEIsg0PG2gCydQ0=" + "org/slf4j#slf4j-parent/2.0.20": { + "pom": "sha256-2THPmc/TVU0yKAnfA8Q++JcILNSA1v+RtE2PBnyjJMg=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -856,24 +847,24 @@ "jar": "sha256-vLH1Hjb5QIZ+gzQvnvv1lorESmvvTTl7tK97F7Rc0vs=", "pom": "sha256-/1iFVroGqmilaAYvLLnSQ93h9jHq/SAQz+8jyrBqerk=" }, - "tools/jackson#jackson-base/3.1.5": { - "pom": "sha256-AxN2LAxUr6+FtMD4YWWBTMvn1OcLPhOuNL0VF3COzrk=" + "tools/jackson#jackson-base/3.2.3": { + "pom": "sha256-j3znOrVg+1LFRcRIdq5gLxjrq9GCF6snRvF/Zay22ik=" }, "tools/jackson#jackson-bom/3.1.3": { "pom": "sha256-9aDcUnRCPNLH+McXoAG6ttstsNhAFT42JevJ3pWM804=" }, - "tools/jackson#jackson-bom/3.1.5": { - "pom": "sha256-FP29y7amAjytv/qtyHjWbFz5T1HIFiuf/vwlfnQkEvQ=" + "tools/jackson#jackson-bom/3.2.3": { + "pom": "sha256-rRgbFQs/Irz46tcifVHMwJ5hDEV8i8yX2JWNJDnvFuw=" }, - "tools/jackson/core#jackson-core/3.1.5": { - "jar": "sha256-lDG3+iZzu7YYwR2GX+FeEyIv0YKiFP+ZjLflav2PNdI=", - "module": "sha256-1L5h2egYzoZUy3b6k48FwvcWazK8o/k3p5nh6np/nSs=", - "pom": "sha256-0Fwfn0NoZjBtJrj0gs5JUH0qX14IFuOgfzUJa5+D4bo=" + "tools/jackson/core#jackson-core/3.2.3": { + "jar": "sha256-oMF+fmZaXpXIL1+0XA/sKuPcVWyA8AFkUsnITNI/OBc=", + "module": "sha256-zaxeWsARD0EzDOTh+j8LzdbnlazVi4RYtwJ3FHLF6ko=", + "pom": "sha256-yJwmx7PDLrCDEffH4Klu/XGmBZHlZ0BVbHRG2vnRKpc=" }, - "tools/jackson/core#jackson-databind/3.1.5": { - "jar": "sha256-OiM42Zb9MFZ5HfjTNfqbqKYqcG7UJF7PgbPlg9830Io=", - "module": "sha256-oC3NjCPkdisob+NIgeEHNiwiPfqLXeazI25j9Yc94BQ=", - "pom": "sha256-k26Jl7VJ3lYhJUPCq/npH7oJRr5RSvqVbXFMLcKeosg=" + "tools/jackson/core#jackson-databind/3.2.3": { + "jar": "sha256-I1tyQ2r5g4V+RO+kJEn08KLFceadbF2d0SU659GS3PI=", + "module": "sha256-bK2kUb3MZVu4dwUKEJS3rKPPTttYErbI9KfmRLdW2r8=", + "pom": "sha256-stJ6Aq7WRqrbU4yxBzeccrnSOUSDczDHgqrTOJeICos=" } } } diff --git a/pkgs/by-name/si/signal-cli/libsignal-jni.nix b/pkgs/by-name/si/signal-cli/libsignal-jni.nix index 2fe9d63ae552..7fc6067ca31e 100644 --- a/pkgs/by-name/si/signal-cli/libsignal-jni.nix +++ b/pkgs/by-name/si/signal-cli/libsignal-jni.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-jni"; - version = "0.102.1"; + version = "0.103.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-YF0mwf9QQ3fbv7KNiniGUVCbemj+59jOKixp4IaywSw="; + hash = "sha256-0I0xo8nKs53b69vARtbb/7VRJFXrJqwsfZl9P+1N9LM="; }; - cargoHash = "sha256-bdp+DJWmg4czoZAP0GalCuK73/8lDTvVrRAwUCNJQXE="; + cargoHash = "sha256-LvRGjukdpkHFBXLqlnDTi0+pVOVgg3bpFDLVFjzRGlE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index 20d1e35d4358..980b8c92e48e 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "signal-cli"; - version = "0.14.8"; + version = "0.14.9"; src = fetchFromGitHub { owner = "AsamK"; repo = "signal-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-511hn+TzLmNfJFIsVpAqERXX0Zmr7D3Ap4JbJjt8vTQ="; + hash = "sha256-8asdvlExwF4oGzwUmbqyL165FG7/irZOmINOnesQybc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sitelen-seli-kiwen/package.nix b/pkgs/by-name/si/sitelen-seli-kiwen/package.nix index 89c944c9402c..6e657a9ffd85 100644 --- a/pkgs/by-name/si/sitelen-seli-kiwen/package.nix +++ b/pkgs/by-name/si/sitelen-seli-kiwen/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sitelen-seli-kiwen"; - version = "2.2"; + version = "2.3"; src = fetchzip { url = "https://github.com/kreativekorp/sitelen-seli-kiwen/releases/download/${finalAttrs.version}/sitelenselikiwen.zip"; stripRoot = false; - hash = "sha256-2qxnHjUcfdJG6o/JI4YJP6YVr4/if/0AkMTvco4HWPc="; + hash = "sha256-dMfEAb7uekAhexPLqke9Kz86p0uurdQCIy8RQAlOhBA="; }; installPhase = '' diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 1571c0782b56..91948a694a34 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -1,6 +1,7 @@ { lib, - tmux, + zellij, + ncurses, hexdump, fetchFromGitHub, installShellFiles, @@ -11,7 +12,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "skim"; - version = "5.4.0"; + version = "5.7.3"; __structuredAttrs = true; outputs = [ @@ -24,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "skim-rs"; repo = "skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-inNBe4Qzn6QjmIL8VMnJ/RuSUIrZ0tCbUV63vP/61Y4="; + hash = "sha256-sG7nfBfsJWQFo/uS6nJ5VPBG7q3YBF4+5T8E9UmurME="; }; postPatch = '' @@ -32,11 +33,12 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "expand(':h:h')" "'$out'" ''; - cargoHash = "sha256-7nV/PxTpPLeblmjnzsYpAFM6u50AQ+OAaUWf/2JHGzQ="; + cargoHash = "sha256-QyqAAJhEqJnajwras4/ipsf93B04NXq98j+9T5LTibY="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ - tmux + zellij + ncurses hexdump ]; @@ -66,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { useNextest = true; checkPhase = '' - cargo nextest run --release --offline --lib --bins --examples --tests + cargo nextest run --release --offline --lib --bins --examples --tests --profile ci ''; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix index 4d8f08daa463..14f584ff04c8 100644 --- a/pkgs/by-name/sk/skyemu/package.nix +++ b/pkgs/by-name/sk/skyemu/package.nix @@ -2,31 +2,34 @@ lib, stdenv, fetchFromGitHub, - cmake, - ninja, - pkg-config, - curl, - openssl, SDL2, alsa-lib, - libGL, - libGLU, - libx11, - libxi, - libxcursor, - makeDesktopItem, + cmake, copyDesktopItems, + curl, + libGL, + libx11, + libxcursor, + libxi, + makeDesktopItem, + ninja, + nix-update-script, + openssl, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "skyemu"; - version = "4"; + version = "5"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "skylersaleh"; repo = "SkyEmu"; tag = "v${finalAttrs.version}"; - hash = "sha256-rfXHOff+PG5iA19iwEij4c5aFD9XrSF1GQhIBhWzKgg="; + hash = "sha256-x8WWJpP16CrdFlN67HEap6m9yWdFrK76qumLGub5ODE="; }; nativeBuildInputs = [ @@ -37,17 +40,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - alsa-lib curl - libGL - libGLU openssl SDL2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libGL libx11 - libxi libxcursor + libxi ]; cmakeFlags = [ @@ -55,11 +57,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_OPENSSL" true) (lib.cmakeBool "USE_SYSTEM_SDL2" true) (lib.cmakeBool "ENABLE_RETRO_ACHIEVEMENTS" true) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" stdenv.hostPlatform.darwinArch) ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CMAKE_OSX_ARCHITECTURES' '#set(CMAKE_OSX_ARCHITECTURES' + postInstall = '' + install -Dm444 ../src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/skyemu.svg ''; desktopItems = [ @@ -76,16 +80,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postInstall = '' - install -Dm644 $src/src/resources/icons/icon.png $out/share/pixmaps/skyemu.png - ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Low level GameBoy, GameBoy Color, Game Boy Advance, and DS emulator"; homepage = "https://github.com/skylersaleh/SkyEmu"; + changelog = "https://github.com/skylersaleh/SkyEmu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ liberodark ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "SkyEmu"; - platforms = with lib.platforms; unix ++ windows; }; }) diff --git a/pkgs/by-name/sp/spotifast/package.nix b/pkgs/by-name/sp/spotifast/package.nix index 54285134156c..4497ce7513fa 100644 --- a/pkgs/by-name/sp/spotifast/package.nix +++ b/pkgs/by-name/sp/spotifast/package.nix @@ -11,7 +11,6 @@ nix-update-script, dbus, rcodesign, - re-plistbuddy, alsa-lib, libpulseaudio, libGL, @@ -38,7 +37,7 @@ let in rustPlatform.buildRustPackage rec { pname = "spotifast"; - version = "0.10.1"; + version = "0.11.2"; __structuredAttrs = true; @@ -46,10 +45,10 @@ rustPlatform.buildRustPackage rec { owner = "crmne"; repo = "spotifast"; tag = "v${version}"; - hash = "sha256-rLyzvv7eJSHbzJdwx0iuwk5MHXWHHneGTOkpUQwIGAg="; + hash = "sha256-4hseXK3dvXL6fBNDuQ2sq8wrtpRqSRZPErgCixPdt50="; }; - cargoHash = "sha256-pwid4r8fy3t4g6CsAepkvT9KbExUxml6jj8c71Pv/wc="; + cargoHash = "sha256-giJlt4MNb0/zWV8Y319HYtZc+q/ADRBxbodt/2MKu/0="; # projectm-sys only searches lib, while CMake may otherwise install to lib64. postPatch = '' @@ -57,12 +56,6 @@ rustPlatform.buildRustPackage rec { --replace-fail \ '.define("BUILD_SHARED_LIBS", build_shared_libs)' \ '.define("CMAKE_INSTALL_LIBDIR", "lib").define("BUILD_SHARED_LIBS", build_shared_libs)' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/updates/macos.rs \ - --replace-fail \ - 'Command::new("/usr/libexec/PlistBuddy")' \ - 'Command::new("${lib.getExe' re-plistbuddy "PlistBuddy"}")' ''; # The proxy test needs a valid CA bundle. @@ -79,7 +72,6 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ rcodesign icnsify - re-plistbuddy ]; nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ dbus ]; diff --git a/pkgs/by-name/st/st/package.nix b/pkgs/by-name/st/st/package.nix index 62e1f960c97f..9f6022bde663 100644 --- a/pkgs/by-name/st/st/package.nix +++ b/pkgs/by-name/st/st/package.nix @@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: { configFile = lib.optionalString (conf != null) (writeText "config.def.h" conf); postPatch = - lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h" + lib.optionalString (conf != null) '' + cp ${finalAttrs.configFile} config.def.h + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" '' diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 3636545894e5..796a46ddeefc 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -69,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stats"; - version = "3.0.13"; + version = "3.0.17"; __structuredAttrs = true; strictDeps = true; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "exelban"; repo = "Stats"; tag = "v${finalAttrs.version}"; - hash = "sha256-0EDQnMD/Cm2DG0bgt6MVexbVBWObRkF1OXnLwdy3TAo="; + hash = "sha256-PpifztjKCuRQ6uvsvf78hh04yyRhDvjPAw+Bjug0mLg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index 74b8de3644d4..552104006bc5 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/sveltejs/language-tools"; license = lib.licenses.mit; mainProgram = "svelte-check"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dfjay ]; }; }) diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index a45a6b2a06b2..35c005b02d10 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/sveltejs/language-tools"; license = lib.licenses.mit; mainProgram = "svelteserver"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dfjay ]; }; }) diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index df4bee0faadd..922f0f984cf0 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + procps, stdenv, versionCheckHook, nix-update-script, @@ -10,23 +11,27 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tailspin"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; tag = finalAttrs.version; - hash = "sha256-9+uu9q9tGIWFnyYpy+HHD5UUCsxUDLRlZlo0Ap4ezsY="; + hash = "sha256-RI604v8ImQSgvNUGsnCLe6FuzEMJwE0tNVuFLmJLwvM="; }; - cargoHash = "sha256-C3OORW5aeDrRDTlfvRNW3RLE0p8wFs1qbIKl/XpzThs="; + cargoHash = "sha256-kcd6rBoonoCKuybVIVtZqt+njHFhVDTjTyF2UURuOSI="; nativeBuildInputs = [ installShellFiles ]; - postPatch = '' - substituteInPlace tests/utils.rs --replace-fail \ - 'target/debug' "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$cargoCheckType" - ''; + nativeCheckInputs = [ procps ]; + checkFlags = lib.optionals (!(stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin)) [ + # Requires pgrep, which is not provided by procps on non-Linux systems + "--skip=failing_pager_spawn_kills_the_exec_child" + "--skip=pager_killed_by_ctrl_c_is_a_quiet_quit" + "--skip=quitting_the_pager_kills_the_exec_child" + "--skip=stream_error_while_paging_kills_the_pager" + ]; postInstall = '' installShellCompletion completions/tspin.{bash,fish,zsh} diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index fe1a197a241b..d2b4636d91ad 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -14,7 +14,7 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tauno-monitor"; - version = "0.3.0"; + version = "0.3.2"; pyproject = false; __structuredAttrs = true; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "taunoe"; repo = "tauno-monitor"; tag = "v${finalAttrs.version}"; - hash = "sha256-FCwIxto/VBAzyJ0P9CJcJTt5BZQFOlQ/RINi8P0iOjo="; + hash = "sha256-nYpMmmvonPeKIzqw+XbVPRDbovU//tijc62Y6PUDw30="; }; nativeBuildInputs = [ @@ -51,6 +51,10 @@ python3Packages.buildPythonApplication (finalAttrs: { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + postInstallCheck = '' + mesonCheckPhase + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/te/tea/package.nix b/pkgs/by-name/te/tea/package.nix index ed5e1297e728..a8fe85f314ec 100644 --- a/pkgs/by-name/te/tea/package.nix +++ b/pkgs/by-name/te/tea/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { owner = "gitea"; repo = "tea"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-wAs0L3UOwsyElrQ9n5BKV8rDZHzj42xL11HT1CFre8k="; + hash = "sha256-wAs0L3UOwsyElrQ9n5BKV8rDZHzj42xL11HT1CFre8k="; }; vendorHash = "sha256-QzJai1AmdXz5pYg1SEEFOetWJkkUhDZoQbJkhkz8UD4="; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 53347a79e8e5..18f26378ceb2 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -44,6 +44,9 @@ let postInstall = '' installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1 + + mkdir -p $out/share + cp -r cable $out/share/cable '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' mkdir -p $out/share/television diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 3220b170eed9..6cff2008cada 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -2089,6 +2089,19 @@ }; }; + odoc = rec { + version = "0.2.0"; + url = "github:tmcgilchrist/tree-sitter-odoc?ref=${version}"; + hash = "sha256-hLx5spgka2fW7L2yjdDvNxRcEwcZsGGQ9Xd5bFITg8A="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + leungbk + ]; + }; + excludeBrokenTreeSitterJson = true; + }; + ohm = { version = "0-unstable-2025-12-12"; url = "github:novusnota/tree-sitter-ohm"; diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix index 8a6429ffa84e..b5572ad7980c 100644 --- a/pkgs/by-name/ty/typescript-language-server/package.nix +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -2,27 +2,28 @@ lib, stdenv, fetchFromGitHub, - fetchYarnDeps, - fixup-yarn-lock, + fetchPnpmDeps, makeWrapper, nodejs, - prefetch-yarn-deps, + pnpm_12, + pnpmBuildHook, + pnpmConfigHook, replaceVars, - yarn, testers, typescript_5, + versionCheckHook, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "typescript-language-server"; - version = "5.3.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "typescript-language-server"; repo = "typescript-language-server"; - rev = "v${finalAttrs.version}"; - hash = "sha256-9xK1maMfWowWlzAtmwoR3CVqQCkUf6i9uBWVsobBQPA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3wZYxzN0yGmofpufw4IjPkQGQe70U58ZZ9zrqamqe7s="; }; patches = [ @@ -31,53 +32,37 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-68aXoafE/wc1iS7HHwF7g/i8ZREoTj4bV/RL3XYc0Rs="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_12; + fetcherVersion = 4; + hash = "sha256-MUSxDMlbG21KSesGdEvqa2kEpuVfLlXRUX1qV/FGsSo="; }; nativeBuildInputs = [ - fixup-yarn-lock makeWrapper nodejs - prefetch-yarn-deps - yarn + pnpm_12 + pnpmBuildHook + pnpmConfigHook ]; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - installPhase = '' runHook preInstall - yarn --offline --production install + # The build is a self-contained bundle: there are no runtime dependencies. + mkdir -p "$out/lib" + cp lib/cli.mjs "$out/lib" - mkdir -p "$out/lib/node_modules/typescript-language-server" - cp -r lib node_modules package.json "$out/lib/node_modules/typescript-language-server" - - makeWrapper "${nodejs}/bin/node" "$out/bin/typescript-language-server" \ - --add-flags "$out/lib/node_modules/typescript-language-server/lib/cli.mjs" + makeWrapper "${lib.getExe nodejs}" "$out/bin/typescript-language-server" \ + --add-flags "$out/lib/cli.mjs" runHook postInstall ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/u9/u9fs/package.nix b/pkgs/by-name/u9/u9fs/package.nix index dc9f8ee159d8..0a9f42ac2f9a 100644 --- a/pkgs/by-name/u9/u9fs/package.nix +++ b/pkgs/by-name/u9/u9fs/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "plan9-from-bell-labs"; repo = "u9fs"; rev = "d65923fd17e8b158350d3ccd6a4e32b89b15014a"; - sha256 = "0h06l7ciikp3gzrr550z0fyrfp3y2067dfd3rxxw0q95z4l6vhy1"; + hash = "sha256-wcNtKPklYcB7z6O5dgwQflyXvQMflJLzf+POGNmhBkA="; }; installPhase = '' diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 9db82067154d..be03c39af023 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -114,8 +114,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf # Biome executable needs to be patched to run, but we don't need to format code anyway, so just skip it. + # Also, increase test timeout as some tests may take longer on resource-constrained machines. substituteInPlace ./package.json \ - --replace-fail ' && biome format --write src/tracker/index.d.ts' ''' + --replace-fail ' && biome format --write src/tracker/index.d.ts' ''' \ + --replace-fail '"vitest run"' '"vitest run --test-timeout=10000"' substituteInPlace ./scripts/generate-api-client.ts \ --replace-fail 'await format(written);' "" ''; @@ -155,7 +157,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preCheck # Tests fail if NODE_ENV=production - NODE_ENV=development pnpm test + # Logging is much more readable when CI=1 + NODE_ENV=development CI=1 pnpm test runHook postCheck ''; diff --git a/pkgs/by-name/un/unxip/package.nix b/pkgs/by-name/un/unxip/package.nix new file mode 100644 index 000000000000..33b5675f9381 --- /dev/null +++ b/pkgs/by-name/un/unxip/package.nix @@ -0,0 +1,60 @@ +{ + lib, + fetchFromGitHub, + getopt, + stdenv, + swift, + swiftpm, + versionCheckHook, + xz, # liblzma + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unxip"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "saagarjha"; + repo = "unxip"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+DYqb4Y2jqWEMungO+rE1UzMXLuAWAzsx6s0mbtOkR4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + zlib + xz + getopt + ]; + + installPhase = '' + runHook preInstall + + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + cp $binPath/unxip $out/bin/ + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + __structuredAttrs = true; + + meta = { + description = "Fast Xcode unarchiver"; + homepage = "https://github.com/saagarjha/unxip"; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ DimitarNestorov ]; + mainProgram = "unxip"; + }; +}) diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix index 3623a49026ba..9190de449a75 100644 --- a/pkgs/by-name/vi/vis/package.nix +++ b/pkgs/by-name/vi/vis/package.nix @@ -3,41 +3,41 @@ stdenv, fetchFromGitHub, pkg-config, - makeWrapper, + makeBinaryWrapper, copyDesktopItems, makeDesktopItem, ncurses, - libtermkey, - lua5_2_compat, + lua5_5, tre, acl, libselinux, }: let - lua = lua5_2_compat; - luaEnv = lua.withPackages (ps: [ ps.lpeg ]); + luaEnv = lua5_5.withPackages (ps: [ ps.lpeg ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vis"; - version = "0.9"; + version = "0.9-unstable-2026-10-03"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { - rev = "v${version}"; - hash = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; + rev = "bd0bb3449e6eef991d507689c4bfba53c14fd9c5"; + hash = "sha256-uRGTH5yQGo8O3LahArbSq1uLkH0LZ6rWJqa5S7P50Gg="; repo = "vis"; owner = "martanne"; }; nativeBuildInputs = [ pkg-config - makeWrapper + makeBinaryWrapper copyDesktopItems ]; buildInputs = [ ncurses - libtermkey luaEnv tre ] @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/vis \ - --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ + --prefix LUA_CPATH ';' "${lua5_5.pkgs.luaLib.genLuaCPathAbsStr luaEnv}" \ + --prefix LUA_PATH ';' "${lua5_5.pkgs.luaLib.genLuaPathAbsStr luaEnv}" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; @@ -59,11 +59,10 @@ stdenv.mkDerivation rec { exec = "vis %U"; type = "Application"; icon = "accessories-text-editor"; - comment = meta.description; + comment = finalAttrs.meta.description; desktopName = "vis"; genericName = "Text editor"; categories = [ - "Application" "Development" "IDE" ]; @@ -80,8 +79,11 @@ stdenv.mkDerivation rec { description = "Vim like editor"; homepage = "https://github.com/martanne/vis"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ ramkromberg ]; + maintainers = with lib.maintainers; [ + ramkromberg + es-sai-fi + ]; platforms = lib.platforms.unix; mainProgram = "vis"; }; -} +}) diff --git a/pkgs/by-name/vo/voxtype/openvino-genai-from-crates-io.patch b/pkgs/by-name/vo/voxtype/openvino-genai-from-crates-io.patch new file mode 100644 index 000000000000..f56c1ecf3037 --- /dev/null +++ b/pkgs/by-name/vo/voxtype/openvino-genai-from-crates-io.patch @@ -0,0 +1,64 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bc6108d..04dec57 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3884,7 +3884,8 @@ dependencies = [ + [[package]] + name = "openvino-finder" + version = "0.11.0" +-source = "git+https://github.com/voxtype/openvino-rs?branch=whisper-pipeline-with-properties#8109638cfc78eb16953316627bf194d59ca521ab" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a527e1414732f5bcad520b9febf29fd92ef4bba100588b4591cba8370ab6cbda" + dependencies = [ + "cfg-if", + "log", +@@ -3893,7 +3894,8 @@ dependencies = [ + [[package]] + name = "openvino-genai" + version = "0.11.0" +-source = "git+https://github.com/voxtype/openvino-rs?branch=whisper-pipeline-with-properties#8109638cfc78eb16953316627bf194d59ca521ab" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58748dc7c7eb98f2706152eb9e3ce0f4023359e54a9607656d653f8b7af689a8" + dependencies = [ + "openvino-finder", + "openvino-genai-sys", +@@ -3902,7 +3904,8 @@ dependencies = [ + [[package]] + name = "openvino-genai-sys" + version = "0.11.0" +-source = "git+https://github.com/voxtype/openvino-rs?branch=whisper-pipeline-with-properties#8109638cfc78eb16953316627bf194d59ca521ab" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce904847ba3b9328e412dd95741e432f75db3177e21742f80b22eb9dcef4cafe" + dependencies = [ + "env_logger", + "libloading 0.8.9", +@@ -3913,7 +3916,8 @@ dependencies = [ + [[package]] + name = "openvino-sys" + version = "0.11.0" +-source = "git+https://github.com/voxtype/openvino-rs?branch=whisper-pipeline-with-properties#8109638cfc78eb16953316627bf194d59ca521ab" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "637459f74d22a7bb772af9d3a5df61c88608d8daaa6fefe950849c7aabf891c3" + dependencies = [ + "env_logger", + "libloading 0.8.9", +diff --git a/Cargo.toml b/Cargo.toml +index 05a6262..e76859c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -331,15 +331,3 @@ path = "src/bin/voxtype_mirror_registry.rs" + [[example]] + name = "inspect_cohere_onnx" + required-features = ["cohere"] +- +-# TEMPORARY: openvino-genai 0.11.0's WhisperPipeline has no way to pass +-# device properties (CACHE_DIR etc.), unlike LlmPipeline/VlmPipeline in +-# the same crate which already expose with_properties(). Pinned to a +-# voxtype-org mirror of the fork branch that adds the same method for +-# Whisper (upstream review pending at +-# https://github.com/intel/openvino-rs/pull/196); mirrored so source +-# builds don't depend on an individual's fork staying available. +-# Drop this patch (and bump the openvino-genai version requirement above +-# if needed) once that PR merges and ships in a crates.io release. +-[patch.crates-io] +-openvino-genai = { git = "https://github.com/voxtype/openvino-rs", branch = "whisper-pipeline-with-properties" } diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix index 89f707c104a5..4d1b6de9f8d8 100644 --- a/pkgs/by-name/vo/voxtype/package.nix +++ b/pkgs/by-name/vo/voxtype/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "voxtype"; - version = "1.0.1"; + version = "1.1.0"; __structuredAttrs = true; @@ -64,10 +64,16 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "peteonrails"; repo = "voxtype"; tag = "v${finalAttrs.version}"; - hash = "sha256-OT0tVSi9x3U7NwgZU00mojXk3RRWxuFoezpdSknLmmU="; + hash = "sha256-zw7Up84IdNv6p8Ae7VnBDuCC/smYHCpMB7C2aN1ZXyc="; }; - cargoHash = "sha256-kJFI9sSMzaaYHuc7ze5Lkwt3ZVskM9rB9bvTon0XguU="; + # The lock file pins openvino-genai to a git fork whose openvino-sys crate + # carries a submodule with a symlink loop, which fetchCargoVendor cannot + # copy. The fork only matters for the openvino-whisper feature, which is not + # built here, so resolve it from crates.io instead. + cargoPatches = [ ./openvino-genai-from-crates-io.patch ]; + + cargoHash = "sha256-z3mPi/FPJtxErjMn2pqO8Gon+y0CntJw1b5pskMKhIs="; buildFeatures = [ ] diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index f4e0b28769c1..6fed01c5ed81 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.3.11"; + version = "3.3.12"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-a8gs53zcq5qssqnxlMGjxfZaBICisdjqkLfzqZStPfQ="; + hash = "sha256-JISymYGk10A2wyjKuJ6c3YKNKQkuN0/PCWFDYOnsy/Q="; }; pnpmDeps = fetchPnpmDeps { @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-aUxUw3PjlSyUATb2FFQstpq+3P3ymPGZnmdiuYUQ3AE="; + hash = "sha256-XTcLYnVgWl/CZExeumDsFMKqyq8pS37X7Mo/kwmz9HM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index eb14572ea3c8..5a25cf0d9445 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -10,13 +10,15 @@ let version = "5.4.2"; src = fetchurl { url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage"; - sha256 = "sha256-LgvJ8haE1BTqRPfo+5oVwcDUDVSv6Og+eQJxmDJNc2g="; + hash = "sha512-3n73cnXW81w+7ta6+nnPymEriU9CpfKwX8DFNuxuNMMEBCyL6YgpQmxa0qKY6hr9WiiHQyuqvrSe+bXURwv31w=="; }; in appimageTools.wrapType2 { inherit pname version src; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = @@ -50,6 +52,7 @@ appimageTools.wrapType2 { maintainers = with lib.maintainers; [ sodiboo returntoreality + FlorianFranzen ]; mainProgram = "wootility"; }; diff --git a/pkgs/by-name/wo/wootility/update.sh b/pkgs/by-name/wo/wootility/update.sh new file mode 100755 index 000000000000..5606deedee89 --- /dev/null +++ b/pkgs/by-name/wo/wootility/update.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +# The electron-updater manifest is the only feed; its base64 sha512 is already SRI. +feed=$(curl -sL 'https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/latest-linux.yml') +newver=$(echo "$feed" | grep -Po '^version: \K.*') +newhash=$(echo "$feed" | grep -Po '^sha512: \K.*') + +sed -i package.nix \ + -e "/^ version =/ s|\".*\"|\"$newver\"|" \ + -e "/sha512-/ s|\".*\"|\"sha512-$newhash\"|" diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 7f073a745712..c621c5b152cb 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -47,44 +47,48 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/usr/share/zapret/init.d/sysv - mkdir -p $out/usr/share/docs + # keep $out/usr for backwards compability + mkdir -p $out/share $out/usr + ln -s ../share $out/usr/share + + mkdir -p $out/share/zapret/init.d/sysv + mkdir -p $out/share/docs cp $src/blockcheck.sh $out/bin/blockcheck substituteInPlace $out/bin/blockcheck \ - --replace-fail '$(cd "$EXEDIR"; pwd)' "$out/usr/share/zapret" + --replace-fail '$(cd "$EXEDIR"; pwd)' "$out/share/zapret" - ln -s ../../../bin/blockcheck $out/usr/share/zapret/blockcheck + ln -s ../../bin/blockcheck $out/share/zapret/blockcheck - cp $src/init.d/sysv/functions $out/usr/share/zapret/init.d/sysv/functions - cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d + cp $src/init.d/sysv/functions $out/share/zapret/init.d/sysv/functions + cp $src/init.d/sysv/zapret $out/share/zapret/init.d/sysv/init.d - substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \ - --replace-fail "/opt/zapret" "\"$out/usr/share/zapret\"" + substituteInPlace $out/share/zapret/init.d/sysv/functions \ + --replace-fail "/opt/zapret" "\"$out/share/zapret\"" - touch $out/usr/share/zapret/config + touch $out/share/zapret/config - cp -r $src/docs/* $out/usr/share/docs + cp -r $src/docs/* $out/share/docs - mkdir -p $out/usr/share/zapret/{common,files/fake,ipset} + mkdir -p $out/share/zapret/{common,files/fake,ipset} - cp $src/common/* $out/usr/share/zapret/common - cp $src/files/fake/* $out/usr/share/zapret/files/fake - cp $src/ipset/* $out/usr/share/zapret/ipset + cp $src/common/* $out/share/zapret/common + cp $src/files/fake/* $out/share/zapret/files/fake + cp $src/ipset/* $out/share/zapret/ipset - rm -f $out/usr/share/zapret/ipset/zapret-hosts-user-exclude.txt.default + rm -f $out/share/zapret/ipset/zapret-hosts-user-exclude.txt.default - mkdir -p $out/usr/share/zapret/nfq - ln -s ../../../../bin/nfqws $out/usr/share/zapret/nfq/nfqws + mkdir -p $out/share/zapret/nfq + ln -s ../../../bin/nfqws $out/share/zapret/nfq/nfqws for i in ip2net mdig tpws do - mkdir -p $out/usr/share/zapret/$i - ln -s ../../../../bin/$i $out/usr/share/zapret/$i/$i + mkdir -p $out/share/zapret/$i + ln -s ../../../bin/$i $out/share/zapret/$i/$i done - ln -s ../usr/share/zapret/init.d/sysv/init.d $out/bin/zapret + ln -s ../share/zapret/init.d/sysv/init.d $out/bin/zapret runHook postInstall ''; diff --git a/pkgs/by-name/ze/zentra/package.nix b/pkgs/by-name/ze/zentra/package.nix index 7ac68065a633..5ee2e1e1f7ce 100644 --- a/pkgs/by-name/ze/zentra/package.nix +++ b/pkgs/by-name/ze/zentra/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapProgram $out/bin/zentra --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} ''; - checkFlagsArray = [ + checkFlags = [ # Some details are missing for these tests "--skip=incremental::detect::tests::compute_change_set_git_includes_committed_and_dirty" "--skip=incremental::detect::tests::working_tree_changes_includes_non_ascii_filename" diff --git a/pkgs/by-name/zo/zond/package.nix b/pkgs/by-name/zo/zond/package.nix index 7ae737258d41..5f2887f9c2d9 100644 --- a/pkgs/by-name/zo/zond/package.nix +++ b/pkgs/by-name/zo/zond/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libpcap ]; - checkFlagsArray = [ + checkFlags = [ # Test requires raw socket/packet capture "--skip=the_reason_flag_shows_the_packet_behind_a_verdict" ]; diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix index 9ade5fb444d9..8c9437dd5c4e 100644 --- a/pkgs/by-name/zu/zulip-term/package.nix +++ b/pkgs/by-name/zu/zulip-term/package.nix @@ -27,7 +27,7 @@ let in with py.pkgs; -buildPythonApplication rec { +buildPythonApplication { pname = "zulip-term"; version = "0.7.0-unstable-2026-02-10"; pyproject = true; @@ -97,7 +97,7 @@ buildPythonApplication rec { meta = { description = "Zulip's official terminal client"; homepage = "https://github.com/zulip/zulip-terminal"; - changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}"; + changelog = "https://github.com/zulip/zulip-terminal/releases/tag/0.7.0"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index b09170f30dda..b75c7ba4faf1 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,7 +11,7 @@ version ? "2.4.0", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qtermwidget"; inherit version; diff --git a/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix index 4c5c13d12f11..89886d91fc30 100644 --- a/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix @@ -5,7 +5,7 @@ { version, src, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fvp"; inherit version src; inherit (src) passthru; diff --git a/pkgs/development/compilers/dart/package-source-builders/printing/default.nix b/pkgs/development/compilers/dart/package-source-builders/printing/default.nix index 7fa7aab56fa6..0b52abcfa755 100644 --- a/pkgs/development/compilers/dart/package-source-builders/printing/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/printing/default.nix @@ -7,7 +7,7 @@ { version, src, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "printing"; inherit version src; inherit (src) passthru; diff --git a/pkgs/development/compilers/dart/package-source-builders/system-tray/default.nix b/pkgs/development/compilers/dart/package-source-builders/system-tray/default.nix index 48370fe50440..aa7466f2fc8b 100644 --- a/pkgs/development/compilers/dart/package-source-builders/system-tray/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/system-tray/default.nix @@ -5,7 +5,7 @@ { version, src, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "system-tray"; inherit version src; inherit (src) passthru; diff --git a/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix b/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix index e439ba4c0648..e0bcece7995d 100644 --- a/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix @@ -5,7 +5,7 @@ { version, src, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xdg_directories"; inherit version src; inherit (src) passthru; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 8d476c108a34..f31d9c6210de 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -16,7 +16,7 @@ let inherit ((import ./sources.nix).aqbanking) hash releaseId version; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "aqbanking"; inherit version; diff --git a/pkgs/development/ocaml-modules/capnp-rpc/default.nix b/pkgs/development/ocaml-modules/capnp-rpc/default.nix index 88a8653ce46a..025a7e8bd237 100644 --- a/pkgs/development/ocaml-modules/capnp-rpc/default.nix +++ b/pkgs/development/ocaml-modules/capnp-rpc/default.nix @@ -52,5 +52,8 @@ buildDunePackage (finalAttrs: { homepage = "https://github.com/mirage/capnp-rpc"; changelog = "https://github.com/mirage/capnp-rpc/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + akirak + ]; }; }) diff --git a/pkgs/development/octave-modules/octclip/default.nix b/pkgs/development/octave-modules/octclip/default.nix index d5bd62f5f5fb..953d9f5694c1 100644 --- a/pkgs/development/octave-modules/octclip/default.nix +++ b/pkgs/development/octave-modules/octclip/default.nix @@ -12,7 +12,7 @@ buildOctavePackage rec { owner = "jgpallero"; repo = pname; rev = "OctCLIP-${version}"; - sha256 = "sha256-gG2b8Ix6bzO6O7GRACE81JCVxfXW/+ZdfoniigAEq3g="; + hash = "sha256-gG2b8Ix6bzO6O7GRACE81JCVxfXW/+ZdfoniigAEq3g="; }; # The only compilation problem is that no formatting specifier was provided diff --git a/pkgs/development/octave-modules/octproj/default.nix b/pkgs/development/octave-modules/octproj/default.nix index d08115321128..83e520c04ea1 100644 --- a/pkgs/development/octave-modules/octproj/default.nix +++ b/pkgs/development/octave-modules/octproj/default.nix @@ -14,7 +14,7 @@ buildOctavePackage rec { owner = "jgpallero"; repo = "octproj"; rev = "OctPROJ-${version}"; - sha256 = "sha256-0QDlpfqFTSndUPkOslugDBM0UBKiusZwKGFuDrco7X4="; + hash = "sha256-0QDlpfqFTSndUPkOslugDBM0UBKiusZwKGFuDrco7X4="; }; # The sed changes below allow for the package to be compiled. diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 4e34e56ac593..bea437ce633b 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -10,7 +10,6 @@ # dependencies anyio, - distro, docstring-parser, httpx2, jiter, @@ -39,7 +38,7 @@ buildPythonPackage (finalAttrs: { pname = "anthropic"; - version = "1.6.0"; + version = "1.8.0"; pyproject = true; __structuredAttrs = true; @@ -47,7 +46,7 @@ buildPythonPackage (finalAttrs: { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-q3g+bqgMJuDtR9TETrDXWp/SyyeAdPWnnJxbL4FuFdM="; + hash = "sha256-SWZ00mY28wgL4lgtfDVMmhZct5f8rbfU2NXepwwEadY="; }; postPatch = '' @@ -62,7 +61,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ anyio - distro docstring-parser httpx2 jiter diff --git a/pkgs/development/python-modules/copier-template-tester/default.nix b/pkgs/development/python-modules/copier-template-tester/default.nix index 636c90b83140..8b351e140cb9 100644 --- a/pkgs/development/python-modules/copier-template-tester/default.nix +++ b/pkgs/development/python-modules/copier-template-tester/default.nix @@ -4,24 +4,22 @@ corallium, fetchFromGitHub, lib, - poetry-core, - poetry-dynamic-versioning, + uv-build, }: buildPythonPackage rec { pname = "copier-template-tester"; - version = "2.2.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "KyleKing"; repo = "copier-template-tester"; tag = version; - hash = "sha256-n/39Gl4q24QKfVFaeeqqu0AQt2jRSRrcnEOFRHQ+SQE="; + hash = "sha256-eWTrrvZGucHYJVZfhCZSJJQGSqhXLSf8Rp4ZPsGxsIw="; }; build-system = [ - poetry-core - poetry-dynamic-versioning + uv-build ]; dependencies = [ diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix index 8378e4ee4dba..44f4d5ff44b4 100644 --- a/pkgs/development/python-modules/corallium/default.nix +++ b/pkgs/development/python-modules/corallium/default.nix @@ -3,36 +3,48 @@ buildPythonPackage, fetchFromGitHub, lib, - poetry-core, - pydantic, - python, rich, tomli, + typing-extensions, + uv-build, }: buildPythonPackage rec { pname = "corallium"; - version = "2.1.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "KyleKing"; repo = "corallium"; tag = version; - hash = "sha256-0P8qmX+1zigL4jaA4TTuqAzFkyhQUfdGmPLxkFnT0qE="; + hash = "sha256-BtePG2XcukAytbNyIfH3rBesx7nu7J1TLtfbzZO37Os="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.26,<2.0" "uv_build" + # Upstream declares a bogus self-dependency which breaks the runtime deps check + substituteInPlace pyproject.toml --replace-fail "'corallium>=2.0.1'," "" + ''; + build-system = [ - poetry-core + uv-build ]; dependencies = [ beartype - pydantic rich + tomli + typing-extensions ]; + # Top-level __init__ pulls the full subpackage tree; no optional deps needed + pythonImportsCheck = [ "corallium" ]; + + # tests/ requires dev deps (structlog, pytest-*) not worth packaging here + meta = { - description = "Shared functionality for calcipy-ecosystem"; + description = "Shared functionality for the calcipy-ecosystem"; homepage = "https://corallium.kyleking.me"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ yajo ]; diff --git a/pkgs/development/python-modules/cuda-bindings/default.nix b/pkgs/development/python-modules/cuda-bindings/default.nix index 1ad0600740ed..55e17e2cf7d7 100644 --- a/pkgs/development/python-modules/cuda-bindings/default.nix +++ b/pkgs/development/python-modules/cuda-bindings/default.nix @@ -138,11 +138,17 @@ buildPythonPackage (finalAttrs: { CUDA_HOME = symlinkJoin { name = "cuda-redist"; - paths = with cudaPackages; [ - (lib.getInclude cuda_cudart) # cuda_runtime.h - (lib.getInclude cuda_nvrtc) # nvrtc.h - (lib.getInclude cuda_profiler_api) # cudaProfiler.h, cuda_profiler_api.h - ]; + paths = + with cudaPackages; + [ + (lib.getInclude cuda_cudart) # cuda_runtime.h + (lib.getInclude cuda_nvrtc) # nvrtc.h + (lib.getInclude cuda_profiler_api) # cudaProfiler.h, cuda_profiler_api.h + ] + ++ lib.optionals finalAttrs.doInstallCheck [ + # Examples (run by tests/test_examples.py) locate via cuda.pathfinder + (lib.getInclude cccl) + ]; }; }; diff --git a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_4.patch b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_4.patch index 6beba770d85c..98f26a5fba8b 100644 --- a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_4.patch +++ b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_4.patch @@ -175,10 +175,10 @@ index 39329bc9b64..220577dbc4a 100644 diff --git a/cuda_bindings/cuda/bindings/_internal/runtime_linux.pyx b/cuda_bindings/cuda/bindings/_internal/runtime_linux.pyx -index 1ae37127bd1..17e79e19041 100644 +index 1ae37127bd1..9d012257a2f 100644 --- a/cuda_bindings/cuda/bindings/_internal/runtime_linux.pyx +++ b/cuda_bindings/cuda/bindings/_internal/runtime_linux.pyx -@@ -9,7 +9,7 @@ import os +@@ -9,11 +9,16 @@ import os from libc.stdint cimport uintptr_t @@ -187,7 +187,16 @@ index 1ae37127bd1..17e79e19041 100644 cimport cuda.bindings._lib.dlfcn as dlfcn cimport cuda.bindings._internal.runtime_ptds as ptds cimport cython -@@ -50,14 +50,14 @@ include "../_lib/cyruntime/cyruntime.pxi" + ++try: ++ CDLL("@libcuda@/lib/libcuda.so.1") ++except OSError: ++ pass ++ + + ############################################################################### + # Per-thread default stream dispatch +@@ -50,14 +55,14 @@ include "../_lib/cyruntime/cyruntime.pxi" cdef cudaError_t _getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil: # Load cudart dynamically to read its embedded version number. with gil: diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 4d4ed6294eeb..a974077e8830 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,23 +18,16 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.5.1"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "coveooss"; repo = "json-schema-for-humans"; tag = "v${version}"; - hash = "sha256-k4/+ijlaS/bjLcgobPcq6l4yX84WP1FwfGgYHw+iAdE="; + hash = "sha256-sjk2Moq4xMIS5ZXQgEU9DSTe0QMIiNtYWLB6saHpnNA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'markdown2 = "^2.5.0"' 'markdown2 = "^2.4.1"' - ''; - - pythonRelaxDeps = [ "dataclasses-json" ]; - build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 930b1dc6d421..2d480ff490c8 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -81,6 +81,13 @@ buildPythonPackage (finalAttrs: { "enable_socket" ]; + disabledTests = [ + # timing sensitive, these allocate hundreds of megabytes and assert on a + # five second pytest-timeout, which slower builders cannot meet + "test_dictionary_object__read_from_stream__missing_length__limit" + "test_flatedecode__decode_png_prediction__speed" + ]; + meta = { description = "Pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files"; homepage = "https://github.com/py-pdf/pypdf"; diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 8f44bde1e4a0..d5c80de53507 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2026.8.1"; + version = "2026.10.0"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-lkLEUouu5nIW6rhwIs4pcEislt8vjJ8c+SDeB461C2I="; + hash = "sha256-K0yaa+L2R2w10QvbFJ81fwN4GnJQbp3sorzO+MMn6Xs="; }; build-system = [ diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 942f5f584fe7..f3691ed00b81 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = isPyPy; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; tag = "v${version}"; - hash = "sha256-Pp7pPfaWyzJGf+soENfOPynN8logc5FM848hyVCcdKk="; + hash = "sha256-/FZFMY7FQmBA+Lbs0Vu8aW7nYECRyu+xxOYDcviz23Y="; }; patches = lib.optional (!stdenv.hostPlatform.isStatic) ./find-library.patch; diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index d76befaf0aba..bc155e2f37d5 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -63,7 +63,7 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/stanfordnlp/stanza/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ - riotbib + lennartmueh Stebalien ]; }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 4f4f0f629fb4..a9d04d70ddb8 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -14,7 +14,7 @@ hash ? dfVersions.therapist.git.outputHash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dwarf-therapist"; inherit version; diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix index 8e073af18a1b..a54689c735ec 100644 --- a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix @@ -5,9 +5,9 @@ cryptography, defusedxml, fetchFromGitHub, + gitMinimal, hatchling, lib, - nix-update-script, pydantic, pytestCheckHook, pytest-cov-stub, @@ -17,21 +17,21 @@ requests, }: let - version = "3.14.0-beta.21"; + version = "3.14.1"; src = fetchFromGitHub { owner = "solentlabs"; repo = "cable_modem_monitor"; tag = "v${version}"; - hash = "sha256-WipB5MUUr49325cxQqe0WW+gk8gVnb+fTgG7JnbwClk="; + hash = "sha256-ihMFTOsYAUyYusvHFo7SjLEXdOQHK1yVN08doUov3f4="; fetchLFS = true; }; - core = buildPythonPackage (finalAttrs: { + core = buildPythonPackage { inherit src version; pname = "solentlabs-cable-modem-monitor-core"; pyproject = true; - sourceRoot = "${finalAttrs.src.name}/packages/cable_modem_monitor_core"; + sourceRoot = "${src.name}/packages/cable_modem_monitor_core"; build-system = [ hatchling ]; @@ -49,14 +49,14 @@ let pytest-cov-stub pytest-socket ]; - }); + }; - catalog = buildPythonPackage (finalAttrs: { + catalog = buildPythonPackage { inherit src version; pname = "solentlabs-cable-modem-monitor-catalog"; pyproject = true; - sourceRoot = "${finalAttrs.src.name}/packages/cable_modem_monitor_catalog"; + sourceRoot = "${src.name}/packages/cable_modem_monitor_catalog"; build-system = [ hatchling ]; @@ -69,9 +69,14 @@ let pytestCheckHook pytest-socket ]; - }); + + disabledTestPaths = [ + # test requires `har_capture` + "tests/test_check_fixture_pii_urls.py" + ]; + }; in -buildHomeAssistantComponent rec { +buildHomeAssistantComponent { inherit src version; owner = "solentlabs"; domain = "cable_modem_monitor"; @@ -82,11 +87,15 @@ buildHomeAssistantComponent rec { ]; nativeCheckInputs = [ + gitMinimal pytestCheckHook pytest-homeassistant-custom-component ]; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + disabledTestPaths = [ + # test using `git rev-parse` requires .git + "tests/lib/test_check_markdown_links.py::test_repo_markdown_links_all_resolve" + ]; meta = { description = "Home Assistant integration for monitoring cable modem signal quality"; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 6f83f58f70c3..b8bf8873a8ef 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -11,12 +11,12 @@ slurmSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdsh"; version = "2.36"; src = fetchurl { - url = "https://github.com/chaos/pdsh/releases/download/pdsh-${version}/pdsh-${version}.tar.gz"; + url = "https://github.com/chaos/pdsh/releases/download/pdsh-${finalAttrs.version}/pdsh-${finalAttrs.version}.tar.gz"; sha256 = "sha256-pmEJXOUd1fsF45jPXQ4dYxVxI5WEQfbTUSvPGn0lxRc="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Do not use git to derive a version. postPatch = '' - sed -i 's/m4_esyscmd(\[git describe.*/[${version}])/' configure.ac + sed -i 's/m4_esyscmd(\[git describe.*/[${finalAttrs.version}])/' configure.ac ''; preConfigure = '' @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/security/ghidra/0004-Remove-help-timestamps.patch b/pkgs/tools/security/ghidra/0004-Remove-help-timestamps.patch new file mode 100644 index 000000000000..ac4569252701 --- /dev/null +++ b/pkgs/tools/security/ghidra/0004-Remove-help-timestamps.patch @@ -0,0 +1,20 @@ +diff --git a/Ghidra/Framework/Help/src/main/java/help/JavaHelpSetBuilder.java b/Ghidra/Framework/Help/src/main/java/help/JavaHelpSetBuilder.java +--- a/Ghidra/Framework/Help/src/main/java/help/JavaHelpSetBuilder.java ++++ b/Ghidra/Framework/Help/src/main/java/help/JavaHelpSetBuilder.java +@@ -145 +145 @@ +- writer.write(""); ++ writer.write(""); +diff --git a/Ghidra/Framework/Help/src/main/java/help/JavaHelpFilesBuilder.java b/Ghidra/Framework/Help/src/main/java/help/JavaHelpFilesBuilder.java +--- a/Ghidra/Framework/Help/src/main/java/help/JavaHelpFilesBuilder.java ++++ b/Ghidra/Framework/Help/src/main/java/help/JavaHelpFilesBuilder.java +@@ -19 +19,0 @@ +-import java.util.Date; +@@ -125 +124 @@ +- out.println(""); ++ out.println(""); +diff --git a/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java b/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java +--- a/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java ++++ b/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java +@@ -141 +141 @@ +- writer.println(""); ++ writer.println(""); diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 1ff571a5a7c7..d89c335cb8c2 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "12.1.2"; + version = "12.1.4"; isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; @@ -30,17 +30,17 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-7/5TR273Sqqr03lE7qpOJUnwTzdr3BzKk+6GhhdOfo8="; + hash = "sha256-EeB3wHE2fbGhvC9Aik83ekGoeXxaA5ZWBSvRi9qLRQc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" git rev-parse HEAD > $out/COMMIT - # 1970-Jan-01 - date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%b-%d" > $out/SOURCE_DATE_EPOCH - # 19700101 - date -u -d "@$(git log -1 --pretty=%ct)" "+%Y%m%d" > $out/SOURCE_DATE_EPOCH_SHORT + # Git commit date, e.g. 2026-Sep-11 + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%b-%d" > $out/COMMIT_DATE + # Git commit date, e.g. 20260911 + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y%m%d" > $out/COMMIT_DATE_SHORT find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; @@ -54,6 +54,9 @@ let # Remove build dates from output filenames for easier reference ./0003-Remove-build-datestamp.patch + + # Remove timestamps from generated JavaHelp files + ./0004-Remove-help-timestamps.patch ]; postPatch = '' @@ -61,8 +64,8 @@ let sed -i -e 's/application\.release\.name=.*/application.release.name=${releaseName}/' Ghidra/application.properties # Set build date and git revision - echo "application.build.date=$(cat SOURCE_DATE_EPOCH)" >> Ghidra/application.properties - echo "application.build.date.short=$(cat SOURCE_DATE_EPOCH_SHORT)" >> Ghidra/application.properties + echo "application.build.date=$(cat COMMIT_DATE)" >> Ghidra/application.properties + echo "application.build.date.short=$(cat COMMIT_DATE_SHORT)" >> Ghidra/application.properties echo "application.revision.ghidra=$(cat COMMIT)" >> Ghidra/application.properties # Tells ghidra to use our own protoc binary instead of the prebuilt one. diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 6bb8195a1949..ca967f90a877 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "12.1.2"; - versiondate = "20260605"; + version = "12.1.4"; + versiondate = "20260921"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-ulIBecjWAnrM8iJmqQZAZRerUCKpIBcXyv6KIB7I/ZA="; + hash = "sha256-ZD4Vs1i7BMvrneAbAiOc7F9iBj64Rbom+PaVO//TzK8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json index 4d56666f204e..90d4f70f367d 100644 --- a/pkgs/tools/security/ghidra/deps.json +++ b/pkgs/tools/security/ghidra/deps.json @@ -138,45 +138,45 @@ } }, "https://ftp.postgresql.org": { - "pub/source/v15.13/postgresql-15.13": { - "tar.gz": "sha256-r9wisKblvse2VyN1a5DUTqkR5hsvewHE3FUkq4E7TYk=" + "pub/source/v15.18/postgresql-15.18": { + "tar.gz": "sha256-0ypTNRbtxojru5auIhtgW+JxLt2U10KLQqSvVkQlCUM=" } }, "https://github.com": { - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/Debugger/dbgmodel": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/Debugger/dbgmodel": { "tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2012_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2012_x64": { "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2012_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2012_x86": { "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2015_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2015_x64": { "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2015_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2015_x86": { "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2017_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2017_x64": { "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2017_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2017_x86": { "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2019_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2019_x64": { "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2019_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vs2019_x86": { "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vsOlder_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vsOlder_x64": { "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vsOlder_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/FunctionID/vsOlder_x86": { "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/lib/java-sarif-2.1-modified": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.4/lib/java-sarif-2.1-modified": { "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" }, "Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": { @@ -209,14 +209,14 @@ "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" }, - "com/fasterxml#oss-parent/68": { - "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" }, - "com/fasterxml/jackson#jackson-bom/2.19.1": { - "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" }, - "com/fasterxml/jackson#jackson-parent/2.19.2": { - "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" }, "com/formdev#flatlaf/3.5.4": { "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=", @@ -575,17 +575,19 @@ "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, + "org/apache#apache/39": { + "pom": "sha256-cXUu1MJDWh2Dhf4KTTMPOdBO/sifDRul0VmNOfc5ekQ=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, - "org/apache/commons#commons-collections4/4.1": { - "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", - "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" - }, "org/apache/commons#commons-collections4/4.4": { - "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" }, + "org/apache/commons#commons-collections4/4.6.0": { + "jar": "sha256-Tg0IlrrFNWzq0ne6wCg/CYE+FEF+PoTgyGtXO1TSGKM=", + "pom": "sha256-lOV3LqPHuoD3w0WmlQzHpAFUY/CKKnvoLozoWEw5eMM=" + }, "org/apache/commons#commons-compress/1.27.1": { "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" @@ -604,15 +606,15 @@ "org/apache/commons#commons-lang3/3.9": { "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" }, + "org/apache/commons#commons-parent/103": { + "pom": "sha256-B0B4FfPBRBoHjhbl3eLer2UqPb378uujtWPVYSEHlL8=" + }, "org/apache/commons#commons-parent/17": { "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" }, "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, - "org/apache/commons#commons-parent/38": { - "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" - }, "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, @@ -672,21 +674,21 @@ "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, - "org/apache/logging/log4j#log4j-api/2.25.4": { - "jar": "sha256-xLZCp/BHJ1IV3hF+DjhH6yx3EdhKCqdDPns8CW2vNB0=", - "module": "sha256-vtG2eRoxTiT5fbBjv2vQXTp/12wUUNbHtF/bvXpPWP8=", - "pom": "sha256-lDpD2hQw2+tQGr0Ily8oPqifOx2/xCUuwwWVQ7Tga1U=" + "org/apache/logging/log4j#log4j-api/2.26.1": { + "jar": "sha256-8YEKRwTMzgGdArugKdwCpPKsDJl/ZHtGXn1AnBkn+CI=", + "module": "sha256-Xtk/b7UzS/fuUpQ9GmVLw6Hz8Qdlri/Uu9OHMzvmZ4o=", + "pom": "sha256-yKuGj5xTIjO9EvMRzqkKP23mXqB6eqRww+K7+Dtcefs=" }, - "org/apache/logging/log4j#log4j-bom/2.25.4": { - "pom": "sha256-cxPTOftjKoYQ4RQLMpD8JNY3Q7mqYl4qC9Wd7UCjrlQ=" + "org/apache/logging/log4j#log4j-bom/2.26.1": { + "pom": "sha256-RBWtGJ3QTbVJWKQ+I7N8w5eh7e6eiIIUuL1H++gZBy4=" }, - "org/apache/logging/log4j#log4j-core/2.25.4": { - "jar": "sha256-EP7iwEhdVPpE7nXTFPYpVQj3uTIoGHPbYakbiAcyAOY=", - "module": "sha256-McWBtzkL0vhIHod3dcIYkk6nMPERwdgS1bWA2W+ceU8=", - "pom": "sha256-NMBz/HSWba+kTMW/123l42aOokDyhLq4R45BfuA6Vqo=" + "org/apache/logging/log4j#log4j-core/2.26.1": { + "jar": "sha256-LsjDv1ptfIm+hiARai/Jc/fdoa0CYa05PE1HJu39Pcs=", + "module": "sha256-A7/Yrb4wasRgAeyd5mj45dJPZlnyEvxk5iobZypaL2o=", + "pom": "sha256-Gj/ZpEZ8OrmxJ+cUG+8Sm2JCj+Ey9/klw69/Uk3XqLU=" }, - "org/apache/logging/log4j#log4j/2.25.4": { - "pom": "sha256-+K6JBKKONPoEw103QGGdroNjJAG6HjE7r9fM9aMADew=" + "org/apache/logging/log4j#log4j/2.26.1": { + "pom": "sha256-6kcFcl/ZS/XevikR1Op68giYYD9oNU5kskYaDySeRF0=" }, "org/bouncycastle#bcpkix-jdk18on/1.84": { "jar": "sha256-yH8W7Z5exhvJQVHp82RqxE5QzUSBIc6ENn+kt+x+wbs=", @@ -712,6 +714,11 @@ "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" }, + "org/checkerframework#checker-qual/3.55.1": { + "jar": "sha256-hXZYyL3L/3lJSajZki+I1j7jdRwgPHzX0h6pf550Uog=", + "module": "sha256-OQabiu7c3Ed/S0W9Ho41IAe3uZCk4XgU7Vn7MRLYFQM=", + "pom": "sha256-Yn2SqpL9TWu4wrVry7OFQ0F/SdOLWmL720rv9VHnt2A=" + }, "org/codehaus#codehaus-parent/3": { "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" }, @@ -857,14 +864,14 @@ "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit#junit-bom/5.13.2": { - "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", - "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" - }, "org/junit#junit-bom/5.13.4": { "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" }, + "org/junit#junit-bom/5.14.3": { + "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=", + "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE=" + }, "org/junit#junit-bom/5.7.1": { "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" @@ -946,9 +953,9 @@ "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=", "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" }, - "org/postgresql#postgresql/42.7.11": { - "jar": "sha256-GYGzHTmTxYcCeDwc3fEKNOSMH0E9cP8ctt7woUNIRkc=", - "pom": "sha256-RDynyNg1qdOWYwhwZmhFpwx6io1Or1xS4hB2/KjYNZ4=" + "org/postgresql#postgresql/42.7.13": { + "jar": "sha256-bg5MwtjK6QIIT4orGHKLBzpv2dH4fJ2L/48pjBgYW5M=", + "pom": "sha256-OVdBfsruNCUhthMQ/cIb03/Li7o/dUfs6beP0DzVPyY=" }, "org/python#jython-standalone/2.7.4": { "jar": "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw=", diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix index 049267553c33..004566beaf86 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix @@ -5,22 +5,22 @@ }: maven.buildMavenPackage (finalAttrs: { pname = "binary-file-toolkit"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "boricj"; repo = "binary-file-toolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-HMzRh/Q06Ik33mEkmh5U6qLiWk7ZCEstYq3Ll/pFhXM="; + hash = "sha256-dhWBnieXVsFyBoaCBzQIVo7iLWrO6l5y0v1KK1xC/es="; }; - mvnHash = "sha256-UrvPqh5zxhTQ6MJNJ7CSAA6dg5DX+Jdx6/wKr4/1brs="; + mvnHash = "sha256-GwdpwwAhSb0uHWiExVPBZgOmB8LOEQk6uKgSAs/uw7k="; installPhase = '' runHook preInstall - mkdir -p $out/ - cp dist/* $out/ + mkdir -p "$out/" + cp bft-*/target/*.jar "$out/" runHook postInstall ''; diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix index 0c88293b41a0..14484df45efb 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix @@ -9,13 +9,13 @@ }: ghidra.buildGhidraExtension (finalAttrs: { pname = "ghidra-delinker-extension"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "boricj"; repo = "ghidra-delinker-extension"; rev = "v${finalAttrs.version}"; - hash = "sha256-Wqxi/xF+HMG9wQUiHwilKX8PkdtHtGaNrXZyPMjT4iE="; + hash = "sha256-zb/ynjIOzM+LDVpA1DXKz/oz/63J6yJvvoDN40+JLBc="; }; patches = [ diff --git a/pkgs/tools/security/ghidra/extensions/gnudisassembler/0005-gprofng-protect-against-standard-library-macros.patch b/pkgs/tools/security/ghidra/extensions/gnudisassembler/0005-gprofng-protect-against-standard-library-macros.patch new file mode 100644 index 000000000000..560016dff7ea --- /dev/null +++ b/pkgs/tools/security/ghidra/extensions/gnudisassembler/0005-gprofng-protect-against-standard-library-macros.patch @@ -0,0 +1,12 @@ +diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h +index b64d69c45ab..859a6dd1f7d 100644 +--- a/gprofng/src/collector_module.h ++++ b/gprofng/src/collector_module.h +@@ -119,7 +119,7 @@ typedef struct CollectorUtilFuncs + extern CollectorUtilFuncs __collector_util_funcs; + extern int __collector_dlsym_guard; + +-#define CALL_UTIL(x) __collector_util_funcs.x ++#define CALL_UTIL(x) (__collector_util_funcs.x) + + /* diff --git a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix index b168f846812f..240763a424af 100644 --- a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix +++ b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix @@ -28,7 +28,19 @@ buildGhidraExtension { src = "${ghidra}/lib/ghidra/Extensions/Ghidra/${ghidra.distroPrefix}_GnuDisassembler.zip"; postPatch = '' - ln -s ${binutils-src} binutils-${binutils-version}.tar.bz2 + mkdir binutils-patched + tar -xjf ${binutils-src} -C binutils-patched + + patch -p1 \ + -d binutils-patched/binutils-${binutils-version} \ + < ${./0005-gprofng-protect-against-standard-library-macros.patch} + + tar -cjf binutils-${binutils-version}.tar.bz2 \ + -C binutils-patched \ + binutils-${binutils-version} + + rm -rf binutils-patched + substituteInPlace build.gradle \ --replace-fail 'ext.binutils = "binutils-2.41"' 'ext.binutils = "binutils-${binutils-version}"' ''; diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix index 2aded838a94d..f1d94b7663bc 100644 --- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix +++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix @@ -25,13 +25,13 @@ let self = buildGhidraExtension (finalAttrs: { pname = "kaiju"; - version = "260608"; + version = "260910"; src = fetchFromGitHub { owner = "CERTCC"; repo = "kaiju"; rev = finalAttrs.version; - hash = "sha256-T8Ta8lQob7w0iPsVbZix795AjVwdo2U8yuvgCUBi5fw="; + hash = "sha256-vs8J53V+23aKL9/pb9VBE1ZCvjCW19YWtAEKBnSX6sA="; }; buildInputs = [ diff --git a/pkgs/tools/security/ghidra/extensions/reva/default.nix b/pkgs/tools/security/ghidra/extensions/reva/default.nix index 0be196510af9..a022ac1ab4e9 100644 --- a/pkgs/tools/security/ghidra/extensions/reva/default.nix +++ b/pkgs/tools/security/ghidra/extensions/reva/default.nix @@ -6,13 +6,13 @@ }: buildGhidraExtension (finalAttrs: { pname = "reva"; - version = "7.3.0"; + version = "7.3.1"; src = fetchFromGitHub { owner = "cyberkaida"; repo = "reverse-engineering-assistant"; rev = "v${finalAttrs.version}"; - hash = "sha256-5DVHEcZHq7Thi4L1OJuaOwK/nAqntolYCBEE2acHNHw="; + hash = "sha256-eYZeyhXlGwLVa/k77Y5x2OeGo/m9fh3VauzAqB+obxw="; }; mitmCache = gradle.fetchDeps { diff --git a/pkgs/tools/security/ghidra/extensions/reva/deps.json b/pkgs/tools/security/ghidra/extensions/reva/deps.json index 42d217a0dcd3..6f212910bf2b 100644 --- a/pkgs/tools/security/ghidra/extensions/reva/deps.json +++ b/pkgs/tools/security/ghidra/extensions/reva/deps.json @@ -12,17 +12,11 @@ "com/fasterxml#oss-parent/79": { "pom": "sha256-kga33Wf7E4A2V2w9/KlHoqjz4sTS2cHy0d6lGbOk2uE=" }, - "com/fasterxml/jackson#jackson-base/2.21.3": { - "pom": "sha256-xELoDDE7VTLbLqfc0g4KAw+odvJACDRqS44Qof0uP/g=" + "com/fasterxml/jackson#jackson-base/2.22.1": { + "pom": "sha256-P19ZfHR02Q/icGBHfyQ7gEvscF3GD+yk3ifKMmOGRIo=" }, - "com/fasterxml/jackson#jackson-base/2.22.0": { - "pom": "sha256-JSCeuNzVprRyMLP8EZzxwDgB9pg7lSliS37/aBPwFyY=" - }, - "com/fasterxml/jackson#jackson-bom/2.21.3": { - "pom": "sha256-BccqDyCuH9ec7X7SnP9y2yhC0WCXCn6gM06bX9BH1Zc=" - }, - "com/fasterxml/jackson#jackson-bom/2.22.0": { - "pom": "sha256-Yx1zbVKdGb+iUFTYuaRCZFh72NJEmuisGMcfDvLS8kQ=" + "com/fasterxml/jackson#jackson-bom/2.22.1": { + "pom": "sha256-s2aqX9JpWOIwikgH5dQrFHBrABs8y/E44xuGmNwKwOw=" }, "com/fasterxml/jackson#jackson-parent/2.21": { "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" @@ -35,41 +29,41 @@ "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" }, - "com/fasterxml/jackson/core#jackson-core/2.22.0": { - "jar": "sha256-0ujdTfHg9ht4bqBnkvW/QjXYJ48Vjzvm6ZfpVZMcDJg=", - "module": "sha256-YIIVtvFyn7S4gI73UdJki62kTgivii0JzOI5UFeV7l8=", - "pom": "sha256-WqFPSdI2n4hbfD3D6oLoqtscCTZ26GCIPmiHFQ5z0/Q=" + "com/fasterxml/jackson/core#jackson-core/2.22.1": { + "jar": "sha256-lB/wKbzbk+g9IJzlFsGn+4u6wH0KL6Ei9b8ZSyzXtPQ=", + "module": "sha256-2nBmcafpaPNqosDDxCOXdRzkfMlSsmS8KnRG2iddjgs=", + "pom": "sha256-NFUcbI1ypKIhX9Bf3PL05pPv+Z5uVGMr1XzyZ0R44pM=" }, - "com/fasterxml/jackson/core#jackson-databind/2.22.0": { - "jar": "sha256-NSCgNR8pRpnj4bejfHpyav2B4aia5wKsfUf/NH/S7L8=", - "module": "sha256-McdjazHtpftn3FUh4gHzyV2WiWX+YMECdW4xmy0YD28=", - "pom": "sha256-dryzSDZ2c9C158+siWGxi9AIGrPBUaFui+UiEL7CMTY=" + "com/fasterxml/jackson/core#jackson-databind/2.22.1": { + "jar": "sha256-fc1+U77B9Wx60ni9HKCEC+vMWV1hzkTWqEOau3W5ZbI=", + "module": "sha256-BU8QUBvTY+X9iCI7aoKAEJ+L+gx2EGgeWGadVyC3GrI=", + "pom": "sha256-C8j5jHvXIyvJAyT8Y8L1b3rpLe4r8NwwNmn04t6MH2k=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.3": { - "jar": "sha256-8KopfUb5Nkr4s2F/jxbuPWh7wRqLIOpiZlkKIeAhw6Q=", - "module": "sha256-iUSrl2d5GT8DTx2dtPn5LIZwNi0MXxWt2LISyjyo+O8=", - "pom": "sha256-eZY6haU8mlEkwY1Sgf2ctdX58bCy9RBgjQNRMd0PlxI=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.22.1": { + "jar": "sha256-zDoOVAeRqaHLzXWEdnuEVy/9oLcoI4VlWPR96mmujtE=", + "module": "sha256-9BhDAoPmesN0h+Ny16vC+952P+OeAK06Y+hkQ1bRpG4=", + "pom": "sha256-SDRavJ9jg35z7wr4MZOyaOBdHA5j4pNP3L144m6JMv8=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.3": { - "pom": "sha256-bId1hw6F9TuY3rEKK5okXu4DCJKdww+BPDkshiikPNE=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.22.1": { + "pom": "sha256-gWgEG1ExNxbE/aqgRjdrDv7nixxCznOipdHEr4oboLY=" }, "com/networknt#json-schema-validator/2.0.0": { "jar": "sha256-7pQCQQQ64BgB31lUvDdEv3I8RJ/w2nGfl+G5poiXOdc=", "pom": "sha256-k1SvFT2v0SLKW3LRr+szoE0CYqZKTBW/sNjzCNmC0jE=" }, - "io/modelcontextprotocol/sdk#mcp-bom/1.1.3": { - "pom": "sha256-czOIgHJL3ZMuenYgaqW09ZE6Ctb3TKexW9n+amgFc8c=" + "io/modelcontextprotocol/sdk#mcp-bom/2.0.0": { + "pom": "sha256-NcwG5FYENe0OmKHbBB8UjkmeQXwvUGrqftldzTt2a54=" }, - "io/modelcontextprotocol/sdk#mcp-core/1.1.3": { - "jar": "sha256-NAWNz8Rau7B6SDSV9ls61oFWA6X/4aMcJ5QMWXl/SOE=", - "pom": "sha256-HQJSgu4ISaRQTXuxOHkeRVd34fs6jW55nVaNXjjUs1I=" + "io/modelcontextprotocol/sdk#mcp-core/2.0.0": { + "jar": "sha256-VsH5nMXpky/Ou1fU2C+J0LZB+QJ1/BnQsTL2zn0eqyw=", + "pom": "sha256-FyKaqFvCwejRsfFw6lD6RzBS7dvOy6KggcXSzqEunfc=" }, - "io/modelcontextprotocol/sdk#mcp-json-jackson2/1.1.3": { - "jar": "sha256-dVBVbAi/4Z0VJvm9AsFsQo+meOBmWCmjyVLenuBA9zU=", - "pom": "sha256-Asucavx+EuNeK/V09CIhgGy0Pcv8106RjwEAKWJBSL4=" + "io/modelcontextprotocol/sdk#mcp-json-jackson2/2.0.0": { + "jar": "sha256-p730Z/tZsWdaPkGRtJ6wcAhpyCzPKthe9w2WKuWejJw=", + "pom": "sha256-9VcWQXlN32HSTTLcNgAD2QUWzGK60ClwpnAQqImHEkw=" }, - "io/netty#netty-bom/4.2.13.Final": { - "pom": "sha256-Ua8kiRxINeMj5A2UFn+S5VdF50mA3VzogSX4xDvu7sQ=" + "io/netty#netty-bom/4.2.16.Final": { + "pom": "sha256-WdUPXJUeZFXEdP5SYbfYSyxUa5wfxzl2+yzWbbWEkzg=" }, "io/projectreactor#reactor-core/3.7.0": { "jar": "sha256-FK661Igt7x+IOJZWz5tGF39rCQuwCgcHAl12rqyq6tI=", @@ -107,42 +101,42 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-core/12.1.10": { - "pom": "sha256-EsCwS+J1+r0XfBI2ZZE/1HxkuX539firfZgtafc39Bc=" + "org/eclipse/jetty#jetty-core/12.1.12": { + "pom": "sha256-nqpkHNv0IG7bApKpwZPuVtUv7Vuq1fdJjli6NmToRGo=" }, - "org/eclipse/jetty#jetty-http/12.1.10": { - "jar": "sha256-CQ8nZzn9m/jDBREAfK7Gaeo4BLHfEGHDf0RGdHS+5x0=", - "pom": "sha256-P4O41tTGCdVu7fJx2ILeZfguRfs9PA1Htu8zw28cW8U=" + "org/eclipse/jetty#jetty-http/12.1.12": { + "jar": "sha256-VHbhbvfiiIPbo2ae4GSRAh5Kmuupp2+QGj9cK7UlKj4=", + "pom": "sha256-bgPuJmgZ6Yxx0jKDjCk93oOQXoK8RbIHIIK8mb4kxdI=" }, - "org/eclipse/jetty#jetty-io/12.1.10": { - "jar": "sha256-RI/A+Pb19yUfxG3o46rn2hS9fFcagEPaw9w4HQgij6A=", - "pom": "sha256-xj97X7nlzN81G4Hpt5lByzHX945bbzqmTCFLTsayJgo=" + "org/eclipse/jetty#jetty-io/12.1.12": { + "jar": "sha256-qAmmpTStzPqgi8qUqlQyjjrIWJc8zdvadw9+ng9Qmfw=", + "pom": "sha256-SMaPqYI3xlbbZmpMPG71jmK4KSInPwXndlX4ANPvofU=" }, - "org/eclipse/jetty#jetty-project/12.1.10": { - "pom": "sha256-T+HSUQcoPfwisFFJgUPS0Z6ThprUwV2BUMjd8D/JdeI=" + "org/eclipse/jetty#jetty-project/12.1.12": { + "pom": "sha256-VH0wCHuiHkP+WYaP1SotJ5Z6J5wYfkQAnY77UuYH0II=" }, - "org/eclipse/jetty#jetty-security/12.1.10": { - "jar": "sha256-LzS3iVzsTjVHobUuEufpKz86EQvzwXY3+HQ8o/TkLww=", - "pom": "sha256-N62PSGiLLtUB9w/FKhfOgspTFm5pPbanjFQ7tIJdHE4=" + "org/eclipse/jetty#jetty-security/12.1.12": { + "jar": "sha256-/MAgbBrGa2Mu8ppZzPdsPzc3pi71RpSx0RHusubv6AQ=", + "pom": "sha256-U4FyvhR2cddMhkGrBGmOiu6g1VeyUjRlzX/QEGYtc+4=" }, - "org/eclipse/jetty#jetty-server/12.1.10": { - "jar": "sha256-SwEI6Hq62nAnEj3soXGGJJQTIy2tCivVik5wqYe1NUo=", - "pom": "sha256-UxPguay3GgwM7qUlMOen03yQPVe21HVXFrdmEP2T5PI=" + "org/eclipse/jetty#jetty-server/12.1.12": { + "jar": "sha256-m6BLuNARREoQhzpRscuCl8BPcNtVyKjZ78w6m5eJZ4c=", + "pom": "sha256-Tu5M9deg/cJE25qcciRNg/R0EnPnl/8qm1bVPIhBU/A=" }, - "org/eclipse/jetty#jetty-session/12.1.10": { - "jar": "sha256-FkZJEj0Vo/K+XBlugqplLf8Fx1Ni23Gw9Ktrs1FlAgo=", - "pom": "sha256-a+FxwNRAIEtKJ8xd2faSd476ZDiLqiqYeEJ53syWWYc=" + "org/eclipse/jetty#jetty-session/12.1.12": { + "jar": "sha256-c66kzdkfICfaGgnNWVO2YWJQF5cdU9jh/zQvhUd1KwY=", + "pom": "sha256-vePNbJU36R+gzMfRnX8GrgMVtTrMe1cITr69CBNHon4=" }, - "org/eclipse/jetty#jetty-util/12.1.10": { - "jar": "sha256-xStP9izazKijmcYRIxEp5r0QdNt+OJLnjNEGclzdDvE=", - "pom": "sha256-1+lWAXx2pPr2GtTXA8R1zPsmeehM5hvFPXsuv3GXgZc=" + "org/eclipse/jetty#jetty-util/12.1.12": { + "jar": "sha256-9vv6Yc/MoDL/gq2P87ZqFDdAR/FUhlIdvImmwN8ZzPI=", + "pom": "sha256-eCrCEhiwTfZ9iul15efruAnU5xqaOmns/3WTLSUJ2Dc=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.1.10": { - "jar": "sha256-BczMdLvhR4zrdl6Wexyxo8jZtR6ZrPWGGQiH5Gf/2H0=", - "pom": "sha256-u17HDZ0DYwvbNv/X7Ex9ZYb/Z3vmFKo/A8kJP9Djwrc=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.1.12": { + "jar": "sha256-AhN16oDYS1+dRiYJFvwEUNxPrlqVzoD4KJ6HoNsH3kc=", + "pom": "sha256-Zrs4kWuCCy+UOLo+oEx0qk/++fPFaJ8pPEl+iBYB6J0=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.1.10": { - "pom": "sha256-RTXlk+96Zg2NQ/RkOdQoBg9kQrDZYhJbAWE+NSHBs/4=" + "org/eclipse/jetty/ee10#jetty-ee10/12.1.12": { + "pom": "sha256-MUmlwSd9YfONJkjw3seW504+23kJ/f5VdCakwh80Zoo=" }, "org/hamcrest#hamcrest-core/1.3": { "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", @@ -156,23 +150,19 @@ "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=", "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE=" }, - "org/hibernate/search#hibernate-search-bom/8.3.1.Final": { - "pom": "sha256-tQPf+UyokY4U7eOD0xtPCzQCWvOA0W1sMezZVWOt808=" + "org/hibernate/search#hibernate-search-bom/8.4.0.Final": { + "pom": "sha256-XC3/spXiWY2OZ6MBzD73SddpQwKAAM+M57wyErh1qgI=" }, - "org/infinispan#infinispan-bom/16.1.4": { - "pom": "sha256-rqveBOymbhrDD53zzDbJsHolo3xSBDszQY4nTOWiNhY=" - }, - "org/junit#junit-bom/5.14.1": { - "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", - "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + "org/infinispan#infinispan-bom/16.2.1": { + "pom": "sha256-i4oxvfLj/PIiZWkxsjMcku/AIZAcfTpj4HuJ2XuDQpA=" }, "org/junit#junit-bom/5.14.3": { "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=", "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE=" }, - "org/junit#junit-bom/6.0.3": { - "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=", - "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc=" + "org/junit#junit-bom/6.1.1": { + "module": "sha256-QLwON45eR3J0jqqc5ZM0dNSI0lq8TpJQsEVT1hb7mug=", + "pom": "sha256-EKrIAzxbuWlykvg3Zdo6yRdSJL6ttrnXVfOLW0ymozU=" }, "org/mockito#mockito-core/5.23.0": { "jar": "sha256-rilb69XRH6uXqyl4Fdx2FxiLhgA8vOPf1cDVw6bMSgw=", @@ -192,8 +182,8 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-bom/9.10": { - "pom": "sha256-bcX96KBAy9wyDc1/IvrusHG9zicOClCvjBBATEnyB8U=" + "org/ow2/asm#asm-bom/9.10.1": { + "pom": "sha256-cJRy1pz3hdS2ee7g5uBXXUsQRHbd81Jl7xEX5zwSnNQ=" }, "org/reactivestreams#reactive-streams/1.0.4": { "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", diff --git a/pkgs/tools/security/ghidra/extensions/wasm/default.nix b/pkgs/tools/security/ghidra/extensions/wasm/default.nix index 37a7b7a899cb..8f61838e3f63 100644 --- a/pkgs/tools/security/ghidra/extensions/wasm/default.nix +++ b/pkgs/tools/security/ghidra/extensions/wasm/default.nix @@ -13,7 +13,7 @@ buildGhidraExtension (finalAttrs: { owner = "nneonneo"; repo = "ghidra-wasm-plugin"; rev = "v${finalAttrs.version}"; - hash = "sha256-2JNenzUac/OpjQ+fN1MkP8E2KIT1Ifn+C/18buSpqrE="; + hash = "sha256-7/5TR273Sqqr03lE7qpOJUnwTzdr3BzKk+6GhhdOfo8="; }; nativeBuildInputs = [ ant ]; @@ -36,6 +36,6 @@ buildGhidraExtension (finalAttrs: { changelog = "https://github.com/nneonneo/ghidra-wasm-plugin/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.BonusPlay ]; - broken = true; # Until updated to support 12.1.2 + broken = true; # Until updated to support 12.1.4 }; }) diff --git a/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix b/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix index 440f303ec4c0..23b743757d75 100644 --- a/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix @@ -40,7 +40,7 @@ let hash = fod: fod.outputHash or (builtins.readFile (computeHash fod)); - hashes = fods: concatMapStrings ({ tlType, ... }@p: ''${tlType}="${hash p}";'') fods; + hashes = fods: concatMapStrings ({ tlType, ... }@p: " ${tlType} = \"${hash p}\";\n") fods; hashLine = { @@ -54,22 +54,15 @@ let # NOTE: the fixed naming scheme must match default.nix fixedName = "${pname}-${toString revision}${extraRevision}"; in - optionalString (fods != [ ]) '' - ${strings.escapeNixIdentifier fixedName}={${hashes fods}}; - ''; + optionalString (fods != [ ]) " ${strings.escapeNixIdentifier fixedName} = {\n${hashes fods} };\n"; in { # fixedHashesNix uses 'import from derivation' which does not parallelize well # you should build newHashes first, before evaluating (and building) fixedHashesNix newHashes = map computeHash (filter (fod: !fod ? outputHash) fods); - fixedHashesNix = - runCommand "fixed-hashes.nix" - { - unformatted = writeText "fixed-hashes.nix" "{${concatMapStrings hashLine sorted}}"; - nativeBuildInputs = [ pkgs.nixfmt ]; - } - '' - cat "$unformatted" | nixfmt > "$out" - ''; + fixedHashesNix = writeText "fixed-hashes.nix" '' + { + ${concatMapStrings hashLine sorted}} + ''; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index abb21edbc47d..0c750d963a6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -489,7 +489,8 @@ mapAliases { cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenance"; # Added 2025-08-25 catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21 catfs = throw "'catfs' has been removed as it was unmaintained upstream"; # Added 2026-05-31 - catnip-gtk4 = throw "'catnip-gtk4' has been removed, as it has been unmaintained upstream since June 2023, use cavasik or cavalier instead"; # Added 2026-01-01 + catnip-gtk4 = throw "'catnip-gtk4' has been removed, as it has been unmaintained upstream since June 2023, use cavasik instead"; # Added 2026-01-01 + cavalier = throw "'cavalier' has been removed due to lack of maintenance upstream. Consider using cavasik instead"; # Added 2026-09-26 cb2bib = throw "'cb2bib' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26 cdktf-cli = warnAlias "'cdktf-cli' has been renamed to/replaced by 'cdktn-cli'" cdktn-cli; # Added 2026-02-18 cdparanoiaIII = cdparanoia-iii; # Added 2026-02-08